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

169297 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dirk Dougherty
e264e1f046 am be8da57a: am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'be8da57a33103f9257d1a23eee372a703d8c181a':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 18:45:11 +00:00
Alan Viverette
3d0b7cdb66 am 2bae3789: am ada19e6d: Merge "Update action bar insets on sw600dp to match Material spec" into lmp-mr1-dev 
* commit '2bae3789da18676cabf2e09e49c519fa96184a81':
  Update action bar insets on sw600dp to match Material spec
 2014-11-25 18:44:48 +00:00
Alan Viverette
bf7ef37898 am 0e8aabd6: am 662039c6: Merge "Update IME selection dialog layout for Material" into lmp-mr1-dev 
* commit '0e8aabd6c9dfef168a6de714219fc52ecaca08ea':
  Update IME selection dialog layout for Material
 2014-11-25 18:44:42 +00:00
Alan Viverette
c9b68e1150 am df188d41: am d30f6fba: Merge "Cannot set Pivot X,Y values from setPivotX, setPivotY API" into lmp-mr1-dev 
* commit 'df188d4137a9ebf0661127bab36c517a7fb001d5':
  Cannot set Pivot X,Y values from setPivotX, setPivotY API
 2014-11-25 18:44:37 +00:00
Adam Lesinski
44a711ccac am 9f692b52: am 9be305d1: Merge "Make the Context service constant for UsageStats public" into lmp-mr1-dev 
* commit '9f692b520255435903c8c1efb7b50f22a80505a5':
  Make the Context service constant for UsageStats public
 2014-11-25 18:44:31 +00:00
Alan Viverette
15913c804f am cda2dafd: am 27fdbc60: Merge "Ensure calling mutate() on DrawableContainer creates a new state" into lmp-mr1-dev 
* commit 'cda2dafd36641130fc41888d81c98cd2d54047b8':
  Ensure calling mutate() on DrawableContainer creates a new state
 2014-11-25 18:44:25 +00:00
Alan Viverette
11d33527e8 am 44c09f29: am 27fbf676: Merge "Update documentation for DatePicker to reflect the new mode" into lmp-mr1-dev 
* commit '44c09f2919d21296c0f020b954621c30d73eba20':
  Update documentation for DatePicker to reflect the new mode
 2014-11-25 18:44:20 +00:00
Tom Taylor
0b7a212f6a am bd3b0000: am 4cd3e47e: Merge "Issues with messaging apps on non-primary user account" into lmp-mr1-dev 
* commit 'bd3b00004c5aab43de0632994aa9a9d4e701ad5e':
  Issues with messaging apps on non-primary user account
 2014-11-25 18:43:56 +00:00
Ruben Brunk
7eb6e0e395 am c02cdf00: am 8791a1e8: Merge "Camera2: Ignore unsupported face detection results in LEGACY." into lmp-mr1-dev 
* commit 'c02cdf00e51b9a7ec7b9c74ba7eeb3711ec52213':
  Camera2: Ignore unsupported face detection results in LEGACY.
 2014-11-25 18:43:51 +00:00
Jeff Sharkey
bcf57d9d3a am f07a99f9: am 07aca15b: Merge "Better am error when SELinux blocking access." into lmp-mr1-dev 
* commit 'f07a99f9b92878e3570fe1715c701bc4c32d2ad9':
  Better am error when SELinux blocking access.
 2014-11-25 18:43:43 +00:00
RoboErik
351ab57e25 am a9031025: am d9bb296b: Merge "Delay calling onConnected until a session is set in MediaBrowser" into lmp-mr1-dev 
* commit 'a90310256476868d51811eb41c2c7f9b609dc0dc':
  Delay calling onConnected until a session is set in MediaBrowser
 2014-11-25 18:43:37 +00:00
Jeff Sharkey
278dfdf731 am 117c549b: am 0f667f58: Merge "Ignore spammy package logs when dumping." into lmp-mr1-dev 
* commit '117c549b86979d891edfe1d810ac087609928386':
  Ignore spammy package logs when dumping.
 2014-11-25 17:50:12 +00:00
