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

154981 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Albert
4fb58b0360 Don't check a staticly allocated array for null. 
Change-Id: I5568174f1a9d53078c2169cfd3401e43d88a7643
 2014-09-10 08:17:30 -07: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
John Spurlock
2cfe2229c5 am 736196b2: am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit '736196b23801319a4e477ad921cdd7f41eb66c2e':
  Zen: make Condition available over @SystemApi
 2014-09-10 15:04:31 +00:00
Jason Monk
bd2ffe8f77 Merge "Fix blank QS Panel after double tap on profile icon" into lmp-dev 2014-09-10 15:01:00 +00:00
Jason Monk
0875a782ad Merge "Update zen mode and qs strings on locale change" into lmp-dev 2014-09-10 15:00:31 +00:00
Jason Monk
c8e4fa41f2 Merge "Move zen mode constants and code to framework" into lmp-dev 2014-09-10 15:00:20 +00:00
John Spurlock
5bb9f01f90 am 82126845: Merge "Zen: make Condition available over @SystemApi" into lmp-dev 
* commit '821268455ca57051983c0e5f8cc24695033be174':
  Zen: make Condition available over @SystemApi
 2014-09-10 14:54:37 +00:00
George Mount
13a0819754 am 568b3fe9: am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '568b3fe99baa8e5eba1acad6a522706f16803a40':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-10 14:51:05 +00:00
George Mount
5a88f7f343 am 557b3f66: am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit '557b3f662dee5298f793ec84ddcf134d34b96365':
  Fix fade transition not working with Activity Transitions.
 2014-09-10 14:51:00 +00:00
John Spurlock
3e5d59c365 Merge "Zen: make Condition available over @SystemApi" into lmp-dev 2014-09-10 14:46:20 +00:00
John Spurlock
9034f2452b Zen: make Condition available over @SystemApi 
Fix build.

Bug:16819503
Change-Id: I011723a770a9a8b7fc8124defd56137ec5f1704e
 2014-09-10 10:42:13 -04:00
Selim Cinek
6380482d08 Fixed unnecessary layer creations in the pin unlock method 
This was especially noticible when double tapping a notification
because of the staggered appearing.

Bug: 17287256
Change-Id: I8f39892fa122bb8b7b6f2a7b1e7be8a9570e661e
 2014-09-10 16:39:01 +02:00
George Mount
5a3be5f99d am 1fac2ba1: Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 
* commit '1fac2ba1c9577f88cf93e88794780af9b5eacb1b':
  Use intrinsic size for path animation in AnimatedVectorDrawable
 2014-09-10 14:38:03 +00:00
George Mount
078564506f am bfbb5882: Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 
* commit 'bfbb5882cb2e11d9a201e4f5ade6a3fe9f43e6b0':
  Fix fade transition not working with Activity Transitions.
 2014-09-10 14:37:58 +00:00
George Mount
b7d63aedf5 Merge "Use intrinsic size for path animation in AnimatedVectorDrawable" into lmp-dev 2014-09-10 14:30:17 +00:00
George Mount
cb0567f98c Merge "Fix fade transition not working with Activity Transitions." into lmp-dev 2014-09-10 14:29:59 +00:00
John Spurlock
39997db633 am 88c61af5: am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '88c61af5c1833e9a94f33e8150d23e7b6b50a319':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:56:05 +00:00
Selim Cinek
a7307bb9ab am c472809c: am 20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev 
* commit 'c472809c6e55a45b426389d9a2cbe21fdd24eebb':
  Fixed a bug where text could overlap in Quick settings
 2014-09-10 13:56:01 +00:00
John Spurlock
3961ecb0e5 am 3a972844: Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 
* commit '3a972844e934b1031d73bfb114d84a7d2f8d4b19':
  Zen: Make condition providers available via @SystemApi.
 2014-09-10 13:45:22 +00:00
Selim Cinek
d5da36a771 am 20c285a6: Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev 
* commit '20c285a6485e57669eae5a9ea165b390f0d8369c':
  Fixed a bug where text could overlap in Quick settings
 2014-09-10 13:45:08 +00:00
John Spurlock
fdef628470 Merge "Zen: Make condition providers available via @SystemApi." into lmp-dev 2014-09-10 13:38:09 +00:00
Selim Cinek
ee5234f200 Merge "Fixed a bug where text could overlap in Quick settings" into lmp-dev 2014-09-10 13:36:18 +00:00
Jason Monk
4dd81467e3 Move zen mode constants and code to framework 
This allows the strings and code to be shared with settings.

Bug: 15454830
Change-Id: I9300af4f8b6d80042452b75db3418b20c5c5cc81
 2014-09-10 09:30:03 -04:00
