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

10019 Commits

Author SHA1 Message Date
Winson Chung
38c010dd05 am 06e564d2: am e70eb503: am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit '06e564d23309dc1c5198eda98e975b7fc5f00c61':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 19:17:19 +00:00
Winson Chung
58865b6797 am f9c1251b: Merge "Initial changes to add task affiliation styling. (Bug 16656169)" into lmp-dev 
* commit 'f9c1251b0ca90467a0532b84fc95448e10ccfb95':
  Initial changes to add task affiliation styling.  (Bug 16656169)
 2014-08-07 18:06:38 +00:00
Dan Sandler
165e357a70 am 5f860747: am be100df4: am e23d301e: Merge "Link to new app notification settings from the inspector." into lmp-dev 
* commit '5f8607470887ff189c0660c83c9d99a98065134c':
  Link to new app notification settings from the inspector.
 2014-08-07 16:21:31 +00:00
Dan Sandler
11451ff400 am e23d301e: Merge "Link to new app notification settings from the inspector." into lmp-dev 
* commit 'e23d301e267c320e7e7c103d3d630e09487b3c02':
  Link to new app notification settings from the inspector.
 2014-08-07 16:12:39 +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
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
2531b787ff am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit '7868868812a8c383476fa8d2997f3acb3bde5865':
  Fix screenshots.
 2014-08-07 14:08:55 +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
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
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
3c9a350165 Pass initiatedByUser to TrustListeners 
Bug: 16840500
Change-Id: I8d9bd8fe9a305066f33ac5c888d8a41ce219a6f1
 2014-08-07 15:13:09 +02: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
Dan Sandler
e2a8c53f3f Merge "Link to new app notification settings from the inspector." into lmp-dev 2014-08-07 09:28:12 +00:00
Dan Sandler
e9a4e90db6 Link to new app notification settings from the inspector. 
Also hide the inspector whenever the keyguard changes state,
to make sure we don't leave any notification guts lying
around when you turn the screen on and off or unlock.

Bug: 16208321
Change-Id: I47cf6a0cb82e765eb6b50984972f57616b534ed3
 2014-08-07 12:04:36 -04:00
Adrian Roos
04e5f72cdb Merge "Update User switcher to new spec, implement adding users" into lmp-dev 2014-08-07 09:28:12 +00:00
John Spurlock
4950aecf67 am bd1c5d96: Merge "Common shade width across devices." into lmp-dev 
* commit 'bd1c5d9646450878541179cfbed62b85d6f44f28':
  Common shade width across devices.
 2014-08-07 03:58:41 +00:00
Paul Jensen
e21e71a3ae am c9926974: Switch CaptivePortalLogin app to use theme like Settings UI. 
* commit 'c99269745257bc6b6a20420280e6b12085365803':
  Switch CaptivePortalLogin app to use theme like Settings UI.
 2014-08-07 02:58:33 +00:00
Paul Jensen
8f333f1922 Switch CaptivePortalLogin app to use theme like Settings UI. 
The theme is switched to Theme.Material.Settings.  The progress bar
window feature is not supported in Material (b/16652978) so I added
a progress bar to the layout.  The Theme.Material.Setting's accent
color is set such that ProgressBars are indistinguishable, so accent
color is reset back to the parent's setting.

bug:15409354
Change-Id: Ic2862b8439be8591ec426f3d4dffad72179b2539
 2014-08-07 02:49:24 +00:00
Alan Viverette
c175ea474b am 37f56e55: Update branding colors 
* commit '37f56e55592be690c031090eed3e9e32adb3c1af':
  Update branding colors
 2014-08-07 01:29:28 +00:00
Alan Viverette
ec9d464a59 Update branding colors 
BUG: 16845793
BUG: 16851916
Change-Id: I79a15752b5dda8f3c9f159826c61e3d2a6c8bd48
 2014-08-07 01:13:23 +00:00
Jorim Jaggi
45751c1150 am 50d17095: Merge "Fix hints for tablet lockscreen." into lmp-dev 
* commit '50d17095a476d5196121eeddb5b4b0ea73e87df1':
  Fix hints for tablet lockscreen.
 2014-08-07 00:32:58 +00:00
