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

157219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
ba7035db3d am 55908c67: am f0a86fb0: am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev 
* commit '55908c67fc329f5740dc71db6c74775367d14e18':
  Remove some overdraw in Keyguard
 2014-09-11 14:15:17 +00:00
Jorim Jaggi
f9f0df7737 am 889ed953: am cff14b2a: am 07291645: Merge "Fix QS interception on tablets" into lmp-dev 
* commit '889ed953a2ad7aea312c2b75ea4c08c43873929d':
  Fix QS interception on tablets
 2014-09-11 14:15:12 +00:00
Ruben Brunk
09f0d12d3a am 2868a44d: am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '2868a44d846345308fd0784ee3a31b280af66e9f':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-11 14:15:03 +00:00
Esteban Talavera
92f2cadf07 am bfb49179: am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit 'bfb491793470f70cddcc7433a68f072a752aec41':
  Update string value for provisioning action and extra
 2014-09-11 14:14:34 +00:00
Jorim Jaggi
8285cbfe9b am 6995b2d6: am 5aac958b: am bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev 
* commit '6995b2d6137f32f56276294371792f8ec7d11d63':
  Don't let two closing animations run at the same time
 2014-09-11 14:14:28 +00:00
Selim Cinek
914e54bbfe am 377ca761: am bc2f9a54: am abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev 
* commit '377ca761035d5173a792df48fa07d0c423d304fb':
  Fixed unnecessary layer creations in the pin unlock method
 2014-09-11 14:14:05 +00:00
Jason Monk
85d29029c9 am 4b89577d: am 835867ef: am 89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev 
* commit '4b89577d08a45195b1484a3de214538a3897f4f1':
  Fix blank QS Panel after double tap on profile icon
 2014-09-11 14:14:01 +00:00
Jason Monk
3d121852d3 am 39c5c713: am 6f9ba85b: am 1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev 
* commit '39c5c713acd21862aa96195b5fbe541c51655cd7':
  Update zen mode and qs strings on locale change
 2014-09-11 14:13:56 +00:00
Jason Monk
b01080dcd2 am b92f1d78: am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit 'b92f1d7809da77cdef37d8ea2fff7a6beeb0094d':
  Move zen mode constants and code to framework
 2014-09-11 14:13:51 +00:00
John Spurlock
7377b57689 am cbd0cdc2: am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit 'cbd0cdc297a140179b583c613591933d6fa8a643':
  Zen: make Condition available over @SystemApi
 2014-09-11 14:13:45 +00:00
George Mount
5aadc5e322 am 57980dca: am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '57980dca613fee54e4993ea3cd12dd928b1fe007':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-11 14:13:37 +00:00
George Mount
9f874eaaaf am c58233b2: am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'c58233b2a4c6f51eafd2be5544bbcf45faa9a7ec':
  Fix fade transition not working with Activity Transitions.
 2014-09-11 14:13:32 +00:00
John Spurlock
613d076fa5 am 56e64b2a: am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '56e64b2a589a09786caa1eb1d9bfa59292a227f2':
  Zen: Make condition providers available via @SystemApi.
 2014-09-11 14:13:24 +00:00
Selim Cinek
d726459cf5 am 5afe419b: am c472809c: am 20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev 
* commit '5afe419bee1f4ae65c9633d292b158ed15511d87':
  Fixed a bug where text could overlap in Quick settings
 2014-09-11 14:13:19 +00:00
Jorim Jaggi
706fe91c9d am 9d239509: am 71fe3edd: am 2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev 
* commit '9d239509cf13deb06a514d3e2d45370d1a02e18a':
  Use simpler layout for auto-redacted notifications
 2014-09-11 14:13:12 +00:00
Jorim Jaggi
40576c8c23 am 202f887d: am 4af041f2: am 222ff70d: Merge "Inflate guts only when needed" into lmp-dev 
* commit '202f887d6ebd0c822bb0f8bbee2f0a9bf5fcec9a':
  Inflate guts only when needed
 2014-09-11 14:13:08 +00:00