Jeff Sharkey
44952282e8 am ce7a0e6c: am 7038c390: Merge "Move Documents action bar update even later." into lmp-mr1-dev 
* commit 'ce7a0e6cc7cd90cc5019f9b150a0295347f38406':
  Move Documents action bar update even later.
 2014-11-25 17:50:06 +00:00
Alan Viverette
67c55be39a am 0d05788f: am 760cfb02: Merge "Check for null drawable in theme-less getDrawable()" into lmp-mr1-dev 
* commit '0d05788fd06b24068c269bfa80dd96deafb00357':
  Check for null drawable in theme-less getDrawable()
 2014-11-25 17:49:53 +00:00
Jean-Michel Trivi
e19bb5c092 am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev 
* commit '213472d7384c9d8096748f3cd9305ef49342dbcf':
  Add support for audio focus locking
 2014-11-25 17:49:46 +00:00
Jeff Davidson
476d5a265b am 6fdf2a17: am 6ea4e11d: Merge "Don\'t enforce control permission when preparing consented VPN." into lmp-mr1-dev 
* commit '6fdf2a1709c2006275d148e3156d249dcc27a99c':
  Don't enforce control permission when preparing consented VPN.
 2014-11-25 17:49:39 +00:00
Jinsuk Kim
4043fd8fec am c27f5baa: am 51cb7aa7: Merge "CEC: Do not issue non-effective <Routing Change>" into lmp-mr1-dev 
* commit 'c27f5baaeb39137b7cedc7c36feaaa1a67b1d3a3':
  CEC: Do not issue non-effective <Routing Change>
 2014-11-25 17:49:34 +00:00
Geoff Mendal
0f1fb55b86 am 6a0ec6e6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '6a0ec6e60616811bb19a25ce79c74361968642c4':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:28 +00:00
Geoff Mendal
2719297615 am db3b7b58: (-s ours) am 597226d6: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'db3b7b5846d3a047d5a049fd1f931b8a87b46b68':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:14 +00:00
Jeff Sharkey
c02f304c3a am 58b699c3: am 636baa0d: Merge "Introduce revision codes for split APKs." into lmp-mr1-dev 
* commit '58b699c366dea7abc26f34c1e5f1cc6031c04e23':
  Introduce revision codes for split APKs.
 2014-11-25 17:39:16 +00:00
Sailesh Nepal
057df69e83 am 8c2a8f64: am 0afd49a1: Merge "Add system API to get registered connection managers" into lmp-mr1-dev 
* commit '8c2a8f64b9c150b8e8422c5e97ca5d491b6fc93b':
  Add system API to get registered connection managers
 2014-11-25 17:38:32 +00:00
Jorim Jaggi
a6eaf8b38a am 82bb648b: am 6b770744: Merge "Fix quick settings on Keyguard" into lmp-mr1-dev 
* commit '82bb648b5a1a5a4a0946a252a9cf9b6f8944a15d':
  Fix quick settings on Keyguard
 2014-11-25 17:38:26 +00:00
Chris Wren
dd8de0a7b6 am fa5768ce: am 1b26cc5b: Merge "LED should not be blocked by interruption filtering." into lmp-mr1-dev 
* commit 'fa5768cef416d6379cd2a9e687695591add3f8b5':
  LED should not be blocked by interruption filtering.
 2014-11-25 17:38:21 +00:00
smain@google.com
cde2015889 am f00d46db: am 79b496e8: am 75cd7c74: am 5f3ba993: am 1b23ee96: Merge "add intro videos (w/ shadowbox) to Auto and Wear landing pages." into lmp-docs 
* commit 'f00d46db377b97da673f8699928d8343b3bc132d':
  add intro videos (w/ shadowbox) to Auto and Wear landing pages.
 2014-11-25 17:38:15 +00:00
John Spurlock
98c2090de4 am 98a20f68: am 4dfce43e: Merge "QS: Update data usage over limit title." into lmp-mr1-dev 
* commit '98a20f68e0f31c43d090b16e3802c67226dbd055':
  QS: Update data usage over limit title.
 2014-11-25 17:38:02 +00:00
