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

7927 Commits

Author SHA1 Message Date
Dan Sandler
7e4a36c34a am cf26a842: Merge "Remove chatty log message." 
* commit 'cf26a8426285674d2c2f293762c489faeba3f775':
  Remove chatty log message.
 2014-04-28 15:04:30 +00:00
Dan Sandler
f0ef1e9987 Merge "Remove chatty log message." 2014-04-28 14:59:33 +00:00
Jorim Jaggi
46da668b13 am 3daa96f4: Merge "Add carrier text on lockscreen in top left corner." 
* commit '3daa96f406d2cb46b55d71c696ce81656a7a2682':
  Add carrier text on lockscreen in top left corner.
 2014-04-28 12:21:57 +00:00
Jorim Jaggi
b039603867 Merge "Add carrier text on lockscreen in top left corner." 2014-04-28 12:18:44 +00:00
John Spurlock
4210a3091c am c1644c59: Wire up condition providers to zen mode exit triggers. 
* commit 'c1644c590bbc24955ecd367cb4c8e368c24fe2e5':
  Wire up condition providers to zen mode exit triggers.
 2014-04-27 16:04:22 +00:00
John Spurlock
e77bb36d48 Wire up condition providers to zen mode exit triggers. 
Bug:13743109
Change-Id: I4e45d7050d1f9aaa379f46379a3203e61e216a3d
 2014-04-27 11:36:32 -04:00
Wink Saville
994a9a39b5 am e9c9547e: am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit 'e9c9547e899a7095f3fb420df7d4d809ab13ea57':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:35:49 +00:00
Jim Miller
953c4e04fa am 427b7fb5: Merge "Add new DevicePolicyManager disable flags for keyguard." 
* commit '427b7fb50b5c2c8f38612a74a7c46ff056e22e68':
  Add new DevicePolicyManager disable flags for keyguard.
 2014-04-26 00:35:45 +00:00
Wink Saville
ae166fe9e0 am c79963c3: am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit 'c79963c3cb6d0127e2fc9ce5bf000fa05811504d':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:28:56 +00:00
Jim Miller
66fbe3dc81 Merge "Add new DevicePolicyManager disable flags for keyguard." 2014-04-26 00:28:44 +00:00
Wink Saville
c79963c3cb am 1c1827a6: am 3f4867f4: Merge "Telephony: Add functionality to handle ICC IO error" 
* commit '1c1827a6402c3a1f38ba077289a9022f6e6d3f73':
  Telephony: Add functionality to handle ICC IO error
 2014-04-26 00:25:44 +00:00
Wink Saville
3f4867f49d Merge "Telephony: Add functionality to handle ICC IO error" 2014-04-25 23:58:11 +00:00
Jim Miller
50e62183d4 Add new DevicePolicyManager disable flags for keyguard. 
- KEYGUARD_DISABLE_SECURE_NOTIFICATIONS
- KEYGUARD_DISABLE_UNREDACTED_NOTIFICATIONS
- KEYGUARD_DISABLE_TRUST_AGENTS

Change-Id: I4ed2b9cef78b497d87bb719c57fabdad94c18e82
 2014-04-25 13:27:10 -07:00
John Spurlock
96e358e777 am f85cfcf4: Merge "Delay settings panel visibility until touch slop exceeded." 
* commit 'f85cfcf4c0ab813b6694a3cc88a20e9ca7e100af':
  Delay settings panel visibility until touch slop exceeded.
 2014-04-25 18:56:40 +00:00
John Spurlock
47ffde252e Merge "Delay settings panel visibility until touch slop exceeded." 2014-04-25 18:53:16 +00:00
Allen Hair
d5b9768f53 am 3647eec9: Merge "Fixed shell manifest to use correct permission." 
* commit '3647eec94bd47e45dc1db1ce23437ae45fa6247d':
  Fixed shell manifest to use correct permission.
 2014-04-25 17:01:28 +00:00
Allen Hair
7659093187 Merge "Fixed shell manifest to use correct permission." 2014-04-25 16:57:35 +00:00
John Spurlock
4e9d7c1797 Delay settings panel visibility until touch slop exceeded. 
Bug:14271219
Change-Id: Ic8f36670f8d56f74a383ca7a867b69c7568a7250
 2014-04-25 12:18:46 -04:00
Jorim Jaggi
e8bd50b00c am 1578e08d: Merge "Attempt to fix blank lockscreen." 
* commit '1578e08db4db31faf0b44a948c93f9992077c131':
  Attempt to fix blank lockscreen.
 2014-04-25 16:18:02 +00:00
Elliott Hughes
6a885ba4a0 am ccec5f0d: resolved conflicts for merge of 02e85744 to master 
* commit 'ccec5f0def723baa6c4c80bd7ff1971a32c9d8c3':
  Use the suggested public API instead of libcore.os.
 2014-04-25 16:08:43 +00:00
Winson Chung
0aed0dd40a am 67b082e0: Merge "Enabling doc centric recents on phones." 
* commit '67b082e02cbfb7bafe046a619e686e9a5c1abc05':
  Enabling doc centric recents on phones.
 2014-04-25 16:08:17 +00:00
Jorim Jaggi
bea6990e64 am fb2b6bc6: Merge "Add text view for double-tap and unlock hint on Keyguard." 
* commit 'fb2b6bc62d54a6abdc2ec61c2299e060b6ae6671':
  Add text view for double-tap and unlock hint on Keyguard.
 2014-04-25 15:52:20 +00:00
Jorim Jaggi
1578e08db4 Merge "Attempt to fix blank lockscreen." 2014-04-25 13:13:12 +00:00
Jorim Jaggi
c357ca2013 Attempt to fix blank lockscreen. 
Bug: 14280857
Change-Id: Icf458040b1a0b0a412981acf7b522d04c046a5f8
 2014-04-25 14:56:15 +02:00
