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

7780 Commits

Author SHA1 Message Date
Elliott Hughes
10596fbcce resolved conflicts for merge of 3ce4f3d0 to master 
Change-Id: Id5c5997ad8f801b32e1dbd97413ea42e38c27210
 2014-04-28 13:53:25 -07:00
Jorim Jaggi
10c84f0109 Merge "Attemp to fix blank lockscreen #2." 2014-04-28 19:08:41 +00:00
Jorim Jaggi
fa505a7f26 Attemp to fix blank lockscreen #2. 
Bug: 14280857
Change-Id: Ib868cc7a01d24f7169310774a5397b90a2d5b35f
 2014-04-28 21:06:37 +02:00
Jorim Jaggi
d3406d7a1a Merge "Flatten notification hiearchy and remove glow." 2014-04-28 19:01:14 +00:00
Jorim Jaggi
fe40f7d13b Flatten notification hiearchy and remove glow. 
Currently, the padding and the glow was inside the individual
notification. This no longer works if we want to adjust the
padding dynamically whether we are on Keyguard or not. This change
moves the padding outside of the individual notifications, and as
a side effect, removes the glow. The glow wasn't really visible with
the new layout, so it's not a breaking change. We have to discuss
with UX first what the new "glow" solution is going to be.

Change-Id: Iac16892cb3b7bb1de3001954b1428796b07950c1
 2014-04-28 20:59:26 +02:00
Elliott Hughes
3ce4f3d0af am 685a0a72: am bbd87eb9: Merge "Track libcore.os\' move to android.system." 
* commit '685a0a72d445515167a2071330679cdf9b53a62d':
  Track libcore.os' move to android.system.
 2014-04-28 18:36:53 +00:00
Selim Cinek
622e32bb6a Merge "Fixed race condition regarding first child max height" 2014-04-28 18:28:32 +00:00
Selim Cinek
2ba5f1f4e3 Fixed race condition regarding first child max height 
The scroller could crash due to a race condition when updating
the maxheight of the first view.

Bug: 14295010
Change-Id: I911c724a26c8624e2326118e3b392ee675001bc6
 2014-04-28 20:27:32 +02:00
Elliott Hughes
34385d352d Track libcore.os' move to android.system. 
(This is partial, but should cover everything in AOSP master except
for the zygote.)

Change-Id: I1042c99245765746a744c44e714095cb2c6cb75d
 2014-04-28 11:11:32 -07:00
Dan Sandler
f0ef1e9987 Merge "Remove chatty log message." 2014-04-28 14:59:33 +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
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
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
47ffde252e Merge "Delay settings panel visibility until touch slop exceeded." 2014-04-25 18:53:16 +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
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
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
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
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
John Spurlock
0f407279ff Quick settings: interim tile shuffle. 
Ensure BT and location appear in 3x3 mode, by:
 - Adding the three conditional accessibility tiles at the end
 - Moving BT and location above airplane mode (available via global actions)
   and zen mode (sorry).

Bug:14162372
Change-Id: I6d79a7442f091d58643c5124cfe0dcbf6e3cd46f
 2014-04-23 13:22:59 -04:00
Jorim Jaggi
e84d544fe4 Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." 2014-04-23 16:24:04 +00:00
Selim Cinek
b6e0e1228b Fixed a bug where holes could occur in the new shade. 
When a notification was never layouted before and it was the first
child, holes could occur in the shade when dragging down, because its
maximum allowed height was wrongly calculated.

Bug: 14080722
Change-Id: Ia10f9dd95f917d492411aec1da4ae0fc4d8f33d5
 2014-04-23 17:50:48 +02:00
Jorim Jaggi
1568250853 Move redaction logic showing from Keyguard to PhoneStatusBar. 
This removes a race condition and makes redaction more stable.

Change-Id: I4084cdf490c0e52fe26f45cb00524e0876a068bc
 2014-04-23 17:02:25 +02:00
Jeff Sharkey
21de56a946 Add directory selection to DocumentsProvider. 
Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree.  Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12.  Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12.  Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories.  Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way.  Override openAssetFile()
to pass through CancellationSignal.  Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07
 2014-04-22 22:18:21 -07:00
Dan Sandler
c3be450648 Merge "Avoid sending broadcasts before BOOT_COMPLETED." 2014-04-22 18:51:43 +00:00