Paul Jensen
d5ffce76fb am 080b02fc: am e57064a2: Merge "Don\'t bother validating networks that don\'t satisfy the default request." into lmp-mr1-dev 
* commit '080b02fc6c4531646d29ff4039080f2ac6d5f31a':
  Don't bother validating networks that don't satisfy the default request.
 2014-11-25 17:37:54 +00:00
Geoff Mendal
22af14587e am 5d50bf02: (-s ours) am 44b769d0: (-s ours) am 3a013dab: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '5d50bf02a6f34afd493e4d38f784790e08f6bd7e':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:49 +00:00
Svet Ganov
f0de3a5ca3 am f34896bb: am c9f499d2: Merge "Print spooler crash when printing after a rotation." into lmp-mr1-dev 
* commit 'f34896bbeb49aef3509e55ccf9afc7b62ae4dafd':
  Print spooler crash when printing after a rotation.
 2014-11-25 17:37:42 +00:00
Amit Mahajan
0e6d836efa am ed7ccb45: am 77348365: Merge "Set network selection to automatic when in Global mode" into lmp-mr1-dev 
* commit 'ed7ccb45c0ffe5de22af68904ddba4f515eb3f10':
  Set network selection to automatic when in Global mode
 2014-11-25 17:37:37 +00:00
John Reck
b7d40df088 am c68728f5: am b059ff81: am 2b36a86b: Wire up surface width/height to lockHardwareCanvas DO NOT MERGE 
* commit 'c68728f5e97b0f354c00710f2359207d14ef784c':
  Wire up surface width/height to lockHardwareCanvas DO NOT MERGE
 2014-11-25 17:37:31 +00:00
Dianne Hackborn
14dd6ebff6 am d65cb228: am 2bbea56d: Merge "Final resource IDs." into lmp-mr1-dev 
* commit 'd65cb22872b5dbfb5937d66191b60be22b63fd21':
  Final resource IDs.
 2014-11-25 17:36:58 +00:00
Dianne Hackborn
9fafd0c711 am 608439df: am 5bbb1af7: Merge "Work on issue #18486438: Reduce size of bugreport output" into lmp-mr1-dev 
* commit '608439df383b40dc0f808e4992b369debaff29cd':
  Work on issue #18486438: Reduce size of bugreport output
 2014-11-25 17:36:52 +00:00
Jeff Brown
b56c4263c7 am 8cac7309: am b5686d55: am 3d110b23: Make WallpaperService watch the actual display state. 
* commit '8cac73097e3695d22e3529e77048d82f7fa0fb1c':
  Make WallpaperService watch the actual display state.
 2014-11-25 15:10:26 +00:00
Sreeram Ramachandran
1cb0044ece am 608ea322: am 6d0e8711: Merge "Delete unused/non-working code." into lmp-mr1-dev 
* commit '608ea322868385aaa46c20887795e72bf7068479':
  Delete unused/non-working code.
 2014-11-25 15:10:20 +00:00
Sreeram Ramachandran
19f47022e0 am 4096a310: am 45e27327: Merge "Allow VPNs to specify their underlying networks." into lmp-mr1-dev 
* commit '4096a3107b070339ba06102a32a368f28a31f9a4':
  Allow VPNs to specify their underlying networks.
 2014-11-25 15:10:14 +00:00
Sreeram Ramachandran
ca7b070728 am 1d16570b: am aaea7e81: Merge "Eliminate race conditions in UID-based network filtering." into lmp-mr1-dev 
* commit '1d16570b374ffaea89a3e3d403146008d12e60b9':
  Eliminate race conditions in UID-based network filtering.
 2014-11-25 15:10:08 +00:00
Geoff Mendal
e86bc05ac6 am 1df8d4c5: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '1df8d4c5e09e0fc06d7c4a6d313e01906ea4d25e':
  Import translations. DO NOT MERGE
 2014-11-25 15:09:56 +00:00
