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

148870 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lajos Molnar
0c446727b7 am c7232229: am b18308b2: Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 
* commit 'c7232229bcd34ac29c9a735ad30ed9d785c8b475':
  ImageReader: fix documentation, relax some guarantees
 2014-08-07 15:50:05 +00:00
Lajos Molnar
31a4ec1dfc am b18308b2: Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 
* commit 'b18308b2b2974efbe83301f7d30511c010a55cf1':
  ImageReader: fix documentation, relax some guarantees
 2014-08-07 15:46:52 +00:00
Sandeep Siddhartha
3da5ba05d6 Merge "Fix build break" into lmp-dev 2014-08-07 15:31:24 +00:00
Sandeep Siddhartha
db92e35211 Fix build break 
Change-Id: I7af700671f1a2e910b6e08498381c8adb40631f8
 2014-08-07 11:23:03 -07:00
Sandeep Siddhartha
a13104fe7d Merge "Read audio format from the recognition event" into lmp-dev 2014-08-07 15:31:24 +00:00
Sandeep Siddhartha
2178e2e085 Read audio format from the recognition event 
Bug: 16549061
Change-Id: I9e418f7be67eb330b7bfaa97bbb90d0b5640469d
 2014-08-07 10:48:51 -07:00
Winson Chung
57c84544d9 Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 2014-08-07 15:27:35 +00:00
Winson Chung
ec396d6399 Initial changes to add task affiliation styling. (Bug 16656169) 
- Fixing issue with launch-in-background animation
 2014-08-07 17:57:25 +00:00
Lajos Molnar
785c9a2ae1 Merge "ImageReader: fix documentation, relax some guarantees" into lmp-dev 2014-08-07 15:00:45 +00:00
Robert Ly
8e115e6460 Merge "docs: Documenting fix for CVE-2014-0224 (SSL vulnerability)." into klp-modular-docs 2014-08-07 15:00:45 +00:00
Chet Haase
41a3e2f1a6 am b965512b: am 95aab922: Allow TimePicker/DatePicker to use legacy layout style 
* commit 'b965512bc38f876dc8e0df19f2bee86d52ebb9a8':
  Allow TimePicker/DatePicker to use legacy layout style
 2014-08-07 14:37:06 +00:00
Jorim Jaggi
37ce19343d am 46d73e14: am 8a6c6ec1: Merge "BG protection for user switcher on Keyguard." into lmp-dev 
* commit '46d73e1431c0c2116bb94191ed15b0c627347957':
  BG protection for user switcher on Keyguard.
 2014-08-07 14:33:01 +00:00
Chet Haase
d9f0980441 am 95aab922: Allow TimePicker/DatePicker to use legacy layout style 
* commit '95aab922b35af8aa55d4340a971d07ac35d99d95':
  Allow TimePicker/DatePicker to use legacy layout style
 2014-08-07 14:32:51 +00:00
Chet Haase
3053b2fdcf Allow TimePicker/DatePicker to use legacy layout style 
In L, the TimePicker was rewritten to use a clock face and the
DatePicker was rewritten to use a calendar. This
change allows developers to opt into the old style instead
(android:timePickerMode="spinner|clock" and
android:datePickerMode="spinner|calendar").)

Issue #16717952 Pre-L style android.widget.TimePicker on L
Issue #16846963 Allow developer to use legacy DatePicker appearance

Change-Id: I4ee071fcbc5bf25eab83d6a5cb6ff352a603f90a
 2014-08-07 14:28:49 +00:00
Jorim Jaggi
bed756eeb2 am 8a6c6ec1: Merge "BG protection for user switcher on Keyguard." into lmp-dev 
* commit '8a6c6ec1add6ddca5ce3be73ac5ca042a604440d':
  BG protection for user switcher on Keyguard.
 2014-08-07 14:28:46 +00:00
Dan Sandler
e23d1ce31b am 11dff416: am a20ca819: Merge "Need to post-process all action icons to get the correct color." into lmp-dev 
* commit '11dff4166ce7ea71d3236a1121c261763b77df65':
  Need to post-process all action icons to get the correct color.
 2014-08-07 14:21:14 +00:00