Adrian Roos
7a22d43f28 am 98f8cac0: am 9d27a5b4: am 500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 
* commit '98f8cac007eff832b1a7adb94dc9e22e868267ee':
  Only unbind agents of the user that is being refreshed
 2014-09-11 14:12:58 +00:00
Adrian Roos
b6b356c07e am c52a9597: am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'c52a95973ebacd5afcd6b2ae4937983726493d25':
  Add system trust agents on first boot or when adding user
 2014-09-11 14:12:53 +00:00
Kenny Guy
fa16ba6727 am 39a0254d: am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit '39a0254dbfdd170f85602db395a5144f9dd77870':
  Remember userId when stripping / rebuilding notification.
 2014-09-11 14:12:46 +00:00
Christoph Studer
cbbfdd93ce am 7e972136: am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '7e97213689ca26aad243f5a5009c39f616298619':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-11 14:12:41 +00:00
Christoph Studer
2c17ed07ec am 10afc04f: am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '10afc04f80b3ae27f5d56f4f7a10ffd36366b432':
  Notification: Use ViewStub for ProgressBar
 2014-09-11 14:12:36 +00:00
Adam Connors
de2f85e871 am 94705219: am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '94705219a13a9d8909c4502eac493d3ef9459403':
  Add feature flags for verified boot and securely remove users.
 2014-09-11 14:12:28 +00:00
Brian Williammee
7d1d2e39f3 Improve equals and hashCode in CellIdentityXxx methods 
The equals methods were a lot of dead code that boiled down to
seeing if two references pointed to the same object.  The hashCode
methods were likely to result in collisions on unequal objects.

Bug: 10328291
Change-Id: I4bd93efd1f4a34e9dec55ac05868df37368abd6a
 2014-09-10 17:06:09 -07:00
Jorim Jaggi
1269fe0a4e am f0a86fb0: am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev 
* commit 'f0a86fb03a3d35c1811a1347b65161c941dc4765':
  Remove some overdraw in Keyguard
 2014-09-10 17:43:47 +00:00
Jorim Jaggi
e4b01448c4 am cff14b2a: am 07291645: Merge "Fix QS interception on tablets" into lmp-dev 
* commit 'cff14b2afc06af3984e871f3387b21df3f7e2002':
  Fix QS interception on tablets
 2014-09-10 17:43:43 +00:00
Ruben Brunk
385c4d7a02 am 7ac22597: am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '7ac225974bc65256888c9825d1effc87e121145f':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-10 17:32:17 +00:00
Jorim Jaggi
8136912835 am bf763e77: Merge "Remove some overdraw in Keyguard" into lmp-dev 
* commit 'bf763e77177f172dcb1d7590dd1855d53ff0d2e5':
  Remove some overdraw in Keyguard
 2014-09-10 17:32:06 +00:00
Jorim Jaggi
5be6fb312e am 07291645: Merge "Fix QS interception on tablets" into lmp-dev 
* commit '07291645ca6479b6ba8f83c95c137602dfd20ddb':
  Fix QS interception on tablets
 2014-09-10 17:32:01 +00:00
Jorim Jaggi
1145748e5e Merge "Remove some overdraw in Keyguard" into lmp-dev 2014-09-10 17:22:53 +00:00
Jorim Jaggi
ebd8589406 Merge "Fix QS interception on tablets" into lmp-dev 2014-09-10 17:22:42 +00:00
Ruben Brunk
07fb533934 am 17fcb255: Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 
* commit '17fcb2556b1c04a42398738dcc1ad491b3597aa7':
  camera2: Fix preview stretching in LEGACY mode.
 2014-09-10 17:21:27 +00:00
Esteban Talavera
cb7b978794 am 52437ed7: am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '52437ed732e9346752df7e348c7e5b0fdbd9b2ce':
  Update string value for provisioning action and extra
 2014-09-10 17:18:33 +00:00
Jorim Jaggi
fce6cb8a89 am 5aac958b: am bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev 
* commit '5aac958b8f62b43f632d0502c078bcf44e4cc305':
  Don't let two closing animations run at the same time
 2014-09-10 17:18:28 +00:00