Jorim Jaggi
25807936e8 Add carrier text on lockscreen in top left corner. 
Change-Id: I88c96eabc4b97295da5c1094db3fd22fcc637390
 2014-04-25 14:18:07 +02:00
Elliott Hughes
ccec5f0def resolved conflicts for merge of 02e85744 to master 
Change-Id: Id4c0ecfedc7ec4ff4b76331be025817445a652e9
 2014-04-24 17:18:10 -07:00
Elliott Hughes
02e857441f am 5f5ca3bc: am 31a1dd2a: Merge "Use the suggested public API instead of libcore.os." 
* commit '5f5ca3bc98fb773ee905289300595ad95d5ffabe':
  Use the suggested public API instead of libcore.os.
 2014-04-24 23:59:05 +00:00
Winson Chung
67b082e02c Merge "Enabling doc centric recents on phones." 2014-04-24 23:24:40 +00:00
Elliott Hughes
cacbe1b1ef Use the suggested public API instead of libcore.os. 
Change-Id: Id392e4c36c5721ca609d88d9ec6b9340ce05274c
 2014-04-24 16:19:27 -07:00
Jorim Jaggi
fb2b6bc62d Merge "Add text view for double-tap and unlock hint on Keyguard." 2014-04-24 20:34:30 +00:00
Jorim Jaggi
e70d31f48d Add text view for double-tap and unlock hint on Keyguard. 
Bug: 14080971
Change-Id: Id6f7344b01bb9666fe6add415ec4a28163315967
 2014-04-24 22:08:30 +02:00
Dan Sandler
f68448ef61 Remove chatty log message. 
Change-Id: If0acc3be413d86c87a2a8c68fdcf94bada7e0903
 2014-04-24 15:54:16 -04:00
Baligh Uddin
6ec0b32173 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:38 +00:00
Baligh Uddin
b2cb3a2518 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:20 +00:00
Baligh Uddin
781d1ca2c5 Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:14 +00:00
Baligh Uddin
9ea712006d Merge "Import translations. DO NOT MERGE" 2014-04-24 14:28:12 +00:00
Winson Chung
d937bb24b8 am 628f8966: Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)" 
* commit '628f89667410f8c1d7e8892292aa36634f3e3384':
  Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)
 2014-04-24 00:27:28 +00:00
Amith Yamasani
d33a3be7d1 am 5451c559: Merge "Don\'t show managed profiles in the user switcher" 
* commit '5451c559ecd3ac45e3d4dfc5838cb1996404116d':
  Don't show managed profiles in the user switcher
 2014-04-24 00:27:19 +00:00
Winson Chung
628f896674 Merge "Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718)" 2014-04-24 00:14:03 +00:00
Winson Chung
80693f9fb5 Fixing crash in SystemServicesProxy getting activity label (Bug. 14260718) 
- Fixing issue with wrong margins due to moved activity icon

Change-Id: Ib3631dc4cf4244d44737ee95b597bd25653815c8
 2014-04-23 16:48:33 -07:00
Amith Yamasani
921b71e95f Don't show managed profiles in the user switcher 
Only show users that you can switch to.

Change-Id: Iff6dfccc27230f824d73d02731a045c69419b814
 2014-04-23 14:43:23 -07:00
John Spurlock
6f1b54e455 am 7f2ffe4f: Merge "Avoid panel "flip" animations when possible." 
* commit '7f2ffe4fe1daf8a986bd9a6027973dc72145a432':
  Avoid panel "flip" animations when possible.
 2014-04-23 20:38:17 +00:00
John Spurlock
17880ef81f Avoid panel "flip" animations when possible. 
Bug:14271219
Change-Id: I91632c073497718e2fd53ad172ec805f54514696
 2014-04-23 16:13:56 -04:00
Baligh Uddin
07f14e11a1 Import translations. DO NOT MERGE 
Change-Id: Id3aec0b4534311c2ca89dcf86e04566c0cf025c3
Auto-generated-cl: translation import
 2014-04-23 12:16:20 -07:00
Baligh Uddin
6b5a2f97b7 Import translations. DO NOT MERGE 
Change-Id: Ic8c5ae13c6ed3ad711170586a245452195c6d963
Auto-generated-cl: translation import
 2014-04-23 12:12:46 -07:00
Baligh Uddin
0547bafcbb Import translations. DO NOT MERGE 
Change-Id: I71ec42f4923a70bc8e34f16a55ffeb5f63e92ec8
Auto-generated-cl: translation import
 2014-04-23 12:05:40 -07:00
Baligh Uddin
473a973054 Import translations. DO NOT MERGE 
Change-Id: I486facdbdbfdc4cafe23f0412e7b548a11792480
Auto-generated-cl: translation import
 2014-04-23 11:21:37 -07:00
John Spurlock
2550e9e6b8 am 4e8cf150: Merge "Quick settings: interim tile shuffle." 
* commit '4e8cf1508f22f88203cd9bf4467aaddd3f4502c6':
  Quick settings: interim tile shuffle.
 2014-04-23 17:50:37 +00:00
John Spurlock
4e8cf1508f Merge "Quick settings: interim tile shuffle." 2014-04-23 17:46:45 +00:00
Allen Hair
59d2b43ad0 Fixed shell manifest to use correct permission. 
Changed RENDER_STATS to FRAME_STATS. There is no RENDER_STATS
permission.

Change-Id: Iaf81b9e5a1580108da2d58e9c00a77a2b1093fdf
 2014-04-23 10:23:07 -07:00