Fabrice Di Meglio
78c66c993f
am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
...
* commit '07f85fecdd9f13a617953c7377ff62b4133b4e30':
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
2012-10-18 15:26:26 -07:00
Fabrice Di Meglio
07f85fecdd
Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev
2012-10-18 15:23:41 -07:00
Fabrice Di Meglio
fcc3348f61
Fix bug #7374285 GridLayout layout param margins are broken in RTL mode
...
- resolve layout params in ViewGroup when layout direction is changed
- layout param resolution is checking the previous layout direction to
check if we need to resolve
Change-Id: I70af2ad2b4ec83c2ec6c93b3ff445852500d1687
2012-10-18 13:24:03 -07:00
Jeff Hamilton
d76ba62101
am e09aed49: Merge "Changes to support updating location providers." into jb-mr1-dev
...
* commit 'e09aed49e3498c9e0f3545ab97f816233d5eac66':
Changes to support updating location providers.
2012-10-18 12:47:42 -07:00
Jeff Hamilton
e09aed49e3
Merge "Changes to support updating location providers." into jb-mr1-dev
2012-10-18 12:45:02 -07:00
Christopher Tate
3220289383
am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
...
* commit '1ea75b88b7ac4273b7a5395c5c57c6453d6cd3d1':
Sanity-check erroneous backup agent instantiations
2012-10-18 12:18:48 -07:00
Scott Main
c88e918482
am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
...
* commit 'db164da885d15723597d6a525d0f46cb55dbcb88':
improve some docs for dreams
2012-10-18 12:18:42 -07:00
Christopher Tate
1ea75b88b7
Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev
2012-10-18 12:07:03 -07:00
Scott Main
6237ac19bf
improve some docs for dreams
...
Change-Id: I7652f4366cdc8c40926d7961582663cc99ca0735
2012-10-18 11:18:31 -07:00
Jeff Sharkey
e21a2e72a7
am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev
...
* commit 'bd4f2181077ab35a26bcca115c1337e78814bb9d':
Defer more Account actions until user starting.
2012-10-18 00:03:51 -07:00
Jeff Sharkey
bd4f218107
Merge "Defer more Account actions until user starting." into jb-mr1-dev
2012-10-18 00:00:41 -07:00
Jeff Hamilton
fbadb69978
Changes to support updating location providers.
...
This reverts commit 20de160ca32a8f2936a80ffd70551a22e2371d25.
Bug: 7242814
Change-Id: I9ec49a14feb835b6683186fc6da4a74ae19fbae2
2012-10-18 01:28:10 -05:00
Baligh Uddin
3e336bd646
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
2012-10-17 22:23:35 -07:00
Romain Guy
650c47a190
am b8460d15: Merge "Take into account the texture layer\'s transform for clipping Bug #7370212 " into jb-mr1-dev
...
* commit 'b8460d153a1e6dfc6a02ab127d4b5b5e82386137':
Take into account the texture layer's transform for clipping Bug #7370212
2012-10-17 19:19:07 -07:00
Romain Guy
b8460d153a
Merge "Take into account the texture layer's transform for clipping Bug #7370212 " into jb-mr1-dev
2012-10-17 19:16:11 -07:00
Jeff Brown
d488b23143
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:45:14 -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
Baligh Uddin
917d8ac7fe
Import translations. DO NOT MERGE
...
Change-Id: I246d542b8032726b5ba49141f841cf23c208e7f7
Auto-generated-cl: translation import
2012-10-17 18:38:36 -07:00
Romain Guy
b2e2f24706
Take into account the texture layer's transform for clipping
...
Bug #7370212
Change-Id: Ibdc3161306f54a1cfe66e08458f05ee01a13b1df
2012-10-17 18:18:35 -07:00
Justin Ho
54a956ca42
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 15:57:44 -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
195eb1abc8
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:55:00 -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
Jeff Sharkey
e4996bbd51
Defer more Account actions until user starting.
...
Instead of explicitly scanning OWNER accounts, move to using the
"user starting" call path for consistency.
Bug: 7358086
Change-Id: Ied3289a074aafa48259d828db1d68804912589b3
2012-10-17 15:05:52 -07:00
Chet Haase
285d09320e
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
6763bfe4ce
am 3301654a: Merge "Fix javadoc" into jb-mr1-dev
...
* commit '3301654a541b5743b6538ce1e161c35330673949':
Fix javadoc
2012-10-17 14:39:26 -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
Christopher Tate
346acb123d
Sanity-check erroneous backup agent instantiations
...
Two distinct changes:
Fix a bug seen in the wild where a newly-launched application will be
spuriously asked to instantiate a backup agent. What was happening
there is that some Activity Manager state was being left stale in certain
circumstances, and then in combination with app uninstall / install, there
could be a case where uid reuse wound up looking like an app identity
match.
We now positively verify before instantiating the agent that the intended
backup target package is uid-compatible with the app process that the
instantiation was requested of. The incomplete bookkeeping in the
Activity Manager has also been tightened up, and the Backup Manager is
more aggressive about cleaning up pending operations pertaining to
apps being uninstalled.
Bug 5874010
Change-Id: Ic389f4a96c9dcd0ba6b3962b579084033d8ae9f8
2012-10-17 13:36:15 -07:00
Xia Wang
474c56d38a
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:42: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
d348ec204b
am d95316e2: Merge "Skip drawing offscreen objects" into jb-mr1-dev
...
* commit 'd95316e2c78c7e6cfacac9cced66f7ace36d6497':
Skip drawing offscreen objects
2012-10-17 12:38:53 -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
52d8458562
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:03 -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
19f5b3e2ab
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:16:01 -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
Justin Ho
abaf7731f9
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 11:10:33 -07:00
Bart Sears
0cb8a638b7
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 11:10:19 -07:00
Romain Guy
6f931ccd31
Fix javadoc
...
Change-Id: Ie98dd00f41add876f3740f5d37781a10c6bd41fe
2012-10-17 11:06:11 -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
0ee71adde0
Merge "Fix native crash while saving a panorama." into jb-mr1-dev
2012-10-17 10:20:50 -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