Adrian Roos
3b0592aa44 am 388b2e22: am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 
* commit '388b2e227c1bd2459f2cbdaeaf1856674e2fb73e':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
 2014-08-07 14:17:14 +00:00
Dan Sandler
7e170f9b19 am a20ca819: Merge "Need to post-process all action icons to get the correct color." into lmp-dev 
* commit 'a20ca819cc169c4d8d16d01a4d8ff95df32d1994':
  Need to post-process all action icons to get the correct color.
 2014-08-07 14:16:55 +00:00
Dan Sandler
d37017c48a am 9ae5ba6b: am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit '9ae5ba6bccd918ec8add91987d778ebcdd7e749d':
  Fix screenshots.
 2014-08-07 14:13:14 +00:00
Adrian Roos
68c01cb6ba am c23b9298: Merge "Fix NPE in DevicePolicyManagerService that crashed SystemUI" into lmp-dev 
* commit 'c23b9298ad3544aba73a426c47e84988c709aaeb':
  Fix NPE in DevicePolicyManagerService that crashed SystemUI
 2014-08-07 14:12:53 +00:00
Dan Sandler
2531b787ff am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit '7868868812a8c383476fa8d2997f3acb3bde5865':
  Fix screenshots.
 2014-08-07 14:08:55 +00:00
Adrian Roos
692d041f0c am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit '4902e5ff1cbefa3b2e8a07b434873344a45b21d3':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:04:25 +00:00
Adrian Roos
e901a1540d am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit 'ae9b5cd05215910b69624d028b4288eb50972175':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:00:20 +00:00
Zoltan Szatmary-Ban
2fe77f5393 am f947b96e: am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 
* commit 'f947b96e5b3fcc97cbfb58bc6dae51eebf6a2cd0':
  Revert "Update Trusted Credentials screen in settings"
 2014-08-07 13:49:27 +00:00
Zoltan Szatmary-Ban
47f90bee09 am d76cefa2: am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit 'd76cefa2c6e9454db9339f4a710cdfbdb28f2d74':
  Update Trusted Credentials screen in settings
 2014-08-07 13:49:22 +00:00
Zoltan Szatmary-Ban
5a54a51567 am a37d2244: Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 
* commit 'a37d22442a9472fc59d1f0be224e40627c7300b2':
  Revert "Update Trusted Credentials screen in settings"
 2014-08-07 13:45:35 +00:00
Zoltan Szatmary-Ban
2e5bfc5204 am 74535f61: Merge "Update Trusted Credentials screen in settings" into lmp-dev 
* commit '74535f61795732de57b7562d7c9bf4510c981d78':
  Update Trusted Credentials screen in settings
 2014-08-07 13:45:30 +00:00
