Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
151,276 Commits 3 Branches 0 Tags
1fb7dc0c00a72f3ded151ea41ec22b9caa3be42e
Commit Graph

10387 Commits

Author SHA1 Message Date
Jeff Davidson
1fb7dc0c00 am e00e0e4e: am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'e00e0e4e0d2b1b2620649c46d483fac38f541b56':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:20:51 +00:00
Jeff Davidson
577bf51765 am daf54483: Merge "Restore legacy VPN stats dialog strings." into lmp-dev 
* commit 'daf5448383a02017bb761841d675c3630ec94cac':
  Restore legacy VPN stats dialog strings.
 2014-08-23 00:12:49 +00:00
Jeff Davidson
8288c5b821 Merge "Restore legacy VPN stats dialog strings." into lmp-dev 2014-08-23 00:03:28 +00:00
Jeff Davidson
8a5a9d32c2 Restore legacy VPN stats dialog strings. 
Bug: 17164793
Change-Id: I5927cdc4f1ceef4cd1cc1b5d17ae97d285bd9a39
 2014-08-22 16:55:32 -07:00
Jim Miller
db2fb70b19 am 752889a9: am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '752889a944402983874e04da6f613872275aa3d0':
  Update TrustAgentService API after review.
 2014-08-22 23:28:08 +00:00
Jim Miller
7d95c50fd6 am 9af7f4f6: Merge "Update TrustAgentService API after review." into lmp-dev 
* commit '9af7f4f66652d659fb17f4bc502362f0e6faf175':
  Update TrustAgentService API after review.
 2014-08-22 23:18:16 +00:00
Jim Miller
d4efaac5d5 Update TrustAgentService API after review. 
Also documents timebase on related DevicePolicyManager API.

Fixes bugs 16401527 and 17046034

Change-Id: I8ee6d0055ab6f52ec71630344d3232f7875d9c1d
 2014-08-22 22:43:30 +00:00
John Spurlock
48b9ca16f6 am c7d47057: am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'c7d47057359ba66ce7ca56a20b7bcdf9af522042':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:23:15 +00:00
John Spurlock
fd7c9500d0 am fa0f8288: Merge "Display notification effects suppressor in the volume panel." into lmp-dev 
* commit 'fa0f82886a3074b2990df9354eb320461f44bc50':
  Display notification effects suppressor in the volume panel.
 2014-08-22 22:12:10 +00:00
John Spurlock
7653a30ea0 Merge "Display notification effects suppressor in the volume panel." into lmp-dev 2014-08-22 22:09:35 +00:00
John Spurlock
b4782526f5 Display notification effects suppressor in the volume panel. 
Bug:16958514

Change-Id: I0eac173875e8af62e3c6b39001722c3fda4517de
 2014-08-22 18:08:17 -04:00
Amith Yamasani
61b7dff862 am 0c581229: am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '0c581229cd4986c07bb877f8211a8c5471633efb':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:24:20 +00:00
Amith Yamasani
dbca3c3121 am 654d72fd: Merge "Show a user switching dialog before starting the user switch" into lmp-dev 
* commit '654d72fd3c12bf0470e88debb0701a949914607e':
  Show a user switching dialog before starting the user switch
 2014-08-22 21:14:10 +00:00
Amith Yamasani
7805a10c86 Show a user switching dialog before starting the user switch 
switchUser() now first shows a dialog and the dialog calls
startUserInForeground to do the actual switch.

Bug: 16661752
Change-Id: Ie4e2e9eec8bf7c2116694072ea8555b8254a0e13
 2014-08-22 13:00:22 -07:00
Jason Monk
3880d305da am 5ed40dc5: am 8db91925: Merge "Switch to proper networkcallback api" into lmp-dev 
* commit '5ed40dc54267a2614e7275dbe0900c220500b711':
  Switch to proper networkcallback api
 2014-08-22 17:16:09 +00:00
Jason Monk
f45161aa07 am 8db91925: Merge "Switch to proper networkcallback api" into lmp-dev 
* commit '8db919252fec6cb7b7311f2e186315f05a9a9a02':
  Switch to proper networkcallback api
 2014-08-22 17:04:36 +00:00
