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

137463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
34a3f2e0c5 am d01b42c5: Merge "Overscroll header when expanding the panel." into lmp-preview-dev 
* commit 'd01b42c5cdf3acd8a5108abb801b307d0397a19a':
  Overscroll header when expanding the panel.
 2014-05-31 12:27:21 +00:00
Jorim Jaggi
4732af884b Merge "Overscroll header when expanding the panel." into lmp-preview-dev 2014-05-31 12:21:11 +00:00
Jorim Jaggi
290600a08d Overscroll header when expanding the panel. 
Bug: 14486987
Change-Id: I563aabf273328d733d7452af7f54db28934df9d9
 2014-05-31 14:19:25 +02:00
Jorim Jaggi
b54c2517ea am 6fd3d1c3: Merge "Update HUN visuals to UX spec" into lmp-preview-dev 
* commit '6fd3d1c3dd2265a107381c975d2e66dc6193c410':
  Update HUN visuals to UX spec
 2014-05-31 11:47:16 +00:00
Jorim Jaggi
e0b9c34443 Merge "Update HUN visuals to UX spec" into lmp-preview-dev 2014-05-31 11:44:48 +00:00
Adrian Roos
5d9cc668e1 Update HUN visuals to UX spec 
Adds gradient, fixes wrong padding on tablets
and adds a callback mode to swipe helper.

Bug: 15106201
Change-Id: I9c3f2d24665cb3de8e70904893f56c928b0caabb
 2014-05-31 13:43:44 +02:00
Nick Kralevich
3cccd63e56 am 532536f1: am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit '532536f145c3f295cd3ec790dd79f95c00d9d8f5':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 11:39:01 +00:00
Nick Kralevich
50ac763f92 am 332f3581: am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '332f35813e9860b8469b0f804f2b576daa0c823f':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 11:38:54 +00:00
Nick Kralevich
532536f145 am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit 'daa0ee137d43850c834b1ead3f871ceaa49814a7':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 08:51:05 +00:00
Nick Kralevich
332f35813e am 89b88f22: am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '89b88f226928e269e84100154bc78c0f8dc2016e':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 08:49:50 +00:00
Nick Kralevich
daa0ee137d am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks." 
* commit '4f8785f28e6305d427cc3e483248828c9b9b06a2':
  SELinuxMMAC additions to perform policy versioning checks.
 2014-05-31 05:27:46 +00:00
Nick Kralevich
4f8785f28e Merge "SELinuxMMAC additions to perform policy versioning checks." 2014-05-31 05:25:14 +00:00
Nick Kralevich
89b88f2269 am 3a9835d4: Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 
* commit '3a9835d4914bc959a37eefecf4d5d0d20852e3e7':
  Allow SELinuxPolicyInstallReceiver to update new policy files.
 2014-05-31 05:09:37 +00:00
Nick Kralevich
3a9835d491 Merge "Allow SELinuxPolicyInstallReceiver to update new policy files." 2014-05-31 05:07:13 +00:00
Elliott Hughes
f8abeb8457 resolved conflicts for merge of 04c987a8 to master 
Change-Id: I27912e203e4d4e39aef6ffbb58b0934a2796ddfe
 2014-05-30 20:13:15 -07:00
Elliott Hughes
04c987a806 am 79067b3c: am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '79067b3cb2f43e62b9a4d46082fb01cbcc513990':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:29:47 +00:00
Elliott Hughes
79067b3cb2 am 5568e0e4: Merge "Move frameworks/base off private libcore.ICU API." 
* commit '5568e0e45fff7ffe5061770cb527b22d09cf5519':
  Move frameworks/base off private libcore.ICU API.
 2014-05-31 02:26:36 +00:00
Elliott Hughes
5568e0e45f Merge "Move frameworks/base off private libcore.ICU API." 2014-05-31 02:22:24 +00:00
Elliott Hughes
570f44b4ab Move frameworks/base off private libcore.ICU API. 
Change-Id: I55355b7ea68174063f31d6bb08a71bcb9dc76d62
 2014-05-30 19:20:20 -07:00
