Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
136,119 Commits 3 Branches 0 Tags
0a1c6f021be032f5aecb341c2794efb06c0a8a0d
Commit Graph

3799 Commits

Author SHA1 Message Date
Dianne Hackborn
fb052926b8 Revert "Hide voice interaction APIs." 
This reverts commit a677a9b9367bcf8c81c36dc59b53554cb347b438.
 2014-05-21 14:16:46 -07:00
Christoph Studer
cee44ba418 Simplify NotificationListenerService API 
Use ParceledListSlice to send the list of active notifications
from NoMan to NotificationListeners.

This allows us to simplify the API to what it was before
introducing the "String[] key" workaround for dealing with large
numbers of StatusBarNotifications.

While we're at it, rename Ranking.getIndexOfKey to something that
makes more sense.

Bug: 15126927
Change-Id: I02c2087978c6c4ec1198be496c6250a66143ecb3
 2014-05-21 22:03:45 +02:00
George Mount
0a69ce6cf6 Merge "Fixed inverse of listener assignment." 2014-05-21 17:54:45 +00:00
Craig Mautner
4ee3580609 Merge "Change method name per API council request" 2014-05-21 16:35:27 +00:00
George Mount
d80154fba1 Fixed inverse of listener assignment. 
Change-Id: Icaa68d54c3f4ca74009edd19ef5ab197b73eb66a
 2014-05-21 08:40:03 -07:00
Emily Bernier
1dcfe9e780 Merge "Connect user audio restrictions to app ops." 2014-05-21 15:17:20 +00:00
George Mount
c84947db56 Merge changes I2da66b54,I8a65428d 
* changes:
  Fix for quick "back" in Activity Transitions.
  Enter and exit transitions are inverted in calling Activity.
 2014-05-21 13:51:44 +00:00
Sander Alewijnse
9853e2a8b3 Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." 2014-05-21 10:34:00 +00:00
Yuhao Zheng
26611efc2a Merge "Hotspot 2.0 framework - add implementation" 2014-05-21 04:21:23 +00:00
Griff Hazen
3d6eed9613 am 08a8c2ca: am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev 
* commit '08a8c2ca45dc859e79d54990d2ae0392d475aeda':
  Fixes to WearableActionExtensions
 2014-05-21 02:48:24 +00:00
Griff Hazen
08a8c2ca45 am ef6aae62: Merge "Fixes to WearableActionExtensions" into klp-modular-dev 
* commit 'ef6aae62f6c92bc9413db60c28cc4b3230f4d2fa':
  Fixes to WearableActionExtensions
 2014-05-21 02:44:16 +00:00
Griff Hazen
4ae73202c3 Fixes to WearableActionExtensions 
* Add missing parcelable creator.
* Review fixes.
* Minor doc fixes.
* Kill SIZE_FULLSCREEN

Change-Id: Iaf6458fdd3482202aa416ebaf2302f79cb48635e
 2014-05-20 18:46:16 -07:00
Roger Chang
7fee7232ee Hotspot 2.0 framework - add implementation 
Bug: 5485670
Change-Id: I4d0f728f4c20676232f2d61bbf49691f6e21a100
 2014-05-20 18:25:56 -07:00
Griff Hazen
7e14285ff5 Merge "resolved conflicts for merge of cbe69ec1 to master" 2014-05-20 23:59:45 +00:00
Amith Yamasani
48f73ef141 Merge "Pass along the appOp param to broadcastIntent" 2014-05-20 23:58:45 +00:00
Amith Yamasani
0261b9b1cc Pass along the appOp param to broadcastIntent 
Forgot to pass that along in the original CL

Change-Id: I3aaa7de9cf5c73ab5cbff367e5889429e9ac2301
 2014-05-20 16:57:26 -07:00
Griff Hazen
d445fe7e54 resolved conflicts for merge of cbe69ec1 to master 
Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6
 2014-05-20 16:53:09 -07:00
Griff Hazen
cbe69ec18d am 7ea18e1c: Add wearable notification extensions to frameworks/base. 
* commit '7ea18e1c92ab84d1a0d00087e6e3784646661fe8':
  Add wearable notification extensions to frameworks/base.
 2014-05-20 23:21:01 +00:00