Jorim Jaggi
2fde49e40f am e2fda8aa: Merge "Fix constant redrawing on Keyguard issue." into lmp-dev 
* commit 'e2fda8aa5ff2125d41c25adbc457dcfba3e7b6ab':
  Fix constant redrawing on Keyguard issue.
 2014-08-07 00:28:10 +00:00
Svetoslav
07aebe7b4a am f287eb85: Polish of the app widgets cross-profiles feature. 
* commit 'f287eb8530ed5b5675af0e8af339e0839816bc0a':
  Polish of the app widgets cross-profiles feature.
 2014-08-07 00:22:36 +00:00
Svetoslav
c71c42fdb2 Polish of the app widgets cross-profiles feature. 
1. Added API for badging an arbitrary drawable at a given location.

2. Updated the icon and previewImage deprecation as they are no longer
   returning a badged drawable. The methods to load the icon and the
   preview are now just making it easier for a developer to get the
   drawables.

3. Fixed a bug in AppWidgetServiceImpl leading to a crash when a user
   is removed.

4. Fixed a bug in AppWidgetHost which was unnecessarily caching its
   package name and having code paths where the cached value was not
   populated when calling into the system.

bug:14991269

Change-Id: I50d011a6597d88814715d5ec04ee67815e8ce0bd
 2014-08-07 00:12:27 +00:00
Jorim Jaggi
afb608b08b am 81a89dee: am 46d73e14: am 8a6c6ec1: Merge "BG protection for user switcher on Keyguard." into lmp-dev 
* commit '81a89dee37c5782282c291d034a8da142ef6e1c3':
  BG protection for user switcher on Keyguard.
 2014-08-07 14:36:37 +00:00
Dan Sandler
6b639422a6 am d1b8aba1: am 9ae5ba6b: am 78688688: Merge "Fix screenshots." into lmp-dev 
* commit 'd1b8aba15526c4be079ee4076e77c69eea31932c':
  Fix screenshots.
 2014-08-07 14:16:43 +00:00
Adrian Roos
afc625a679 am 06407eb4: am 4902e5ff: am ae9b5cd0: Merge "Pass initiatedByUser to TrustListeners" into lmp-dev 
* commit '06407eb441b71d0dd62f38cef72aba140944b711':
  Pass initiatedByUser to TrustListeners
 2014-08-07 14:09:33 +00:00
Adrian Roos
6114f763ad am ba68d800: am d9f0372e: am 5d07fda1: Merge "Update User switcher to new spec, implement adding users" into lmp-dev 
* commit 'ba68d8001a1e3a789ce71b544d8d65f13358c605':
  Update User switcher to new spec, implement adding users
 2014-08-07 12:58:29 +00:00
Esteban Talavera
62b24865c1 am 48ecef05: am 25759079: am cc22fede: Merge "Wipe only managed profile when max number of incorrect passwords exceeded" into lmp-dev 
* commit '48ecef05b8b0998ab1bcb9e1729730b7fa4067de':
  Wipe only managed profile when max number of incorrect passwords exceeded
 2014-08-07 10:13:02 +00:00
John Spurlock
4903169a0c am 60de1a6f: am 7eae8b6f: am bd1c5d96: Merge "Common shade width across devices." into lmp-dev 
* commit '60de1a6f3e23ddbb053e0d13f6b9b06073a86834':
  Common shade width across devices.
 2014-08-07 04:06:43 +00:00
Paul Jensen
07e5d6ee46 am fc8f5a22: am a3f77fe8: am c9926974: Switch CaptivePortalLogin app to use theme like Settings UI. 
* commit 'fc8f5a223c5fa415709e608aa11df91d498a0c95':
  Switch CaptivePortalLogin app to use theme like Settings UI.
 2014-08-07 03:05:44 +00:00
Alan Viverette
dba9dc0481 am 919aea08: am 654d6aa4: am 37f56e55: Update branding colors 
* commit '919aea08da49815ea5456d7dee0cd9a0c7d51da5':
  Update branding colors
 2014-08-07 01:40:51 +00:00