Jason Monk
2180d39407 Merge "Switch to proper networkcallback api" into lmp-dev 2014-08-22 16:56:44 +00:00
Baligh Uddin
a79cdd0485 Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-08-22 16:50:08 +00:00
John Spurlock
cc5f950399 am ccb802e1: am d2792dae: Merge "Zen: "Muted by <x>" indicator string." into lmp-dev 
* commit 'ccb802e166964373bc191d3bacb400013197d387':
  Zen: "Muted by <x>" indicator string.
 2014-08-22 16:25:22 +00:00
John Spurlock
b49d837ef8 am d2792dae: Merge "Zen: "Muted by <x>" indicator string." into lmp-dev 
* commit 'd2792dae7f4bf729f39706a04809a03f38fd64a0':
  Zen: "Muted by <x>" indicator string.
 2014-08-22 16:14:47 +00:00
John Spurlock
2b0fea9b1a Merge "Zen: "Muted by <x>" indicator string." into lmp-dev 2014-08-22 16:06:06 +00:00
Selim Cinek
30ab8b29e4 am 3f74d64c: am 953dd5e4: Merge "Fixed focusing order for the notification panel and QS" into lmp-dev 
* commit '3f74d64c5fdae7286eb23481eed498036571d7a8':
  Fixed focusing order for the notification panel and QS
 2014-08-22 15:59:08 +00:00
Selim Cinek
415ccb29f2 am 953dd5e4: Merge "Fixed focusing order for the notification panel and QS" into lmp-dev 
* commit '953dd5e4722cf05c08d30ee4f0f653023e499e0b':
  Fixed focusing order for the notification panel and QS
 2014-08-22 15:48:52 +00:00
Selim Cinek
ece4a834e8 Merge "Fixed focusing order for the notification panel and QS" into lmp-dev 2014-08-22 15:35:54 +00:00
Jason Monk
92b5c8196b Switch to proper networkcallback api 
This will listen properly for the connection of the VPNs.  It will
also listen for disconnects, but may catch them slightly delayed
as the connection may be held on to.

Bug: 16153201
Bug: 17164598
Change-Id: I0c522f7fb4007c3376153c4b2a0345391e0b724f
 2014-08-22 11:26:32 -04:00
Selim Cinek
e32010ac61 Fixed focusing order for the notification panel and QS 
Also fixed multiple bugs regarding focusability, where
some elements were focusable even though invisible.
The buttons, QS-tiles, QS-detail buttons, QS Header
icons and other elements now have the correct focusability
state.
The rect indicating accessibility focus is now also
correct for dual label tiles, instead of just the whole
button.
Also fixes an ordering issue where notifications were above
the camera circle when launching.
In addition the focus order of the notifications now work
correctly.

Bug: 15569922
Bug: 15682123
Bug: 17159249
Bug: 15690386
Change-Id: Ie9f7ae73397b41ce2e9a4060699301fdef3a0d01
 2014-08-22 17:13:36 +02:00
John Spurlock
a34cb5e363 Zen: "Muted by <x>" indicator string. 
Bug:16958514
Change-Id: Ic2b9cde74df29ce70f4991f64759544c91e9fac3
 2014-08-22 10:52:55 -04:00
Kenny Guy
dabe02d6ca am 1b637e65: am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '1b637e652374daa50524623852fd3cdc868a8117':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:37:46 +00:00
Christoph Studer
51e87b82b7 am 6cddeb73: am 2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev 
* commit '6cddeb7337d1f8649dd94a4aec08e16f2cf1b2a0':
  SysUI: Fix NotificationData dump
 2014-08-22 14:37:40 +00:00
Kenny Guy
6a205dd37e am 28088d5b: Merge "Fix notification badge when line 3 not shown." into lmp-dev 
* commit '28088d5b3b58a815910e815347cf38e8093a7d7a':
  Fix notification badge when line 3 not shown.
 2014-08-22 14:26:56 +00:00
Christoph Studer
652f3e84f6 am 2af8bb02: Merge "SysUI: Fix NotificationData dump" into lmp-dev 
* commit '2af8bb0244633292d0143f9204363db1919166cf':
  SysUI: Fix NotificationData dump
 2014-08-22 14:26:50 +00:00
Kenny Guy
91d065bcbf Merge "Fix notification badge when line 3 not shown." into lmp-dev 2014-08-22 14:20:31 +00:00
Christoph Studer
17cda4f80f Merge "SysUI: Fix NotificationData dump" into lmp-dev 2014-08-22 14:18:04 +00:00
Christoph Studer
11840cdca9 SysUI: Fix NotificationData dump 
Inactive notification count and indices were off.

