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

90307 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Michael Jurka
20124e4d5e am 9019335c: am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit '9019335cd2daa896781f8d1ac67301f0f1b70ad9':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:11:26 -07:00
Michael Jurka
d200e8987d am aee6cbd4: am 80343f64: Fix recents animations for secondary users 
* commit 'aee6cbd41546ca0fb85866ab1c8a865da727c19f':
  Fix recents animations for secondary users
 2012-10-19 09:11:22 -07:00
Michael Jurka
9019335cd2 am e9687ba8: Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 
* commit 'e9687ba8bdccc27f98fe1dcdc48faac0c0de4c18':
  Fixing wallpaper flash when going in/out of Recents
 2012-10-19 09:09:06 -07:00
Michael Jurka
aee6cbd415 am 80343f64: Fix recents animations for secondary users 
* commit '80343f646f9686528212f82163a77ef48e30f4c3':
  Fix recents animations for secondary users
 2012-10-19 09:09:02 -07:00
Michael Jurka
e9687ba8bd Merge "Fixing wallpaper flash when going in/out of Recents" into jb-mr1-dev 2012-10-19 09:06:49 -07:00
Michael Jurka
738cfc9105 Fixing wallpaper flash when going in/out of Recents 
Bug: 7372516
Bug: 7216872

Change-Id: I2a2308a85caf9f2ad2d382c709e5f8867bd060be
 2012-10-19 16:58:50 +02:00
Michael Jurka
80343f646f Fix recents animations for secondary users 
Bug: 7361640

Change-Id: Ibd177bf01758fb8706b82dcf3bf234e052c38aa3
 2012-10-19 16:50:29 +02:00
Geremy Condra
2660fd2b5d am 01e99ada: am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 
* commit '01e99adaed17445ef01627fe841fc37f1f474d7b':
  Change android.permission.SERIAL_PORT to signature|system.
 2012-10-19 00:05:39 -07:00
Geremy Condra
01e99adaed am a1f739ea: Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 
* commit 'a1f739ea83b6d770b8469ae1c2c4161f6fe96334':
  Change android.permission.SERIAL_PORT to signature|system.
 2012-10-19 00:02:41 -07:00
Geremy Condra
a1f739ea83 Merge "Change android.permission.SERIAL_PORT to signature|system." into jb-mr1-dev 2012-10-18 23:59:37 -07:00
Jeff Brown
d2b36bc540 am fee1a210: am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev 
* commit 'fee1a2109e846e4bb628a56ddc5b907df356e452':
  Reduce auto-brightness jitter.
 2012-10-18 23:28:29 -07:00
Jeff Sharkey
f1ad6d5b79 am 93b17876: am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '93b17876d44f27141335295ee9ffd88bb9f23817':
  More migration to Global settings.
 2012-10-18 23:28:26 -07:00
Jeff Brown
0fab9247c9 am fba021ea: am ce78b026: Merge "Fix deadlock." into jb-mr1-dev 
* commit 'fba021eaacfb2b44fc36f9fb74bac08b32a841e5':
  Fix deadlock.
 2012-10-18 23:28:22 -07:00
Jeff Brown
fee1a2109e am 1d2b445d: Merge "Reduce auto-brightness jitter." into jb-mr1-dev 
* commit '1d2b445d7431420b7cfbd9ef3fe4e326e121eeae':
  Reduce auto-brightness jitter.
 2012-10-18 23:26:23 -07:00
Jeff Sharkey
93b17876d4 am 5831159b: Merge "More migration to Global settings." into jb-mr1-dev 
* commit '5831159b8d4cf85fa46e2c4cb8e7d9f750014d6f':
  More migration to Global settings.
 2012-10-18 23:26:15 -07:00
Jeff Brown
fba021eaac am ce78b026: Merge "Fix deadlock." into jb-mr1-dev 
* commit 'ce78b026179bc041bce9c9e2d8b63b79a97cbf67':
  Fix deadlock.
 2012-10-18 23:26:11 -07:00
Jeff Brown
1d2b445d74 Merge "Reduce auto-brightness jitter." into jb-mr1-dev 2012-10-18 23:23:57 -07:00
Jeff Sharkey
5831159b8d Merge "More migration to Global settings." into jb-mr1-dev 2012-10-18 23:23:16 -07:00
Jeff Brown
ce78b02617 Merge "Fix deadlock." into jb-mr1-dev 2012-10-18 23:22:02 -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 57fca90ac65ecfe97acd4c93d442c3db8f815e11

