drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,863 Commits 1 Branch 0 Tags
Commit Graph

87863 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
76a0142477 am 871a6d7d: Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 
* commit '871a6d7d4fb3bffaff37e45f0b4f5e3c862239d2':
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
 2012-10-17 16:00:37 -07:00
Justin Ho
c35f76508e am 4db31657: Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 
* commit '4db3165793a837ffc8197184fbc13ef2217e3dfc':
  This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height.
 2012-10-17 15:58:52 -07:00
Justin Ho
871a6d7d4f Merge "Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."" into jb-mr1-dev 2012-10-17 15:55:15 -07:00
Justin Ho
4e360f0600 Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." 
This reverts commit f49d835dfe1bd21920ff8a48cbdfb9c1fd632fd9

Change-Id: If0093f23d6458e53619220fbf0aa5f844ad2c790
 2012-10-17 15:54:20 -07:00
Justin Ho
4db3165793 Merge "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height." into jb-mr1-dev 2012-10-17 15:53:02 -07:00
Justin Ho
f49d835dfe This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height. 
This reverts commit 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
 2012-10-17 15:50:48 -07:00
Yu Shan Emily Lau
b05706da37 am 0f2d0147: Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev 
* commit '0f2d0147a938e32424cf69f7df5e0da2fba02355':
  Append the test case name in the beginning of the test log.
 2012-10-17 15:09:26 -07:00
Yu Shan Emily Lau
0f2d0147a9 Merge "Append the test case name in the beginning of the test log." into jb-mr1-dev 2012-10-17 15:06:57 -07:00
Chet Haase
6871671063 am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 
* commit '6f3e7bbf14d43553dfca6a59bbbb1c6ee19a70fc':
  Fix for previous commit on non-interesecting invalidations
 2012-10-17 14:55:50 -07:00
Chet Haase
6f3e7bbf14 Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 2012-10-17 14:52:47 -07:00
Romain Guy
08ab69bd92 am 3301654a: Merge "Fix javadoc" into jb-mr1-dev 
* commit '3301654a541b5743b6538ce1e161c35330673949':
  Fix javadoc
 2012-10-17 14:39:41 -07:00
Chet Haase
9911d18f0e Fix for previous commit on non-interesecting invalidations 
An error in the logic meant that some valid invalidations weren't getting through,
causing Launcher (for one) to get stuck sometimes.

Change-Id: I180622623b19770cd61034a5bd7991a5e2fd0a64
 2012-10-17 14:37:48 -07:00
Yu Shan Emily Lau
3662f2011f Append the test case name in the beginning 
of the test log.

Change-Id: I621286274d84bfff474f1cc1e01353b3fd66dc23
 2012-10-17 14:36:37 -07:00
Romain Guy
3301654a54 Merge "Fix javadoc" into jb-mr1-dev 2012-10-17 14:36:18 -07:00
Raph Levien
f86f4a21bc am 1720e073: Merge "Update Arabic fonts to remove Rial ligature" into jb-mr1-dev 
* commit '1720e0735576b4f0e8e8cf6faf2c813b4320a21b':
  Update Arabic fonts to remove Rial ligature
 2012-10-17 14:06:29 -07:00
Raph Levien
1720e07355 Merge "Update Arabic fonts to remove Rial ligature" into jb-mr1-dev 2012-10-17 14:04:36 -07:00
Mike Cleron
48c9b6ab3d am e663925f: Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev 
* commit 'e663925f855ab4390a0e0bd3c9713ca948076ec1':
  Show clear all when returning from flip quick settings.
 2012-10-17 13:49:00 -07:00
Mike Cleron
e663925f85 Merge "Show clear all when returning from flip quick settings." into jb-mr1-dev 2012-10-17 13:46:19 -07:00
Daniel Sandler
f249efcf37 Show clear all when returning from flip quick settings. 
Bug: 7367906
Change-Id: I3c6d227d223f11c60a44ceee4cdf698aa2a0acc9
 2012-10-17 16:42:36 -04:00
Irfan Sheriff
16c156ff0c am 90a80bb8: Merge "Handle null BSSID" into jb-mr1-dev 
* commit '90a80bb8aece5b1f589020d512a9e1695e2fd1d8':
  Handle null BSSID
 2012-10-17 12:51:03 -07:00
Irfan Sheriff
90a80bb8ae Merge "Handle null BSSID" into jb-mr1-dev 2012-10-17 12:48:39 -07:00
Xia Wang
aeadc3d86a am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev 
* commit '64e5aa73c549e006a0e6ce1030c88206c781dc1a':
  Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674
 2012-10-17 12:44:23 -07:00
Svetoslav Ganov
2bc21571e7 am 966496f5: Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev 
* commit '966496f5d57979102749ed3e4f96cbfd07aa397c':
  More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf
 2012-10-17 12:44:18 -07:00
Xia Wang
64e5aa73c5 Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev 2012-10-17 12:40:13 -07:00
Svetoslav Ganov
966496f5d5 Merge "More descriptive content description for quick settings toggle. Bug: 7362316 Change-Id: I7829402793e407e7ca483e1de2583df3b6c235bf" into jb-mr1-dev 2012-10-17 12:39:19 -07:00
Chet Haase
e31cc17159 am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev 
* commit 'd95316e2c78c7e6cfacac9cced66f7ace36d6497':
  Skip drawing offscreen objects
 2012-10-17 12:38:25 -07:00