Adam Powell
fb50dd580d am 8ce8cb05: Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev 
* commit '8ce8cb05143964700d85067fc88ae914f382f0c4':
  Collapse contentInsets and View margins in Toolbars
 2014-05-31 02:00:36 +00:00
Jorim Jaggi
8cdef8293f am 698c8194: Merge "Fade scrim in unlock animation." into lmp-preview-dev 
* commit '698c81948ed277253d567aa4c34996d2d0477992':
  Fade scrim in unlock animation.
 2014-05-31 01:56:15 +00:00
Eric Laurent
3ed851bd07 am f2e19a36: Merge "AudioManager: add audio port gain control" into lmp-preview-dev 
* commit 'f2e19a36973331bbc09284993f772bf6981c10da':
  AudioManager: add audio port gain control
 2014-05-31 01:56:09 +00:00
Eric Laurent
086995c6da am b4499f84: Merge "audio routing update listener" into lmp-preview-dev 
* commit 'b4499f84605faf06479cbb793e945d0af50fdead':
  audio routing update listener
 2014-05-31 01:56:03 +00:00
Eric Laurent
ec2f4b0aec am 47615317: Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev 
* commit '476153173b5a1b6b1fb5fc41af8b87d7e1ec36b3':
  AudioSystem: added JNI for routing extensions
 2014-05-31 01:55:58 +00:00
Dianne Hackborn
0d0aa78a05 am 6647a9db: Merge "Fix IME animation." into lmp-preview-dev 
* commit '6647a9dbc5584ddee154008290c3d25c973f9035':
  Fix IME animation.
 2014-05-31 01:55:52 +00:00
Adam Powell
6a2d5e5b54 Merge "Collapse contentInsets and View margins in Toolbars" into lmp-preview-dev 2014-05-31 01:54:48 +00:00
Adam Powell
7a32401c2a Collapse contentInsets and View margins in Toolbars 
As content insets are meant to help line up the edges of views with
the content in adjacent ViewGroups, collapse individual view margins
with the insets to preserve this property. Margins still define a
minimum spacing between adjacent sibling views or the edges of the
Toolbar container.

Bug 15328526

Change-Id: I786ccdbed6b40930250fa22e2a6d0376d759f2d2
 2014-05-30 18:52:37 -07:00
Jorim Jaggi
d48d7a6d50 Merge "Fade scrim in unlock animation." into lmp-preview-dev 2014-05-31 01:09:19 +00:00
vandwalle
85382f1459 Merge "add uid and debug fields to wifiConfiguration" 2014-05-31 01:08:38 +00:00
vandwalle
8f13548615 add uid and debug fields to wifiConfiguration 
Bug:15111865

Change-Id: I154214c08efe769495cc214cbf65f15d55d83a32
 2014-05-30 18:06:58 -07:00
Yuhao Zheng
901b87d2c7 Merge "Hotspot 2.0 framework - Update implementation" 2014-05-31 00:51:17 +00:00
Eric Laurent
54b5e5bdf6 Merge "AudioManager: add audio port gain control" into lmp-preview-dev 2014-05-31 00:49:58 +00:00
Eric Laurent
8725859ee3 Merge "audio routing update listener" into lmp-preview-dev 2014-05-31 00:49:44 +00:00
Eric Laurent
a89eb2d8e5 Merge "AudioSystem: added JNI for routing extensions" into lmp-preview-dev 2014-05-31 00:49:27 +00:00
Jorim Jaggi
e29b2dbc76 Fade scrim in unlock animation. 
This also introduces a startTime which gets sent from window manager
to SystemUI, which tells when the animation should start, to allow
for a more synchronized animation with fading out the scrim and
fading in the activity behind.

Bug: 15163546
Change-Id: I16212b1ef9eb76f1f98734da1d14fc5b7e626937
 2014-05-31 02:48:06 +02:00