George Mount
8cab50afda Fix for quick "back" in Activity Transitions. 
Bug 14990153

Stops two potential animators working against the background
drawable. Forces the entering views to become visible onResume.

Change-Id: I2da66b54a16c6c69533eebbeff6db7f5a7794a89
 2014-05-20 15:36:31 -07:00
George Mount
a712e8cc2f Enter and exit transitions are inverted in calling Activity. 
Bug 15115028

Also fixes NPE when there is shared element name mismatch.

Change-Id: I8a65428d4b215ada532e98a555649c2e046de5ef
 2014-05-20 15:34:05 -07:00
Julia Reynolds
37f4e44ae6 Merge "Add Device/Profile Owner gated apis for setting/getting blocked packages." 2014-05-20 22:19:02 +00:00
Julia Reynolds
4d40452154 Merge "Allow device/profile owners to update settings." 2014-05-20 22:10:46 +00:00
Julia Reynolds
966881e895 Add Device/Profile Owner gated apis for setting/getting blocked packages. 
DMAgent currently needs to live in /system/priv-app in order to
(among other things) set and get blocked packages. These APIs will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14945334

Change-Id: I108e2013c67409dca554acf78e3a710745900706
 2014-05-20 17:59:58 -04:00
Julia Reynolds
da55165321 Allow device/profile owners to update settings. 
Device owners can update Settings.Secure and Settings.Global settings.
Profile owners can update Settings.Secure settings.

DMAgent currently needs to live in /system/priv-app in order to
(among other things) update global and secure settings. This change will
get us closer to being able to move DMAgent out of priv-app.
Bug: 14965414

Change-Id: If2cc3a56de91bffde33b838ab8ecea2c32412803
 2014-05-20 17:49:45 -04:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base. 
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
 2014-05-20 13:50:06 -07:00
Griff Hazen
51eb4e657c am 7ba69dd8: am 9e1379f1: Fix sdk docs build for framework from remote input api addition. 
* commit '7ba69dd8bd428494c7a2848b5d3325d47cf4afbf':
  Fix sdk docs build for framework from remote input api addition.
 2014-05-20 20:18:11 +00:00
Griff Hazen
b720abeee8 resolved conflicts for merge of 8f1e7ade to master 
Change-Id: Icabc5d274502abf8d40116d373c9f9d0ac062386
 2014-05-20 13:15:30 -07:00
Griff Hazen
7ba69dd8bd am 9e1379f1: Fix sdk docs build for framework from remote input api addition. 
* commit '9e1379f1126c1101f69445572bd441b2211791fa':
  Fix sdk docs build for framework from remote input api addition.
 2014-05-20 20:07:32 +00:00
Griff Hazen
9e1379f112 Fix sdk docs build for framework from remote input api addition. 
Change-Id: I6a6f3df06d924fe72f67466d67d9feced8d8719f
 2014-05-20 12:51:29 -07:00
Griff Hazen
8f1e7aded3 am 5cadc3b0: Add RemoteInput, Grouping, and Extender to Notification api. 
* commit '5cadc3b00aa775a63518383046c902b130e09b4c':
  Add RemoteInput, Grouping, and Extender to Notification api.
 2014-05-20 18:41:46 +00:00
Griff Hazen
5cadc3b00a Add RemoteInput, Grouping, and Extender to Notification api. 
RemoteInputs annotate actions and content intents to request
input from the user as part of an intent being sent. Results
are sent along using ClipData to avoid unparcel of developer
provided bundle values. A helper method is expexted to be used
to extract results.

Grouping allows notifications to be bundled together, with an optional
summary notification for display on older platforms. SortKey is an
important part of grouping since child notifications will likely have
a prescribed ordering. It is also useful in top level notifications
for apps that want to provide an ordering all other fields being equal.

Also provide a fluid way to to extend Actions and Notifications
using Extenders, e.g.:

Notification n = new NotificationCompat.Builder(context)
    .setOption1()
    .apply(new SomeExtender()
        .setOption2())
    .build();

This helps extension libraries provide a nice API experience for devs.

Change-Id: Ib3438ef854772c2c34d21bf1eb4ed7c9e032106f
 2014-05-20 09:55:39 -07:00
