Commit Graph

3786 Commits

Author SHA1 Message Date
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
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
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
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
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
Amith Yamasani
3cf75729d5 Variant of sendBroadcast with appOp flag for cross-user.
Needed for delivering SMS notifications to multiple users.

Change-Id: Ib772292699aba37144621742e6f0ee5c68aadd78
2014-05-16 12:37:29 -07:00
Griff Hazen
a13bfae217 am cfa27161: am 50c11659: Fix Notification sdk docs build.
* commit 'cfa271618f5b33eae200c97c6c3624df9d04efc2':
  Fix Notification sdk docs build.
2014-05-16 17:41:28 +00:00
Matthew Williams
691e93e82c TM TaskServiceContext implementation
Each task is run on the client from within a TaskServiceContext.
TSC tracks the state of execution of each task on the client.

Change-Id: I93c306a83c1115559f4e9675d9997dceae3f186a
2014-05-16 10:33:48 -07:00
Jason Monk
8974f24909 Merge "Notify AppOpsService of UserRestrictions and Owners" 2014-05-16 17:30:31 +00:00
Griff Hazen
c091ba8dd0 resolved conflicts for merge of de35b636 to master
Conflicts:
	core/java/android/app/Notification.java

Change-Id: I39ace14c976431bd7f6f1f9d5e4174b0a100aab0
2014-05-16 10:13:26 -07:00
Jason Monk
62062996dd Notify AppOpsService of UserRestrictions and Owners
This makes the DevicePolicyManagerService and UserManagerService
push the DeviceOwner/ProfileOwners and user restrictions on boot
as well as on any change.

This also adds a list of restrictions that allow any op to connected with
a user restriction such that it will return MODE_IGNORED when the user
restriction is present (except for the device/profile owner).

Change-Id: Id8a9591d8f04fe5ecebd95750d9010afc0cd786c
2014-05-16 13:12:41 -04:00
Griff Hazen
cfa271618f am 50c11659: Fix Notification sdk docs build.
* commit '50c11659f0f971e1a6b0adde59247f5de370b74d':
  Fix Notification sdk docs build.
2014-05-16 16:56:47 +00:00
Griff Hazen
50c11659f0 Fix Notification sdk docs build.
Builder#X looked like it was considered ambiguous even though Action
was not in scope. Intellij disagreed but this fixes the issue.

Change-Id: I51fac39b2a4834e25f936c6eae223cda8c9c610e
2014-05-16 09:46:31 -07:00
Griff Hazen
de35b636df am 959591e3: Add support for extendable actions to Notification.
* commit '959591e3ba3934f5bd8ecc2c81ad2a16d226acab':
  Add support for extendable actions to Notification.
2014-05-16 15:40:18 +00:00
Dan Sandler
190d58d621 Badge largeIcons with the notification icon.
The old right-hand small icon is no more; instead the
notification's small icon is overlaid atop the largeIcon
bitmap.

If the small icon would have had a colored circle background
applied to it in the large left-hand slot, it gets a similar
treatment when used as a badge.

Change-Id: I8b262afbdd4faab2beffd294d662f4759f35f3b3
2014-05-16 10:07:54 -04:00
Griff Hazen
959591e3ba Add support for extendable actions to Notification.
Change-Id: I2945a6994a28fc454af3f84e75c96d7619547f01
2014-05-15 22:26:18 -07:00
Alan Viverette
1d90d3e4bf Deprecate FragmentBreadCrumbs, remove styles add in L
Adds comments to the private styles so that we don't try to
update them again in the future.

BUG: 14997266
Change-Id: I0099063d1ce254682aff6bcdd051ebf8719d562b
2014-05-15 16:04:05 -07:00
George Mount
45bbc06c7c Merge "Support Activity Transitions when activity stopped." 2014-05-15 14:49:56 +00:00