Jorim Jaggi
aa6a170a57 am bd45911d: am 7486c02f: am 50d17095: Merge "Fix hints for tablet lockscreen." into lmp-dev 
* commit 'bd45911d6133141190b99b8b50f393e7682e223d':
  Fix hints for tablet lockscreen.
 2014-08-07 00:44:27 +00:00
Jorim Jaggi
529f919d3f am 552088b7: am b5dc4ea8: am e2fda8aa: Merge "Fix constant redrawing on Keyguard issue." into lmp-dev 
* commit '552088b75c0b7781d8962ee6cdb69a89aef1f0d6':
  Fix constant redrawing on Keyguard issue.
 2014-08-07 00:44:18 +00:00
Svetoslav
d97d65900a am a13e3ab6: am 3892dcfb: am f287eb85: Polish of the app widgets cross-profiles feature. 
* commit 'a13e3ab6c7621ba7d02941bfd001baa9400af56b':
  Polish of the app widgets cross-profiles feature.
 2014-08-07 00:39:40 +00:00
Jorim Jaggi
5557e65b20 Merge "Fix hints for tablet lockscreen." into lmp-dev 2014-08-06 23:49:14 +00:00
Jorim Jaggi
62defa3a87 Fix hints for tablet lockscreen. 
Change-Id: I5f304e2da36467bee8306f611adda30f6dc34b3c
 2014-08-07 02:25:37 +02:00
Jorim Jaggi
0b75f83f14 Fix constant redrawing on Keyguard issue. 
Change-Id: I48d7d746a6f4e737c0292e9f1d4becc5eb6d6294
 2014-08-07 02:20:27 +02:00
Dan Sandler
3f9021b7b9 am 93815ea3: am d14deeb8: am 0de274ff: Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure. 
* commit '93815ea33a3d15fe555539e3a93eb5662f329f3c':
  Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure.
 2014-08-06 18:17:08 +00:00
Dan Sandler
0442d87b76 am 0de274ff: Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure. 
* commit '0de274ff3ca737eb8945a0653948205ddccff5a6':
  Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure.
 2014-08-06 18:05:52 +00:00
Dan Sandler
52e5701eea Move LOCK_SCREEN_SHOW_NOTIFICATIONS to per-user Settings.Secure. 
Bug: 15331132
Change-Id: Ia80ccb2cfdf60116bd50601e60ff131619eafcc5
 2014-08-06 18:00:53 +00:00
Geoff Mendal
20e23a7d30 Merge "Import translations. DO NOT MERGE" 2014-08-06 17:19:40 +00:00
Geoff Mendal
b73a34f353 Import translations. DO NOT MERGE 
Change-Id: I715e2369bec54cbe2072c026a66ace9069f46361
Auto-generated-cl: translation import
 2014-08-06 10:43:58 -07:00
Brian Colonna
74fc555aec am d2a1387c: am f0919ec2: am 92376c7b: Merge "Bug 16147163: Secure camera can now be launched with FUL running" into lmp-dev 
* commit 'd2a1387ca1a7d7b0206574b52544e40ac0204fa7':
  Bug 16147163: Secure camera can now be launched with FUL running
 2014-08-06 17:40:47 +00:00
Jorim Jaggi
ee932db4e0 am 38e09184: am 1af49917: am 9e4e75a4: Merge "Implement face unlock running indicator on Keyguard." into lmp-dev 
* commit '38e0918475c21a543494e8f28682ae6a60637e02':
  Implement face unlock running indicator on Keyguard.
 2014-08-06 17:40:08 +00:00
John Spurlock
179b8053d7 am b77f5b72: am 9cb61176: am 2b49eae5: Merge "Zen: Show subhead for Indefinitely." into lmp-dev 
* commit 'b77f5b72a28469cf5f4d0515fdb8b972f1b3d31b':
  Zen: Show subhead for Indefinitely.
 2014-08-06 17:39:56 +00:00
John Spurlock
6f460bb6ff am 6155248b: am 74ea000c: am ceb386e1: Merge "PowerUI: Remove notification action icons." into lmp-dev 
* commit '6155248b3e8ec4a602db2616fd12f2919c3f2c5f':
  PowerUI: Remove notification action icons.
 2014-08-06 17:39:49 +00:00