Michael Wright
e4ca30503c resolved conflicts for merge of b3ce4b1b to master 
Change-Id: I7f9abc0eb75f7c7042037e73c8fdb67025a2ee2a
 2014-05-20 09:35:36 -07:00
George Mount
646b1db458 Merge "Add to activity transition API as requested by consumers." 2014-05-20 14:52:50 +00:00
Sander Alewijnse
c7ae2adbee Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE. 
Change-Id: I386c16cc9649d4684bd69966b3c1d2abcb97ca4e
 2014-05-20 15:26:48 +01:00
George Mount
800d72b0e0 Add to activity transition API as requested by consumers. 
Change-Id: Iae01d7560770bab0ff9a1728d6552b98b17108ce
 2014-05-20 07:07:30 -07:00
Michael Wright
b3ce4b1b78 am 889814ce: resolved conflicts for merge of 32912e0a to stage-aosp-master 
* commit '889814cee0ebcf70069d04d3ae77c97c09efb5a1':
  wallpaper: limit wallpaper width to sys.max_texture_size
 2014-05-20 09:28:40 +00:00
Michael Wright
889814cee0 resolved conflicts for merge of 32912e0a to stage-aosp-master 
Change-Id: I140e2024bd0e6e81ab550718103d45220d8bde26
 2014-05-19 22:42:58 -07:00
Donghan Ryu
289c273ec4 wallpaper: limit wallpaper width to sys.max_texture_size 
Image wallpapers are created ~1.5x screen size.  On some devices this
may exceed the maximum supported texture size, which will either fail
allocation or fail to composite.

Bug 991597

Change-Id: I9948b09f6e00a724212e73d36901f2bbea42e2f4
 2014-05-20 12:00:31 +09:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
Craig Mautner
73f843de4b Change method name per API council request 
Activity.finishWithTransition() => finishAfterTransition().

Fixes bug 14997477.

Change-Id: I517f70b3bd6df9962f4bb2acf282e4b9fa91acde
 2014-05-19 10:24:36 -07:00
Winson Chung
9aeb607399 Merge "Enabling alternate recents on all form factors." 2014-05-19 16:18:38 +00:00
Yuhao Zheng
a486447231 Hotspot 2.0 framework APIs -- initial implementation 
Cherry-picked from klp-wireless-dev-mirror
SHA1: e73969fac45aaca72528226dc8c0c5e54fb2cdd4

Bug: 5485670
Change-Id: If3250a2fae181a3774d3158e341220006ad6ebe5
 2014-05-18 09:41:35 -07:00
Winson Chung
71dc28b11e Merge "Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629)" 2014-05-17 00:35:21 +00:00
RoboErik
42ea7eecd1 Rename session classes to have media prefix, hide routes 
This renames several of the core session classes to be prefixed
with Media. It also adds @hide to all route references for now.

Change-Id: Idb42897d490cf24626e4e93ca975b2cb93ec054c
 2014-05-16 16:40:17 -07:00
Dianne Hackborn
f2eba13932 Merge "Hide voice interaction APIs." 2014-05-16 23:32:00 +00:00
Winson Chung
a449dc033b Refactoring RecentsActivityValues into TaskDescription, and ensuring they are resolved when set. (Bug 14995928, 14832629) 
Change-Id: I582221468e63a96a5dfd132a31b09e72099b170f
 2014-05-16 16:24:21 -07:00
Dianne Hackborn
dcff99598f Hide voice interaction APIs. 
Change-Id: I961b6399a6edca239caaba9bbd1dd5e03bc612bd
 2014-05-16 14:32:35 -07:00
Emily Bernier
45775c4f93 Connect user audio restrictions to app ops. 
Setting DISALLOW_ADJUST_VOLUME sets the relevant app ops as well,
blocking calls in AudioService.

Change-Id: I256b294465fc2e8b93cb0389b21299eacf0efb95
 2014-05-16 17:18:20 -04:00
Matthew Williams
4b291fbffc Merge "TM TaskServiceContext implementation" 2014-05-16 20:48:46 +00:00
Amith Yamasani
891e65c5ce Merge "Variant of sendBroadcast with appOp flag for cross-user." 2014-05-16 19:40:20 +00:00