Change-Id: I21b007a7d150a4c23f25a706cdba5cb86198198f
 2012-10-18 20:41:55 -07:00
Jeff Brown
4f0e969eab Reduce auto-brightness jitter. 
Apply additional hysteresis controls to prevent repeated brightness
changes within a short interval.

Bug: 7266090
Change-Id: I73122457f6f3200c80188d3716ce2baf38f6a0a6
 2012-10-18 18:45:55 -07:00
Xavier Ducrohet
2533ece005 am 1a755c67: am ed5387be: am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit '1a755c67e00ddffcb5819ed9caa9096b7203aa3c':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:57:37 -07:00
Xavier Ducrohet
1a755c67e0 am ed5387be: am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit 'ed5387be7a78d6d54214683fe5bf8bc3039529b9':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:54:25 -07:00
Xavier Ducrohet
ed5387be7a am fcc93e73: (-s ours) am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit 'fcc93e734be9fe4608fb5a6818163104cdec3fb5':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:52:21 -07:00
Xavier Ducrohet
fcc93e734b am 135b5ba5: Layoutlib: Read and close XML files as soon as possible. do not merge. 
* commit '135b5ba52431b147d51a81b807784009cd0510dd':
  Layoutlib: Read and close XML files as soon as possible. do not merge.
 2012-10-18 17:48:57 -07:00
Jeff Brown
6669250034 Fix deadlock. 
The display manager must never call into the activity manager with
its lock held.  Make it clear that the adapters are constructed
while holding the syncroot lock.

Bug: 7377631
Change-Id: I1557313cbb31dcad9b5a46919a88a5a1c1af3e9b
 2012-10-18 17:37:39 -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
Xavier Ducrohet
135b5ba524 Layoutlib: Read and close XML files as soon as possible. do not merge. 
Because passing an InputStream to KXML does not close the
stream after the file has been parsed, the files are staying
locked on windows until the gc and finalizers are run.

This change preload the XML files and close their stream,
and then pass the content in a stream to the parser.

(cherry picked from commit c48b0b940d632b9862ff6aa32665e37fe9e50845)

Change-Id: I1b225454c166026c1aab6290c55ac8279e8862d5
 2012-10-18 15:48:10 -07:00
Fabrice Di Meglio
2a902caab2 am 193229a5: am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '193229a52a732f537e1f062426d1cc8d774bd2c7':
  Fix the build
 2012-10-18 15:43:02 -07:00
Fabrice Di Meglio
193229a52a am 0437302f: Merge "Fix the build" into jb-mr1-dev 
* commit '0437302f164f3eb1ba6a359ef5b3cd857facbbe4':
  Fix the build
 2012-10-18 15:40:24 -07:00
Jeff Sharkey
8d9a1f66d9 More migration to Global settings. 
Bug: 7375796
Change-Id: I3954ce141ad30073896090a28eee743ba15fd736
 2012-10-18 15:38:14 -07:00
Fabrice Di Meglio
0437302f16 Merge "Fix the build" into jb-mr1-dev 2012-10-18 15:37:26 -07:00
Fabrice Di Meglio
3cb8d26bb0 Fix the build 
- was missing a "make update-api" pass

Change-Id: I004a1650cf7946e0e8bd36d75dab81bbca80443c
 2012-10-18 15:34:30 -07:00
Xavier Ducrohet
dc8ae9f758 am 26d76606: am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev 
* commit '26d76606aff48680fc61f9decaeddff3a568ca58':
  Layoutlib: Read and close XML files as soon as possible.
 2012-10-18 15:32:57 -07:00
Xavier Ducrohet
26d76606af am d8149b03: Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev 
* commit 'd8149b03a8676a49f6ca500eecafe79fadf046a7':
  Layoutlib: Read and close XML files as soon as possible.
 2012-10-18 15:30:24 -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
Xavier Ducrohet
d8149b03a8 Merge "Layoutlib: Read and close XML files as soon as possible." into jb-mr1-dev 2012-10-18 15:27:39 -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
Svetoslav Ganov
83c57b5c52 am d7169b59: am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev 
* commit 'd7169b5936721e8e985e6bf7f7e47095b8d6dcfa':
  Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
 2012-10-18 15:05:26 -07:00
Svetoslav Ganov
d7169b5936 am 80ce3d87: Merge "Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered." into jb-mr1-dev 
* commit '80ce3d8746e9bb727ebf37a8963b96be84d82413':
  Magnifier not respecting RTL/LTR direction and keyguard dialogs not properly centered.
 2012-10-18 15:02:25 -07:00