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

95069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b7135adf72 Merge "Import translations. DO NOT MERGE" 2012-11-07 09:49:12 -08:00
Baligh Uddin
f6a4a04cad Merge "Import translations. DO NOT MERGE" 2012-11-07 09:41:08 -08:00
Doris Liu
de05b93a1e Merge "Adding width and height into screenshot metadata" 2012-11-06 16:57:17 -08:00
Doris Liu
5aa011b18a Adding width and height into screenshot metadata 
Bug: 7486020
Change-Id: I375cf9f1065bd1c75558d5f986e7e483cfd4a404
 2012-11-06 16:29:46 -08:00
Craig Mautner
184b2c1ed1 Merge "Layout windows that are about to animate." 2012-11-06 16:22:50 -08:00
Romain Guy
474a930030 am a1ca6d39: am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit 'a1ca6d39f9c0089aaab05249269ee8fbfe66f035':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 16:01:50 -08:00
Romain Guy
a1ca6d39f9 am a75a41e9: am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit 'a75a41e9b12c90638fbff9ce69b2820f334bdda3':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:58:08 -08:00
Romain Guy
a75a41e9b1 am 9d547d69: Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 
* commit '9d547d6934f64189e368c0b190fb4cf49c95a557':
  Clarify ViewStub.setVisibility() documentation to state that it works after inflation.
 2012-11-06 15:55:22 -08:00
Adam Powell
b3224e8c9e am b5f27ddb: am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'b5f27ddb3e56929db3cc9f4705a760caea371eb7':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 15:33:46 -08:00
Adam Powell
b5f27ddb3e am dd1dd607: am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'dd1dd60770dccf83bba3e4abab2221f2bb7f1e1d':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 15:30:49 -08:00
Jean-Baptiste Queru
45e99647dd am ecf37221: Merge eead9274 
* commit 'ecf372213db4a1e12f07b4684f3357a838b90daa':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 15:26:54 -08:00
Jean-Baptiste Queru
ecf372213d Merge eead9274 
Change-Id: If59b9cf13297d3a556810501621cce65947ccf95
 2012-11-06 15:16:09 -08:00
Craig Mautner
f02296f599 Layout windows that are about to animate. 
Do not treat windows that are animating as "gone" for layout
purposes.

Bug 7453222 fixed.

Change-Id: I521a44127eafdfee18ff0cf858861d85efdcac93
 2012-11-06 14:33:46 -08:00
Baligh Uddin
db964a8b3b Import translations. DO NOT MERGE 
Change-Id: I6da4a0967102a618cf11aa507c2269281d88f936
Auto-generated-cl: translation import
 2012-11-06 14:31:41 -08:00
Baligh Uddin
8949fd828a Import translations. DO NOT MERGE 
Change-Id: Ib3047c233de6d48ceffc7edb5c9a03dd56175090
Auto-generated-cl: translation import
 2012-11-06 14:19:45 -08:00
Baligh Uddin
acff0272d6 am 3ee5aeb2: am 59880dfd: am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit '3ee5aeb2decab58108a0d2e7b45f873196718193':
 2012-11-06 12:53:20 -08:00
Adam Powell
f194f6532f am 2d5a68b4: am 833b29a8: am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions 
* commit '2d5a68b4a7b4aea5fbcdce983d9e4514afa73db7':
  Optimize keyguard/IME interactions
 2012-11-06 12:53:16 -08:00
Joe Malin
461c00cd19 am aa0762b7: am 82ecdcc0: am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'aa0762b7b50c6cf0bbe7825cdf71d3c236a570ee':
 2012-11-06 12:53:12 -08:00
Baligh Uddin
3ee5aeb2de am 59880dfd: am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit '59880dfd2e2078a21a9d4f79a8ea2ae52aa8bdb3':
 2012-11-06 12:51:09 -08:00
Adam Powell
2d5a68b4a7 am 833b29a8: am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions 
* commit '833b29a82dfdcdce22e4035aa79edb52c9281f18':
  Optimize keyguard/IME interactions
 2012-11-06 12:51:05 -08:00
