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

154849 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Christoph Studer
dbd57a7386 am c4290acf: Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 
* commit 'c4290acf31f537821c42356d8a5db22afd353d1c':
  Notification: Use ViewStub for ProgressBar
 2014-09-10 11:22:01 +00:00
Kenny Guy
c8824b18c1 Merge "Remember userId when stripping / rebuilding notification." into lmp-dev 2014-09-10 11:14:59 +00:00
Christoph Studer
c8e1d78af9 Merge "NoLiService: Delete @removed meetsInterruptionFilter" into lmp-dev 2014-09-10 11:14:33 +00:00
Christoph Studer
b907affce2 Merge "Notification: Use ViewStub for ProgressBar" into lmp-dev 2014-09-10 11:14:08 +00:00
Adam Connors
9e33450f5f am 50c161df: am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '50c161df87f5af9862ed90af47c1252b7336f828':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:26:20 +00:00
Adam Connors
14376c8289 am 5e1fe70f: Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 
* commit '5e1fe70f82a58b3afe87ed14f5c44e02e05ddccb':
  Add feature flags for verified boot and securely remove users.
 2014-09-10 10:16:22 +00:00
Adam Connors
c90f95c79d Merge "Add feature flags for verified boot and securely remove users." into lmp-dev 2014-09-10 10:07:15 +00:00
Yohei Yukawa
6f6734c6cb am d72d7869: am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit 'd72d7869702f36911429da0ee8390e089a6f0a79':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:31:46 +00:00
Jessica Hummel
e0c2e0dbb4 am 9a21c2a3: am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '9a21c2a39afb36d1105680139acddb9adf4a9791':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:31:40 +00:00
Yohei Yukawa
7f69d52791 am 107505bd: Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 
* commit '107505bd85f615c82a1dca462581f8b10de72270':
  Use public APIs to instantiate InputMethodSubtype
 2014-09-10 09:21:21 +00:00
Jessica Hummel
e923f6267a am 1e4efc91: Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 
* commit '1e4efc916adb2e62f1189a6f1d8c54f8970a31f6':
  Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager.
 2014-09-10 09:21:16 +00:00
Yohei Yukawa
f8eef09622 Merge "Use public APIs to instantiate InputMethodSubtype" into lmp-dev 2014-09-10 08:29:31 +00:00
Jessica Hummel
ec19d621b3 Merge "Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager." into lmp-dev 2014-09-10 08:08:48 +00:00
Jessica Hummel
e3da790f8c Remove unused DEFAULT_MANAGED_PROFILE_NAME extra from DevicePolicyManager. 
Change-Id: I6fe96df66a4a78cf2e2455d58bba13051d108fdf
bug:17152955
 2014-09-10 08:08:02 +00:00
Vinit Deshpande
174538fff5 am b73e94b4: am 8270c789: Merge "Secure access to WifiScanner" into lmp-dev 
* commit 'b73e94b4173aca543ea506fbda70890311eba4d5':
  Secure access to WifiScanner
 2014-09-10 07:09:32 +00:00
Zhijun He
38615c01d0 am 490f790b: am 5ef21e48: Merge "CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P" into lmp-dev 
* commit '490f790bd3506bab958de40d67c039d9d67beedd':
  CamcorderProfile: Add QUALITY_HIGH_SPEED_2160P
 2014-09-10 07:09:27 +00:00
Eric Rowe
8ff01504b4 am b8b74fc5: am 9c8a45b5: Merge "Allow protected wifi in connectivity tests" into lmp-dev 
* commit 'b8b74fc594062422103ba491614b44c67330baf6':
  Allow protected wifi in connectivity tests
 2014-09-10 07:09:22 +00:00
Lajos Molnar
9b6da996e0 am 482a07d7: am 4f276471: Merge "MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo" into lmp-dev 
* commit '482a07d75be48fa6301df2ba6a758a28bfd42e17':
  MediaCodec/Drm: move from getErrorCode to getDiagnosticInfo
 2014-09-10 07:09:17 +00:00