Change-Id: I6e8555fe7dcaf6e7f999f09fb4cda56622928b07
 2014-08-22 16:06:49 +02:00
John Spurlock
25adf47efb am e12bd4d1: am 4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 
* commit 'e12bd4d1c3cb9b0ff852c13f33efc49b3229da5c':
  QS: Repoint Wifi + BT dual tile labels to settings.
 2014-08-22 13:39:43 +00:00
John Spurlock
b920f8f453 am 43a6f7ac: am a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev 
* commit '43a6f7acf9e50dc3005ac358d020bb63e9cb1476':
  Don't do ambient display when in power-conservation mode.
 2014-08-22 13:39:39 +00:00
Jorim Jaggi
c54d5a3b06 am df0fc631: am f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev 
* commit 'df0fc631614177fe95cec5ab2adaa131eb2d9a19':
  Content description for padlock icon depending on state
 2014-08-22 13:39:34 +00:00
John Spurlock
d3ca9165d2 am 4ebb6384: Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 
* commit '4ebb638496a76b1810a655e9196bf41641690a48':
  QS: Repoint Wifi + BT dual tile labels to settings.
 2014-08-22 13:30:24 +00:00
John Spurlock
a0125c91ca am a15effc2: Merge "Don\'t do ambient display when in power-conservation mode." into lmp-dev 
* commit 'a15effc2f830a13c9b5a997b1c132e56ea5b6e9c':
  Don't do ambient display when in power-conservation mode.
 2014-08-22 13:30:20 +00:00
Jorim Jaggi
3631717fda am f229ee63: Merge "Content description for padlock icon depending on state" into lmp-dev 
* commit 'f229ee632cdf798ef2b1b68a438cd63ca7bbded9':
  Content description for padlock icon depending on state
 2014-08-22 13:30:15 +00:00
John Spurlock
2cd26fa48a Merge "QS: Repoint Wifi + BT dual tile labels to settings." into lmp-dev 2014-08-22 13:27:47 +00:00
John Spurlock
bd60d7f568 Merge "Don't do ambient display when in power-conservation mode." into lmp-dev 2014-08-22 13:27:29 +00:00
Jorim Jaggi
414b152856 Merge "Content description for padlock icon depending on state" into lmp-dev 2014-08-22 13:21:46 +00:00
John Spurlock
438c847c30 am 6fa1365b: am 36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev 
* commit '6fa1365bf0e9c5c192dec84e10f6baea23dd07ee':
  Doze: Improve icon treatment when dozing.
 2014-08-22 13:15:52 +00:00
John Spurlock
45ff7a7285 am 36902e93: Merge "Doze: Improve icon treatment when dozing." into lmp-dev 
* commit '36902e93d806da8766c483e4271ac72945927d23':
  Doze: Improve icon treatment when dozing.
 2014-08-22 13:06:48 +00:00
John Spurlock
d96179e02d Don't do ambient display when in power-conservation mode. 
Finish SystemUI's doze dream early when we enter saver mode.

Bug:17164834
Change-Id: I79153be34da8c4b6447acf5dc9f93364906b2bab
 2014-08-22 09:02:58 -04:00
John Spurlock
394fd61115 Merge "Doze: Improve icon treatment when dozing." into lmp-dev 2014-08-22 12:59:16 +00:00
Kenny Guy
98193ea54f Fix notification badge when line 3 not shown. 
Ongoing notifications from chrome and drive
don't have content in line 3 so profile badge
wasn't shown.
Add profile badge to large notifications which
hide line 3.

Bug: 16366324
Change-Id: Ib4f1e888674743aa8ef93b7eaceae72602d8df4d
 2014-08-22 13:30:58 +01:00
Winson Chung
1855156bd8 am 2a5db3ba: am 6181cbf5: Minor tweaks to recents thumbnails. 
* commit '2a5db3bac9b1d716dc051d2e15333885b32e0953':
  Minor tweaks to recents thumbnails.
 2014-08-22 02:59:31 +00:00
Winson Chung
67c2c86f3b am 6181cbf5: Minor tweaks to recents thumbnails. 
* commit '6181cbf5ba9e6b2ef528767c3f79e77506a6ad59':
  Minor tweaks to recents thumbnails.
 2014-08-22 01:12:34 +00:00