Joe Malin
aa0762b7b5 am 82ecdcc0: am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit '82ecdcc0f78b55dbb38a99f36e2ebac4148c99be':
 2012-11-06 12:51:02 -08:00
Adam Powell
dd1dd60770 am d811f27f: am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit 'd811f27f777d71da7ff226e72a68b09f30c39324':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 12:48:02 -08:00
Adam Cohen
eead927499 am 4e8a47e0: am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 
* commit '4e8a47e01cd0fd409f998e00976b1249c6b2f963':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 12:47:58 -08:00
Baligh Uddin
59880dfd2e am 0ca353fb: am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit '0ca353fbd38345f0bdbcbc1028e0d292e9271392':
 2012-11-06 12:47:54 -08:00
Adam Powell
833b29a82d am 58bbc5f7: am 5da6430f: Optimize keyguard/IME interactions 
* commit '58bbc5f7889946a5cbd58f5af41c1127edef1a0e':
  Optimize keyguard/IME interactions
 2012-11-06 12:47:51 -08:00
Joe Malin
82ecdcc0f7 am cc2a14a8: am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'cc2a14a8cec51e02a74a7a55215c0edd7160f1b5':
 2012-11-06 12:47:47 -08:00
Adam Powell
d811f27f77 am 9ff6d4f8: Merge "Keyguard sanity checks for when layout is not yet complete" into jb-mr1-lockscreen-dev 
* commit '9ff6d4f8db8d3d7a6f22afa726685feb47694fbe':
  Keyguard sanity checks for when layout is not yet complete
 2012-11-06 12:43:49 -08:00
Adam Cohen
4e8a47e01c am 79e0f875: Merge "Fix small widgets not showing up on tablet (issue 7471516)" into jb-mr1-lockscreen-dev 
* commit '79e0f875002d7bde5cf71053f9e9f054e9b5ffa2':
  Fix small widgets not showing up on tablet (issue 7471516)
 2012-11-06 12:43:46 -08:00
Baligh Uddin
0ca353fbd3 am af0d09be: am 00b5ed8f: Merge commit \'b3f87c24ee86227e22b2db9b04f3d94519f230f9\' into jb-mr1-dev 
* commit 'af0d09be288214e01a4cc661a8173bb11c453061':
 2012-11-06 12:43:42 -08:00
Adam Powell
58bbc5f788 am 5da6430f: Optimize keyguard/IME interactions 
* commit '5da6430fff7812e58ee7e9a05c62d72c36f366c8':
  Optimize keyguard/IME interactions
 2012-11-06 12:43:39 -08:00
Joe Malin
cc2a14a8ce am ff91b179: am db426cc0: am 046671af: am fbcfb5d0: am 50c2275c: Android Training: CursorLoader 
* commit 'ff91b179d37f5ab1e3cdcd179ee5799220b51ba8':
 2012-11-06 12:43:36 -08:00
The Android Open Source Project
faccc97438 am 7d16e894: (-s ours) Reconcile with jb-mr1.1-release - do not merge 
* commit '7d16e89494ee1a8aefa1d2b77d602bb7c31596de':
 2012-11-06 12:40:19 -08:00
The Android Open Source Project
7d16e89494 Reconcile with jb-mr1.1-release - do not merge 
Change-Id: Iff336b51ffc2893168e67406d96bc6dd97735b7e
 2012-11-06 12:37:23 -08:00
The Android Open Source Project
747979cc04 am ab58af36: (-s ours) am 32477a8d: am 55e7bdc7: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit 'ab58af3673846f0d1e07c1f0cc689dde5e89d34c':
 2012-11-06 12:31:22 -08:00
The Android Open Source Project
ab58af3673 am 32477a8d: am 55e7bdc7: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '32477a8dbf812795a19529d52c4ec2e079989cef':
 2012-11-06 12:26:57 -08:00