Romain Guy
cdc702093c am 16627347: Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev 
* commit '16627347ef5c22914ccb69ff7b7035c9c9d7ab07':
  Enable mipmapping, without a deadlock this time Bug #7353771
 2012-10-17 12:36:37 -07:00
Chet Haase
d95316e2c7 Merge "Skip drawing offscreen objects" into jb-mr1-dev 2012-10-17 12:36:24 -07:00
Romain Guy
16627347ef Merge "Enable mipmapping, without a deadlock this time Bug #7353771" into jb-mr1-dev 2012-10-17 12:32:50 -07:00
Romain Guy
5243957080 Enable mipmapping, without a deadlock this time 
Bug #7353771

Change-Id: I89a08a58608e374f1c604a26ee0769d5850b2f7b
 2012-10-17 12:14:11 -07:00
Xia Wang
2ab453b52b Fix connectivity manager test for tablet with data connection, multi-user support 
bug#7366674

Change-Id: Ibbb4becebfc833529e85d8a311366586c5ba54ee
 2012-10-17 12:03:29 -07:00
Daniel Sandler
f610c29504 am 26f544ae: Merge "For Matias." into jb-mr1-dev 
* commit '26f544aef2b28412d4185b22e5c5660f4293f21b':
  For Matias.
 2012-10-17 11:58:43 -07:00
Daniel Sandler
26f544aef2 Merge "For Matias." into jb-mr1-dev 2012-10-17 11:56:14 -07:00
Irfan Sheriff
0e30c05e8a am d4a149d9: Merge "Frequency conflict handling" into jb-mr1-dev 
* commit 'd4a149d9d06f3a1914babf70c93131f7211eaa2b':
  Frequency conflict handling
 2012-10-17 11:55:27 -07:00
Irfan Sheriff
d4a149d9d0 Merge "Frequency conflict handling" into jb-mr1-dev 2012-10-17 11:52:14 -07:00
Chet Haase
b78ee0ef60 Skip drawing offscreen objects 
Previous logic in ViewRoot would schedule and perform a draw
when it was requested by offscreen objects. The problem was that the
logic checking for an interesection between the offscreen invalidation rectangle
and the onscreen display rectangle was flawed. The fix was to use the return value
from Rect.intersect() to do the right thing and skip drawing.

Issue #7366568 Offscreen invalidates can cause useless work for framework

Change-Id: Ie4e277c695dacee39848a8a223f0c4ee34d9bb4d
 2012-10-17 11:32:01 -07:00
Yu Shan Emily Lau
1e16f1cf05 am fc2652ef: Merge "Fix the NPE for the memwriter." into jb-mr1-dev 
* commit 'fc2652efedeaae40c4a3748a8de9ee833e1443e1':
  Fix the NPE for the memwriter.
 2012-10-17 11:23:54 -07:00
Fabrice Di Meglio
d89893642f am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 
* commit 'e9a33c6098f51c687665adbed799860df2569ad0':
  Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
 2012-10-17 11:21:01 -07:00
Yu Shan Emily Lau
fc2652efed Merge "Fix the NPE for the memwriter." into jb-mr1-dev 2012-10-17 11:20:26 -07:00
Fabrice Di Meglio
84cb0b17e6 am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 
* commit '161cfef36d8fac79f8665ecdb78d3f8f8f5ba5af':
  Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
 2012-10-17 11:18:13 -07:00
Fabrice Di Meglio
e9a33c6098 Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev 2012-10-17 11:18:13 -07:00
Fabrice Di Meglio
161cfef36d Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev 2012-10-17 11:13:20 -07:00
Yu Shan Emily Lau
87b8a1c3b6 Fix the NPE for the memwriter. 
Change-Id: Id3a5c8f29b0f6be994ea95eb62f1a0eec8fe75b5
 2012-10-17 11:10:32 -07:00
Daniel Sandler
85b882f5a5 am b702e5df: Merge "Fix Bluetooth QS tile." into jb-mr1-dev 
* commit 'b702e5df25a4537e8471d9b14c3cff4f3d2cb468':
  Fix Bluetooth QS tile.
 2012-10-17 11:08:04 -07:00
Daniel Sandler
f78a2353af am 25e1456e: Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 
* commit '25e1456ed8de57be3c551b39bf510dd0218a0d2b':
  Fade out the notification/settings panels just before close.
 2012-10-17 11:07:59 -07:00
Daniel Sandler
581c5703fc am f06125aa: Merge "Fixes for QS:" into jb-mr1-dev 
* commit 'f06125aab027c809095304f30d109d627cd995a6':
  Fixes for QS:
 2012-10-17 11:07:56 -07:00
Daniel Sandler
b702e5df25 Merge "Fix Bluetooth QS tile." into jb-mr1-dev 2012-10-17 11:06:21 -07:00
Daniel Sandler
25e1456ed8 Merge "Fade out the notification/settings panels just before close." into jb-mr1-dev 2012-10-17 11:06:21 -07:00
Romain Guy
6f931ccd31 Fix javadoc 
Change-Id: Ie98dd00f41add876f3740f5d37781a10c6bd41fe
 2012-10-17 11:06:11 -07:00
Daniel Sandler
f06125aab0 Merge "Fixes for QS:" into jb-mr1-dev 2012-10-17 11:05:20 -07:00