Calin Juravle
4df09f6ece am 29965e18: (-s ours) am 7f935726: Merge "Use native ISA for dex code (in case there\'s a NativeBridge)" 
* commit '29965e18ee158c55b4adeded2a72f4b226be94ef':
  Use native ISA for dex code (in case there's a NativeBridge)
 2014-08-07 13:30:29 +00:00
Adrian Roos
2d6ae3453f am d9f0372e: am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit 'd9f0372e41ed87105306d89b825041b56030558b':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:54:41 +00:00
Adrian Roos
1e9bee23ee am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit '5d07fda13caedfe14ed9a39e87d27e5d54982fa0':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:51:20 +00:00
Calin Juravle
29965e18ee am 7f935726: Merge "Use native ISA for dex code (in case there\'s a NativeBridge)" 
* commit '7f93572650d939a416588a17baab87906d310c40':
  Use native ISA for dex code (in case there's a NativeBridge)
 2014-08-07 12:50:12 +00:00
Jorim Jaggi
c4489f990f Merge "BG protection for user switcher on Keyguard." into lmp-dev 2014-08-07 12:44:12 +00:00
Jorim Jaggi
bf1899e64c BG protection for user switcher on Keyguard. 
Also fixes the position.

Bug: 15757197
Bug: 15545213
Change-Id: I9fab98652ab1ccad4e02d5cfa17b212a72a0a0b3
 2014-08-07 15:45:53 +02:00
Dan Sandler
a909b28a13 Merge "Fix screenshots." into lmp-dev 2014-08-07 12:44:12 +00:00
Dan Sandler
deb0d11a43 Fix screenshots. 
Bug: 16861182
Change-Id: I9433cb4a5cc100d85f06eeed18ade3ead5ba8188
 2014-08-07 09:24:03 -04:00
Adrian Roos
0da7093840 Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 2014-08-07 12:44:12 +00:00
Adrian Roos
3c9a350165 Pass initiatedByUser to TrustListeners 
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
 2014-08-07 15:13:09 +02:00
Zoltan Szatmary-Ban
138b324d5d Merge "Revert "Update Trusted Credentials screen in settings"" into lmp-dev 2014-08-07 12:44:12 +00:00
Zoltan Szatmary-Ban
678e3ecc93 Revert "Update Trusted Credentials screen in settings" 
This reverts commit 4fde5aa9fab931d9becfc49f7d7b8526ad5640d9.

Change-Id: I581c38d64e9829b0079bafa42615f2aa0bf64763
 2014-08-07 13:41:08 +00:00
Robin Lee
e00b50a56b am d4fe9b9e: am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev 
* commit 'd4fe9b9ebfeb5de0a4212f694561512d237890d6':
  Permit crash report button for user profiles
 2014-08-07 10:42:34 +00:00
Robin Lee
60317382b3 am 000ef01c: Merge "Permit crash report button for user profiles" into lmp-dev 
* commit '000ef01cdf74e1b95d28be2a465fe69ac747843b':
  Permit crash report button for user profiles
 2014-08-07 10:38:28 +00:00
Ji-Hwan Lee
8a0e4933de am 9ae60bd5: am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services 
* commit '9ae60bd5476bcc3a63d0e3b7196b3482b36fefbb':
  TIF: Handle setMainSession for TV input wrapper services
 2014-08-07 10:16:55 +00:00
Ji-Hwan Lee
4bba00b592 am 1d0fc352: TIF: Handle setMainSession for TV input wrapper services 
* commit '1d0fc352aa10c1f97c8ff03445ebd8e701e4eff7':
  TIF: Handle setMainSession for TV input wrapper services
 2014-08-07 10:13:02 +00:00
Esteban Talavera
42b49fb27f am 25759079: am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit '25759079529c158481a48e2a353b62f6f74f8e64':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:09:23 +00:00
Ji-Hwan Lee
956afc2ba7 TIF: Handle setMainSession for TV input wrapper services 
Bug: 15994065
Change-Id: I46b3c0a89be92036f2c3849a412075caf587ec5c
 2014-08-07 10:05:30 +00:00
Esteban Talavera
8d5e98821c am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit 'cc22fede5a45c2702496a7dce41aeab51275c9f4':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:04:17 +00:00
Robin Lee
830733083b am e625c298: am e07e39b7: Disallow switching managed profile to foreground 
* commit 'e625c2986f238af3729aa4fe81e36cd948b541e9':
  Disallow switching managed profile to foreground
 2014-08-07 09:29:48 +00:00
Kenny Guy
ae267d20c6 Merge "Revert "Remove String version of getBadgedLabel"" into lmp-dev 2014-08-07 09:28:12 +00:00
Kenny Guy
9962f335a1 Revert "Remove String version of getBadgedLabel" 
This reverts commit ed0096c14ae1b17845bc9bb8fbb1cdc47adfdd68.

Change-Id: If026db7e804be81aaa02cfd2a4e1a0a03ee020f1
 2014-08-07 16:48:06 +00:00
Kenny Guy
4a4f275f24 Remove String version of getBadgedLabel 
It was left to allow unbundled apps time to update.

Bug: 16484455
Change-Id: Ibae2576ac7fc88000ec81c669e66536aaa2e3e79
 2014-08-07 11:28:48 +00:00