The Android Open Source Project
32477a8dbf am 55e7bdc7: Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
* commit '55e7bdc772047fe6232b51c2900e82eb354dafe5': (128 commits)
  Cleaning up keyguard persistence threads when the pager is detached. (Bug 7460991)
  Fix ordering bug
  Track size changes correctly for static wallpapers
  Stop reloading wallpaper bitmap
  Avoid redundant wallpaper loading/drawing
  Show clear all when returning from flip quick settings.
  Fade out the notification/settings panels just before close.
  Fix Bluetooth QS tile.
  Fixes for QS:
  Revert "This restores JB MR0 behavior where the framework throws an exception for improper layouts that are missing layout_width and/or layout_height."
  Hide settings button from tablet notification panel.
  Quickening.
  Fix ApplicationInfo copy ctor
  Fix NPE in quick settings tiles.
  Fix for bug 7358703 Gmail ANR when trying to compose a message
  Fix inoperative "Forgot pattern" button when face unlock enabled
  Add new tablet sound set Bug: 7351672
  Update alarm sounds and tune some ringtones Bug: 7351672 Bug: 5502770 Bug: 7312457
  Flipping quick settings!
  Flag window animation transactions as animations.
  ...
 2012-11-06 12:20:38 -08:00
The Android Open Source Project
55e7bdc772 Reconcile with jb-mr1-factory-release jb-mr1-release - do not merge 
Change-Id: I72634b08506c4fed29edd474553cb416dce9cc8e
 2012-11-06 12:17:05 -08:00
Romain Guy
9d547d6934 Merge "Clarify ViewStub.setVisibility() documentation to state that it works after inflation." 2012-11-06 10:52:10 -08:00
Stephen Hines
fb0017264d Merge "Minor fixes for range clamp + default blending." 2012-11-06 10:23:29 -08:00
Eric Laurent
be78e991fd Merge "AudioService: improve low end dock audio control" 2012-11-06 08:37:55 -08:00
The Android Automerger
af73b9e4bc merge in jb-mr1.1-release history after reset to jb-mr1.1-dev 2012-11-06 02:25:30 -08:00
Stephen Hines
bd5b3a7cb1 Minor fixes for range clamp + default blending. 
We could use setHasAlpha(false) if we were targeting API 12+, but instead
we need to settle for having the script do this explicitly.

Change-Id: I1c8ebbddcba5a003c69fefa48ec1aaf7d0e6726c
 2012-11-05 20:58:41 -08:00
The Android Automerger
469f6212b3 merge in jb-mr1-release history after reset to jb-mr1-dev 2012-11-05 18:38:53 -08:00
Svetoslav Ganov
d307640724 am 9d456661: am c9300f19: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit '9d4566611928ed71e58c8a7aaf231c6e306b204f':
  View's visibility to the user not checking predecessor alpha.
 2012-11-05 17:11:02 -08:00
Mike Cleron
6ea875ea36 am 21c25254: am a0362c7b: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit '21c25254416a47c667d427052d4510ae027e81be':
  TextView not respecting "speak passwords" setting when adding before text to events.
 2012-11-05 17:10:58 -08:00
Svetoslav Ganov
9d45666119 am c9300f19: am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit 'c9300f196335410483c5c07eccac620332b75def':
  View's visibility to the user not checking predecessor alpha.
 2012-11-05 17:08:46 -08:00
Mike Cleron
21c2525441 am a0362c7b: am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'a0362c7b17ade27103ab468e46fb00de002ce6fa':
  TextView not respecting "speak passwords" setting when adding before text to events.
 2012-11-05 17:08:42 -08:00
Svetoslav Ganov
c9300f1963 am 0f4d5df5: Merge "View\'s visibility to the user not checking predecessor alpha." into jb-mr1-dev 
* commit '0f4d5df5d815466398dba5f2d07aa98f18c35aaa':
  View's visibility to the user not checking predecessor alpha.
 2012-11-05 17:06:25 -08:00
Mike Cleron
a0362c7b17 am c87f198b: Merge "TextView not respecting "speak passwords" setting when adding before text to events." into jb-mr1-dev 
* commit 'c87f198b8cd3b3cb5b3daf63df419b9377b9c7b8':
  TextView not respecting "speak passwords" setting when adding before text to events.
 2012-11-05 17:06:21 -08:00
Svetoslav Ganov
0f4d5df5d8 Merge "View's visibility to the user not checking predecessor alpha." into jb-mr1-dev 2012-11-05 17:03:37 -08:00