Jorim Jaggi
04a552ef97 am 71fe3edd: am 2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev 
* commit '71fe3eddc4a9922dc6b08186230a3f46af54f16d':
  Use simpler layout for auto-redacted notifications
 2014-09-10 13:23:38 +00:00
Jorim Jaggi
7668ccbbc8 am 4af041f2: am 222ff70d: Merge "Inflate guts only when needed" into lmp-dev 
* commit '4af041f2c3fdff040ecb55df12b8257fda0554db':
  Inflate guts only when needed
 2014-09-10 13:23:33 +00:00
John Spurlock
bf4e41747d Zen: Make condition providers available via @SystemApi. 
Bug:16819503
Change-Id: Ibd7004f7a0928d3f14f9ccd55088cf645d5285e2
 2014-09-10 09:13:54 -04:00
Jorim Jaggi
b994c6acb1 am 2f52f74c: Merge "Use simpler layout for auto-redacted notifications" into lmp-dev 
* commit '2f52f74c4a670370e32b36ecb89a06f5203df8d1':
  Use simpler layout for auto-redacted notifications
 2014-09-10 13:12:35 +00:00
Jorim Jaggi
5a76389ac5 am 222ff70d: Merge "Inflate guts only when needed" into lmp-dev 
* commit '222ff70d04bd1e3721d455cd42ce36f046b52b93':
  Inflate guts only when needed
 2014-09-10 13:12:30 +00:00
Jorim Jaggi
00fb8a80c8 Merge "Use simpler layout for auto-redacted notifications" into lmp-dev 2014-09-10 13:03:30 +00:00
Jorim Jaggi
c50ec62553 Merge "Inflate guts only when needed" into lmp-dev 2014-09-10 13:03:06 +00:00
Jorim Jaggi
b1cd3c1945 Inflate guts only when needed 
This saves us a ton of views.

Bug: 17346296
Change-Id: I3eafd6703d19704dc8b108c1034266f38cf77f7b
 2014-09-10 14:58:50 +02:00
Selim Cinek
e84e6676c4 Fixed a bug where text could overlap in Quick settings 
Bug: 17434395
Change-Id: I001f54586666e2e575b0295315f7b2181c25a1e9
 2014-09-10 14:41:58 +02:00
Adrian Roos
0c592a40ff am 9d27a5b4: am 500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 
* commit '9d27a5b409ac3e4eaa0ca9e3dd44a6c1a1f7a45f':
  Only unbind agents of the user that is being refreshed
 2014-09-10 11:41:27 +00:00
Adrian Roos
444c6581ef am 99006f6c: am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit '99006f6cd5d64fa6accd4301646b4a58ac992d62':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:41:21 +00:00
Adrian Roos
21748763ba am 500eebbb: Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 
* commit '500eebbb71d64c5b4d4b6ef4ab2f10800ac455df':
  Only unbind agents of the user that is being refreshed
 2014-09-10 11:32:24 +00:00
Kenny Guy
1985b7e138 am a6e2ae35: am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'a6e2ae352bf74ec29ae60d3f21e900d73e7da14e':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:32:20 +00:00
Adrian Roos
170f256ac6 am be125380: Merge "Add system trust agents on first boot or when adding user" into lmp-dev 
* commit 'be12538056cf441f441d42d2bf7d430ecdc3fd4f':
  Add system trust agents on first boot or when adding user
 2014-09-10 11:32:18 +00:00
Christoph Studer
64fcd76970 am 72d1509d: am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '72d1509d598e53858db4f7d16d64761e32035990':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:32:15 +00:00
Christoph Studer
b14eb90414 am 27674421: am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit '27674421aef9e3e3dd521a042b3fa939f9c92517':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:32:09 +00:00
Adrian Roos
c727fb1fc2 Merge "Only unbind agents of the user that is being refreshed" into lmp-dev 2014-09-10 11:24:08 +00:00
Adrian Roos
f950641e28 Merge "Add system trust agents on first boot or when adding user" into lmp-dev 2014-09-10 11:23:38 +00:00
Kenny Guy
d42e221c30 am cefee0c8: Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 
* commit 'cefee0c8185594f017ffd396cfe1877419c24371':
  Remember userId when stripping / rebuilding notification.
 2014-09-10 11:22:11 +00:00
Christoph Studer
d02b5b5c10 am 6e68dff3: Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 
* commit '6e68dff3deb0ec350aa769b4936e52ea00262beb':
  NoLiService: Delete @removed meetsInterruptionFilter
 2014-09-10 11:22:06 +00:00