Commit Graph

26080 Commits

Author SHA1 Message Date
Christopher Tate
e9472f2937 am 935415a0: Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev
* commit '935415a050be75f582f632dd168be9fbb047137b':
  Document immutable requirement of SharedPreferences return objects
2012-10-19 14:41:16 -07:00
Christopher Tate
935415a050 Merge "Document immutable requirement of SharedPreferences return objects" into jb-mr1-dev 2012-10-19 14:38:05 -07:00
Christopher Tate
01ed79c578 Document immutable requirement of SharedPreferences return objects
In particular, make it quite clear that the set returned by
getStringSet() must not be modfied by the app, period; and
add a similar caution about the map returned via getAll().

Also, fix a bug that could lead to unexpected data being committed
if the set instance passed to putStringSet() was mutated by the
app after that call (including mutations after commit() was
invoked).

Bug 7312641

Change-Id: If9a1be1b0669ac879ff7a7dc67a8805548ea10cc
2012-10-19 13:43:52 -07:00
Fabrice Di Meglio
af26ac3130 am 398a6713: Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev
* commit '398a6713c355cf59af071e944268aec7c0096b5a':
  Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
2012-10-19 11:36:12 -07:00
Fabrice Di Meglio
398a6713c3 Merge "Fix bug #7367429 Popup window should get its direction from it Anchor View if it can" into jb-mr1-dev 2012-10-19 11:33:01 -07:00
John Spurlock
7404f28b11 am 8c820256: Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev
* commit '8c82025650fdbcb2a80be03f8be6dbff430b678c':
  Frameworks base: Promote dream setting defaults to config.
2012-10-19 11:02:40 -07:00
John Spurlock
8c82025650 Merge "Frameworks base: Promote dream setting defaults to config." into jb-mr1-dev 2012-10-19 11:00:00 -07:00
Romain Guy
eb78cf538f am 8b946c05: Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev
* commit '8b946c055ddd90cf79cd407c9f68a013d5d24c2a':
  Defer layer rendering to avoid stalls Bug #7326824
2012-10-19 10:43:04 -07:00
Romain Guy
8b946c055d Merge "Defer layer rendering to avoid stalls Bug #7326824" into jb-mr1-dev 2012-10-19 10:40:28 -07:00
Craig Mautner
444354d2c6 am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev
* commit '0ed07a0a30ef71053d0426956d3c198bb7540d4e':
  Allow getDisplayContentLocked to return null...
2012-10-19 09:30:06 -07:00
Craig Mautner
0ed07a0a30 Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 2012-10-19 09:27:06 -07:00
John Spurlock
ed108f3d12 Frameworks base: Promote dream setting defaults to config.
So that:
 - the values can be shared (to fix assoc bug)
 - the values can be customized in product overlays

Bug:7373284
Change-Id: I37f037082523a3d975f6014f36afa28c60117372
2012-10-19 11:32:03 -04:00
Dave Burke
744b4dca34 am 09a5321c: Merge "Revert "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 '09a5321c60c02d944684abb98e0daec9dd810fab':
  Revert "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-18 21:05:29 -07:00
Dave Burke
09a5321c60 Merge "Revert "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-18 21:02:13 -07:00
Dave Burke
579e14016c Revert "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 57fca90ac6

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
2012-10-18 20:41:55 -07:00
Fabrice Di Meglio
b003e28c1d Fix bug #7367429 Popup window should get its direction from it Anchor View if it can
- set the popup layout direction depending on the anchor view's layout direction
(if not defined before)
- make first pass of ViewRootImpl.performTraversals() and configuration update
not override any layout direction that could have been set before

Change-Id: I8e86ca805f0caf52c058d06aa7861df56fb862e6
2012-10-18 18:02:56 -07:00
Fabrice Di Meglio
8de328c996 am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev
* commit '45c77ca0f6afd568ff6d149e17fb43c684e51722':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
2012-10-18 16:24:08 -07:00
Fabrice Di Meglio
45c77ca0f6 Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 2012-10-18 16:20:36 -07:00
Fabrice Di Meglio
1e0ed6b232 Fix missing @hide on ViewGroup.resolveLayoutParams()
- as we dont need this to be public

Change-Id: Ib8de262eec26d4785b13875d59599369b06a067d
2012-10-18 16:06:52 -07:00
Fabrice Di Meglio
8c2bc7ccf1 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:29 -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
Romain Guy
7c25aab491 Defer layer rendering to avoid stalls
Bug #7326824

When a layer is taken out of the cache and initialized it gets cleared
to prepare it for future rendering. This triggers the following sequence
of operations:

glBindFramebuffer(layer.fbo)
attach texture storage to FBO
glClear()
glBindFramebuffer(defaultFbo)

The clear forces a resolve on tilers which stalls the CPU for a little
while, thus producing jank during animations. This change moves the
clear to the next frame when we know we will have to execute a resolve
anyway.

Change-Id: Ic1939c25df20ed65a4c48dc81ee549b2cd8b6ec3
2012-10-18 15:05:02 -07:00
Craig Mautner
2d5618c221 Allow getDisplayContentLocked to return null...
... and check for null returns. This prevents DisplayContent objects
from containing null Display references.

Bug: 7368565 fixed.
Change-Id: I830fb4c1349204c366193657a95a92c48ccee66c
2012-10-18 14:16:43 -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
Christopher Tate
2f29659852 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:42 -07:00
Scott Main
aefc2e6233 am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev
* commit 'db164da885d15723597d6a525d0f46cb55dbcb88':
  improve some docs for dreams
2012-10-18 12:18:38 -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
628025fd62 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:43 -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
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 f49d835dfe

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 57fca90ac6

Change-Id: I0fe25056cd54b8852b32ae4621e048d3f5c7d555
2012-10-17 15:50:48 -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
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
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
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
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
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