Ruben Brunk
a3256cd3e7 Merge "camera2: Fix preview stretching in LEGACY mode." into lmp-dev 2014-09-10 17:11:21 +00:00
Esteban Talavera
fd613ae9ea am 55bffb50: Merge "Update string value for provisioning action and extra" into lmp-dev 
* commit '55bffb5041e18f2cf6884841165c2bbaf9576b98':
  Update string value for provisioning action and extra
 2014-09-10 17:06:21 +00:00
Jorim Jaggi
7b60d89710 am bf671114: Merge "Don\'t let two closing animations run at the same time" into lmp-dev 
* commit 'bf671114aa8cd713ff915dbd1403e077821c07f8':
  Don't let two closing animations run at the same time
 2014-09-10 17:06:15 +00:00
Jorim Jaggi
53251ed4ac Remove some overdraw in Keyguard 
Bug: 17287256
Change-Id: I0bc4101713f83abc2738528c247ca8ce5748bff1
 2014-09-10 19:00:22 +02:00
Esteban Talavera
df980618a3 Merge "Update string value for provisioning action and extra" into lmp-dev 2014-09-10 16:26:50 +00:00
Jorim Jaggi
0c85e8676e Fix QS interception on tablets 
Only intercept when touching on the panel and not on the left or
right of the panel. Fixes a bug where the user couldn't dismiss the
panel by tapping outside.

Bug: 17437547
Change-Id: Ice484a301683fa2df1f2a21f13977023b48189f4
 2014-09-10 18:22:24 +02:00
Jorim Jaggi
6658b159db Merge "Don't let two closing animations run at the same time" into lmp-dev 2014-09-10 15:48:45 +00:00
Selim Cinek
e4fb3c18f4 am bc2f9a54: am abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev 
* commit 'bc2f9a54c9a13d909d01d271f54f1317e2a95a4a':
  Fixed unnecessary layer creations in the pin unlock method
 2014-09-10 15:21:15 +00:00
Jason Monk
b7ffb48579 am 835867ef: am 89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev 
* commit '835867ef7a69307c547865ef5d6421ccb4ab7897':
  Fix blank QS Panel after double tap on profile icon
 2014-09-10 15:21:09 +00:00
Jason Monk
03c330b77d am 6f9ba85b: am 1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev 
* commit '6f9ba85b2dc7017e88a931423f64d45e8fb13fd1':
  Update zen mode and qs strings on locale change
 2014-09-10 15:21:03 +00:00
Jason Monk
4534e26cc1 am 6a747735: am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '6a74773572fdfe4001b7b3b47bc1ceafa426eb3a':
  Move zen mode constants and code to framework
 2014-09-10 15:20:57 +00:00
Selim Cinek
146e8eaaab am abe5f130: Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev 
* commit 'abe5f1300b333b9120d7d120b0cec6cca96b778f':
  Fixed unnecessary layer creations in the pin unlock method
 2014-09-10 15:10:17 +00:00
Jason Monk
05c91fde2e am 89551fab: Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev 
* commit '89551fab5725e7c67002f894bdf8933c00a9c409':
  Fix blank QS Panel after double tap on profile icon
 2014-09-10 15:10:12 +00:00
Jason Monk
22392ebccc am 1c52586c: Merge "Update zen mode and qs strings on locale change" into lmp-dev 
* commit '1c52586cb3273f419d9e70a884823c411abacf73':
  Update zen mode and qs strings on locale change
 2014-09-10 15:10:08 +00:00
Jason Monk
e746b503ae am 473d27fa: Merge "Move zen mode constants and code to framework" into lmp-dev 
* commit '473d27fa34875083dfea48e933c2e9300979c64a':
  Move zen mode constants and code to framework
 2014-09-10 15:10:02 +00:00
Selim Cinek
ef88f708f9 Merge "Fixed unnecessary layer creations in the pin unlock method" into lmp-dev 2014-09-10 15:08:33 +00:00
Jorim Jaggi
98139559af Don't let two closing animations run at the same time 
Fixes a flash when clicking on a single notification.

Bug: 17450892
Change-Id: Ia99c21a0bb30ce100532cfab66c96ec24f2412bf
 2014-09-10 17:05:19 +02:00