Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,685 Commits 3 Branches 0 Tags
d8a9073a313dabd36a62cdaef7a8e8a2c4733040
Commit Graph

26916 Commits

Author SHA1 Message Date
Craig Mautner
d8a9073a31 am 59a9cc18: am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '59a9cc18f30d2ba2aec952bcf3a65b1774986a40':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:34:35 -07:00
Craig Mautner
59a9cc18f3 am 444354d2: am 0ed07a0a: Merge "Allow getDisplayContentLocked to return null..." into jb-mr1-dev 
* commit '444354d2c62de37b65782f15c864af21086b4b04':
  Allow getDisplayContentLocked to return null...
 2012-10-19 09:32:19 -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
Dave Burke
0b9b415632 am b1f434c1: am 744b4dca: 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 'b1f434c16eefb028ef441ba40df8abe1e087a4eb':
  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:09:48 -07:00
Dave Burke
b1f434c16e am 744b4dca: 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 '744b4dca34e605b80e553a34327067abc862a320':
  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:07:52 -07: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
c38684af87 am 4c2db5f2: am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '4c2db5f2a579132f6b6861c50d7ff99bb6c8035c':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:29:00 -07:00
Fabrice Di Meglio
4c2db5f2a5 am 8de328c9: am 45c77ca0: Merge "Fix missing @hide on ViewGroup.resolveLayoutParams()" into jb-mr1-dev 
* commit '8de328c996a9f3a8f5ca3ea8e7c47421dd09b9aa':
  Fix missing @hide on ViewGroup.resolveLayoutParams()
 2012-10-18 16:27:09 -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
f9d08423e3 am 6cb9d909: am 8c2bc7cc: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 
* commit '6cb9d909f06433c5b9130c55dc08ce8d55e7dac8':
  Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
 2012-10-18 15:31:09 -07:00
Fabrice Di Meglio
6cb9d909f0 am 8c2bc7cc: am 07f85fec: Merge "Fix bug #7374285 GridLayout layout param margins are broken in RTL mode" into jb-mr1-dev 
* commit '8c2bc7ccf16f201c10e1a4ffb66f66af63f85a91':
  Fix bug #7374285  GridLayout layout param margins are broken in RTL mode
 2012-10-18 15:29:12 -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
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
597ea5b3cd am d9466f94: am 2f296598: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 
* commit 'd9466f940ae3f04f8efede13b876d5968ff0e820':
  Sanity-check erroneous backup agent instantiations
 2012-10-18 12:25:19 -07:00
Scott Main
5950f79428 am 98738225: am aefc2e62: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev 
* commit '98738225e25b7586d6bbcea2307648a1996d2258':
  improve some docs for dreams
 2012-10-18 12:25:15 -07:00
Christopher Tate
d9466f940a am 2f296598: am 1ea75b88: Merge "Sanity-check erroneous backup agent instantiations" into jb-mr1-dev 
* commit '2f2965985236d5cdc9cf2125055971da8e070e6f':
  Sanity-check erroneous backup agent instantiations
 2012-10-18 12:21:28 -07:00
Scott Main
98738225e2 am aefc2e62: am db164da8: Merge "improve some docs for dreams" into jb-mr1-dev 
* commit 'aefc2e6233edab4ec1fd1a74892f87e9fa7dade7':
  improve some docs for dreams
 2012-10-18 12:21:24 -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
b97c91dbdf am 9fb2695c: am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev 
* commit '9fb2695c3ed806a4dee755e730b50935c7bb10f6':
  Defer more Account actions until user starting.
 2012-10-18 00:12:35 -07:00
Jeff Sharkey
9fb2695c3e am 628025fd: am bd4f2181: Merge "Defer more Account actions until user starting." into jb-mr1-dev 
* commit '628025fd625934346c80ed4849f9e6495f3d1737':
  Defer more Account actions until user starting.
 2012-10-18 00:05:35 -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
f114945269 am 22bd3726: 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 '22bd3726be37a24e956d962d61657d8a3d54c985':
  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:06:15 -07:00
Justin Ho
5c555f39fb am 0efebf0a: 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 '0efebf0af4c21b9d02c9c06b67867a554e0b35ea':
  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:29 -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 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
Chet Haase
8ebb554294 am b7379d3e: am 68716710: am 6f3e7bbf: Merge "Fix for previous commit on non-interesecting invalidations" into jb-mr1-dev 
* commit 'b7379d3e4808fc1b4af4f4a6286e4432aa2b7036':
  Fix for previous commit on non-interesecting invalidations
 2012-10-17 15:09:12 -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
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
124f48ade2 am 77d67326: am 08ab69bd: am 3301654a: Merge "Fix javadoc" into jb-mr1-dev 
* commit '77d67326a60bc072a17e10581e5583bc843c7812':
  Fix javadoc
 2012-10-17 14:46:43 -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