Jeff Brown
6296d23003
am 56fa32bc: am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
...
* commit '56fa32bcdfeb3e2d0096065347150fdbb7d86b22':
Add a notification icon when connected to wireless display.
2012-10-17 18:47:45 -07:00
Jeff Brown
56fa32bcdf
am 23fa0320: Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
...
* commit '23fa0320b88bd2141742d47eaf2626369cb03b22':
Add a notification icon when connected to wireless display.
2012-10-17 18:44:43 -07:00
Jeff Brown
23fa0320b8
Merge "Add a notification icon when connected to wireless display." into jb-mr1-dev
2012-10-17 18:42:25 -07:00
Justin Ho
22bd3726be
am 76a01424: 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 '76a0142477e3ebda381d717572b21b355c172c26':
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:03:11 -07:00
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
0efebf0af4
am c35f7650: 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 'c35f76508eed905e06954cf8955065909b2039a7':
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:31 -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
Jeff Brown
a7f9c966bc
Add a notification icon when connected to wireless display.
...
Bug: 7350174
Change-Id: I18481e2a1445b0aa3340e5d9b02511394521e50e
2012-10-17 15:50:06 -07:00
Chet Haase
b7379d3e48
am 68716710: am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev
...
* commit '6871671063262759c906e6a24829d37a91d3b278':
Fix for previous commit on non-interesecting invalidations
2012-10-17 14:58:22 -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
77d67326a6
am 08ab69bd: am 3301654a: Merge "Fix javadoc" into jb-mr1-dev
...
* commit '08ab69bd92be60b7735622eafe8183e43a81681c':
Fix javadoc
2012-10-17 14:43:45 -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
Romain Guy
3301654a54
Merge "Fix javadoc" into jb-mr1-dev
2012-10-17 14:36:18 -07:00
Xia Wang
3265a84d34
am aeadc3d8: am 64e5aa73: Merge "Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674" into jb-mr1-dev
...
* commit 'aeadc3d86adb8e92746fdbae9340c4ab7f48ac6c':
Fix connectivity manager test for tablet with data connection, multi-user support bug#7366674
2012-10-17 12:46:50 -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
Chet Haase
a195405199
am e31cc171: am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev
...
* commit 'e31cc17159f5a6eada40ffda20cb0b0560a0bc5c':
Skip drawing offscreen objects
2012-10-17 12:41:46 -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
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
Chet Haase
d95316e2c7
Merge "Skip drawing offscreen objects" into jb-mr1-dev
2012-10-17 12:36:24 -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
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
Fabrice Di Meglio
86a8b25114
am d8989364: am e9a33c60: Merge "Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware" into jb-mr1-dev
...
* commit 'd89893642f81f854455da601e4735d226cf95214':
Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
2012-10-17 11:23:55 -07:00
Fabrice Di Meglio
7e8d16fbfd
am 84cb0b17: am 161cfef3: Merge "Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow" into jb-mr1-dev
...
* commit '84cb0b17e64530a3f8fa7c70d1813b59006b675f':
Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
2012-10-17 11:21:01 -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
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
Romain Guy
6f931ccd31
Fix javadoc
...
Change-Id: Ie98dd00f41add876f3740f5d37781a10c6bd41fe
2012-10-17 11:06:11 -07:00
Justin Ho
472702687d
am 8598646e: am 144d4055: 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 '8598646e5b93e8adf4bcd2489365900d2a4776c6':
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 10:56:33 -07:00
Justin Ho
8598646e5b
am 144d4055: 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 '144d405511e9ed685568e50db87b22cc42b6a252':
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 10:53:43 -07:00
Justin Ho
144d405511
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 10:50:39 -07:00
Justin Ho
57fca90ac6
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 dcf59629beed8182759a1068ab8ee997935bef82
Change-Id: I27426a0ffe993973ffb0b05ce1ed3afe73fcd87d
2012-10-17 10:47:39 -07:00
Bart Sears
ae232842c8
am b112bb66: am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
...
* commit 'b112bb6684b336dc4f3287af65708e0934933d3d':
Fix native crash while saving a panorama.
2012-10-17 10:26:22 -07:00
Bart Sears
b112bb6684
am 0ee71add: Merge "Fix native crash while saving a panorama." into jb-mr1-dev
...
* commit '0ee71adde01298784a2cbb667c4c1570bdbf0af0':
Fix native crash while saving a panorama.
2012-10-17 10:23:42 -07:00
Bart Sears
0ee71adde0
Merge "Fix native crash while saving a panorama." into jb-mr1-dev
2012-10-17 10:20:50 -07:00
Kenny Root
ad0090e7b8
resolved conflicts for merge of 85f9ba9e to jb-mr1-dev-plus-aosp
...
Change-Id: I9ae49075935f0e9ec432ce9d828ee26a4fcdb44c
2012-10-17 10:02:22 -07:00
Wu-cheng Li
4b63f14c96
Fix native crash while saving a panorama.
...
YuvToJpegEncoder should handle the case when the height is not
multiples of 16.
bug:7165606
Change-Id: I02f142b233c4f5c0cd8df5e3d1eaebbf62d28052
2012-10-17 18:06:59 +08:00
Kenny Root
c9a1aabc49
Remove HAVE_SELINUX guards
...
Change-Id: I6c2161471f657aa1645695ffd56ff434b0c2b426
2012-10-16 23:32:31 -07:00
Baligh Uddin
779a19fe44
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-16 21:11:18 -07:00
Baligh Uddin
d3674317b0
Merge "Import translations. DO NOT MERGE" into jb-mr1-aah-dev
2012-10-16 21:09:59 -07:00
Fabrice Di Meglio
cf12897cf5
Fix bug #7363252 Popup and Dialog UI widgets should be RTL aware
...
- set the Configuration's layout direction in ViewRootImpl instead of PhoneWindow$DecorView
- then remove unecessary API on ListPopupWindow for passing the layout direction
Change-Id: Ia2c6e4aa8cb82aed9b088bc3b8004ea0a1ded1f3
2012-10-16 20:59:04 -07:00
Fabrice Di Meglio
a7e0bcd872
Fix bug #7363015 Padding is wrong for first item in a ListPopupWindow
...
- when adding a View to a ViewGroup reset all RTL properties of the View
to be added instead of only resetting its layout direction
Change-Id: Idfa3acce1700c52e20ebfd4c9c4f4ecb3c1d7520
2012-10-16 20:11:19 -07:00
Jim Miller
ef512f03e3
am cccf85c2: am 8e614501: 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 'cccf85c287aea85121b15280bf3a89a2b7d3926b':
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-16 19:28:28 -07:00
Jim Miller
cccf85c287
am 8e614501: 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 '8e6145013a6533ca6a33e03c8a5e45ad2de431e4':
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-16 19:26:00 -07:00