Jorim Jaggi
649c0ca2a4 am fc4d8043: am f510a8a6: Merge "Tint SIM images in PIN/PUK screen" into lmp-mr1-dev 
* commit 'fc4d8043ded6f8ef5dcf6ffdcb9f2f40c1c369f5':
  Tint SIM images in PIN/PUK screen
 2014-11-25 15:09:46 +00:00
Adrian Roos
e33017b404 am 20eb594a: am 8a924242: Merge "Revert "Only keep user switcher bitmaps if needed"" into lmp-mr1-dev 
* commit '20eb594ab27a9e4dee83574b3fe36a5a6d0d7807':
  Revert "Only keep user switcher bitmaps if needed"
 2014-11-25 15:09:39 +00:00
Adrian Roos
df3be538e0 am 9b4b2940: am 07361c84: Merge "Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045" into lmp-mr1-dev 
* commit '9b4b2940b7697e626200a7ab82fbfa3bf99174fc':
  Follow up to I96c68af9ccc9940acf9fab3b5bd39a3485f01045
 2014-11-25 15:09:33 +00:00
Adrian Roos
9a4d0257be am 520d20c1: am 702d9e31: Merge "Fix DPM.resetPassword("")" into lmp-mr1-dev 
* commit '520d20c1a8c2fbd0d6b7fdc19415167a6f45c866':
  Fix DPM.resetPassword("")
 2014-11-25 15:09:24 +00:00
Christoph Studer
fe6d4f094d am 30646d87: am 67142495: Merge "Fix MediaStyle API comments" into lmp-mr1-dev 
* commit '30646d87f240cd17917ad6d1ae83306d284b58b5':
  Fix MediaStyle API comments
 2014-11-25 15:09:18 +00:00
Chris Wren
ff47355d2b am 865c73b5: am 1aa63f0b: Merge "Push back notification means snooze the package." into lmp-mr1-dev 
* commit '865c73b5f66bfd1e5a9eded75b5a5fb24e701042':
  Push back notification means snooze the package.
 2014-11-25 15:09:12 +00:00
Geoff Mendal
bcd7a52ead am 41d3e943: (-s ours) am ae71b002: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '41d3e943a7245c4a95095027a52224acef174758':
  Import translations. DO NOT MERGE
 2014-11-25 15:08:52 +00:00
Geoff Mendal
40ac65447b am c3ab889f: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'c3ab889f9eda2a6307cc7ef82a626ec66522472a':
  Import translations. DO NOT MERGE
 2014-11-25 15:08:46 +00:00
Geoff Mendal
b57d1ffe02 am c6a1070b: (-s ours) am 9be80ee5: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6a1070bd64bb7eb6cd13c6e3fdb0d33ab19d1f0':
  Import translations. DO NOT MERGE
 2014-11-25 15:08:39 +00:00
Zoltan Szatmary-Ban
3939d6abf2 am 8e55c4bf: am 604aec95: Merge "Add new subcommand \'set-active-admin\' to the dpm command." into lmp-mr1-dev 
* commit '8e55c4bff83af7eea3212bc9ff6a254ac70139fd':
  Add new subcommand 'set-active-admin' to the dpm command.
 2014-11-25 15:08:08 +00:00
Jorim Jaggi
0da89b7640 resolved conflicts for merge of f0fc23a1 to lmp-mr1-dev-plus-aosp 
Change-Id: I8f1dbae2ecd14ae4e51a9e86eb6d36dd56a48be1
 2014-11-25 15:34:56 +01:00
Dirk Dougherty
be8da57a33 am 5977f7d5: am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit '5977f7d52008f9b8dfc429acfde222a6e0afb2a2':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 03:03:46 +00:00
Dirk Dougherty
5977f7d520 am d23a8692: am 14e40f04: am fd117ff2: Doc change: zh-cn translation of Android L overviews. cherrypick from I56d1ce58e10b83d10d0077cc9dfbeb04f090b861 
* commit 'd23a8692ac96b7da73949d2dc4c549e73931609c':
  Doc change: zh-cn translation of Android L overviews. cherrypick from  I56d1ce58e10b83d10d0077cc9dfbeb04f090b861
 2014-11-25 02:58:25 +00:00