Dianne Hackborn
ba23f6da6e Merge "Fix IME animation." into lmp-preview-dev 2014-05-31 00:47:07 +00:00
Dianne Hackborn
2dcbce3185 Fix IME animation. 
Change-Id: I8999c243a73dbff4ee9b06ebe199e4690286769d
 2014-05-30 17:45:49 -07:00
Eric Laurent
3a24199a0f AudioManager: add audio port gain control 
Implement AudioManager.setAudioPortGain() API.

Bug: 14815883.

Change-Id: Ib54bd1fd1392c474f4767a00228b0a617c51ec5e
 2014-05-30 17:13:10 -07:00
Eric Laurent
700e73471d audio routing update listener 
Implement audio port and audio patch
callback infrastructure for clients to receive
notifications when audio routing changes occur via the
OnAudioPortUpdateListener interface.

Bug: 14815883.

Change-Id: I32cbba64eca7369871aec235ff100de1f0c2d344
 2014-05-30 17:13:10 -07:00
Eric Laurent
b69681c894 AudioSystem: added JNI for routing extensions 
Bug: 14815883.

Change-Id: Ia0c0d14a8e3051a4bc0ce502b6e979135b170c97
 2014-05-30 17:12:48 -07:00
Jeff Tinker
8f3ee7df06 am d99ebf8b: Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev 
* commit 'd99ebf8bc7aaadeb006bfd47e4adc05d9b4e4564':
  Fix name error in com.android.mediadrm.signer.xml
 2014-05-31 00:08:28 +00:00
Jeff Tinker
948d08dcdd Merge "Fix name error in com.android.mediadrm.signer.xml" into lmp-preview-dev 2014-05-31 00:02:59 +00:00
Dianne Hackborn
00fcdc1236 am d6f7d9b7: Merge "Clean up voice API." into lmp-preview-dev 
* commit 'd6f7d9b75931d031086a744cfd18994b2673f311':
  Clean up voice API.
 2014-05-31 00:00:05 +00:00
John Spurlock
2921780f71 am 2a8f11a5: Merge "Resurrect global actions, remove confirmation for Power off." into lmp-preview-dev 
* commit '2a8f11a57053e52c2d0aa17c31b1c021ba0d78b8':
  Resurrect global actions, remove confirmation for Power off.
 2014-05-30 23:55:56 +00:00
Dianne Hackborn
725010a83f Merge "Clean up voice API." into lmp-preview-dev 2014-05-30 23:54:11 +00:00
Jeff Sharkey
43e1565370 am 9a78d4de: Merge "Per-app media directories on external storage." into lmp-preview-dev 
* commit '9a78d4deb2d00dc67b2c11daf76b389e0712b535':
  Per-app media directories on external storage.
 2014-05-30 23:51:46 +00:00
John Spurlock
b8a0feed04 Merge "Resurrect global actions, remove confirmation for Power off." into lmp-preview-dev 2014-05-30 23:51:13 +00:00
Jeff Sharkey
05dc18d69a Merge "Per-app media directories on external storage." into lmp-preview-dev 2014-05-30 23:47:00 +00:00
Dianne Hackborn
a2c076d540 Clean up voice API. 
Add various java docs.

Switch to CharSequence where appropriate.

Add new request for canceling voice interaction.

Also update test app to follow API changes and be more better.

Change-Id: If27eeba53cf6444660adb7d37ea2ce0557c6c91f
 2014-05-30 16:42:57 -07:00
Jeff Sharkey
2ee3c1e189 Per-app media directories on external storage. 
This change defines per-app directories on external storage that
will be scanned and included in MediaStore.  This gives apps a way
to write content to secondary shared storage in a way that can
easily be surfaced to other apps.

Bug: 14382377
Change-Id: I4cb367c870509e76f0c2c598f01e2f699780030a
 2014-05-30 16:26:45 -07:00