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

7150 Commits

Author SHA1 Message Date
Griff Hazen
7e14285ff5 Merge "resolved conflicts for merge of cbe69ec1 to master" 2014-05-20 23:59:45 +00:00
Griff Hazen
d445fe7e54 resolved conflicts for merge of cbe69ec1 to master 
Change-Id: I183f94c726c9acb3de7d9369e315cc4ae1ff92d6
 2014-05-20 16:53:09 -07:00
Andres Morales
94a17b5f18 Merge "Revert "Adding INfcUnlockSettings and NfcUnlock interface class."" 2014-05-20 23:40:37 +00:00
Chris Craik
47a7d61e70 Merge "Clean up Outline API, method on drawable" 2014-05-20 23:27:21 +00: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
Jim Miller
430259a1d8 Merge "Update FingerprintManager API after discussions." 2014-05-20 23:18:48 +00:00
Amith Yamasani
863ddcc7ac Merge "Per-user telephony restrictions" 2014-05-20 22:20:06 +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
Amith Yamasani
9f6c25f57e Per-user telephony restrictions 
Allow profile owners or administrators of restricted profiles
to restrict access to telephony features such as calling and
texting for a user.

Change-Id: I89f97608c07c647ad8a7b43fef9d1e6bc4a84e95
 2014-05-20 15:13:28 -07: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
RoboErik
23a42810e3 Merge "Add getMediaSession to RCC" 2014-05-20 21:02:18 +00:00
RoboErik
5f31737c68 Add getMediaSession to RCC 
This is to make integration with Media notifications easier.

Change-Id: I783ae5c2620ff0e11bf5584604b9c9623850e2f0
 2014-05-20 14:00:53 -07:00
Griff Hazen
7ea18e1c92 Add wearable notification extensions to frameworks/base. 
Change-Id: Ic312cec7dc11e637002ff2be3975940a93a6babf
 2014-05-20 13:50:06 -07:00
Griff Hazen
b720abeee8 resolved conflicts for merge of 8f1e7ade to master 
Change-Id: Icabc5d274502abf8d40116d373c9f9d0ac062386
 2014-05-20 13:15:30 -07:00
Mike Lockwood
5633e37ec1 Merge "USB: Minor cleanup from API council review" 2014-05-20 18:58:35 +00: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
Mike Lockwood
fa2b3fc6cd USB: Minor cleanup from API council review 
Bug: 15089961
Change-Id: I8a22fad94d2a52d2270c89240b2a47bd1cef17b5
 2014-05-20 11:14:58 -07:00
Ben Murdoch
f564c7fe86 resolved conflicts for merge of ecf09321 to master 
Change-Id: I7a440204dfc79f3b82bd95d3d1276158bf3d44a2
 2014-05-20 19:13:39 +01:00
Alan Viverette
d41b911680 Revert "Various API council fixes to drawables" 
This reverts commit a2146b713c3b2f3bf215cfd42b012cf31f2f6e8a.

Change-Id: I80d5e3e0d0bfa5eb18021e2783fa92a6f12d7bf8
 2014-05-20 10:51:38 -07:00
Alan Viverette
f31512eb17 Merge "Various API council fixes to drawables" 2014-05-20 17:45:52 +00:00
Alan Viverette
e5b082d6eb Various API council fixes to drawables 
BUG: 15089957
Change-Id: Ieaf468bbff092e68f6313d8a5ecccda8b753806d
 2014-05-20 10:45:22 -07:00
Chris Craik
7dc5b41e60 Clean up Outline API, method on drawable 
bug:15025466
bug:15089680
Change-Id: I8d3b64a0d9dbdbaf679042c8b384d2050323a8e6
 2014-05-20 10:38:59 -07:00
Andres Morales
62b25a5bf0 Revert "Adding INfcUnlockSettings and NfcUnlock interface class." 
This will be re-added as a Trustlet in a subsequent CL.

This reverts commit 38a7ed05f8fed0aa81f7214d827875f9876ffbe1.

Change-Id: I5aa36df42a7751f165b4ef184e0cda57e5568b59
 2014-05-20 16:59:34 +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
Christoph Studer
05ad48206a Add ZEN and speedbump to NotificationListenerService 
Change-Id: I39fae5d77863e0d10cf236a096cc589167d146d3
 2014-05-20 17:03:22 +02:00
George Mount
646b1db458 Merge "Add to activity transition API as requested by consumers." 2014-05-20 14:52:50 +00:00
George Mount
41fc656b38 Merge "API Review: split out BidirectionalTypeConverter." 2014-05-20 14:51:39 +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
Ben Murdoch
ecf09321c5 am e0d6a6b0: Merge "Add PackagManager flag for WebView system feature." into klp-modular-dev 
* commit 'e0d6a6b05b0861a5aa6dd8189de61a4da8d39dae':
  Add PackagManager flag for WebView system feature.
 2014-05-20 09:39:05 +00:00
Wei Wang
adf6aff5b0 Revert "Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising."" 
This reverts commit b1d9fbc0f8dea0c77ed810190b325bfdaaf21789.

Change-Id: Ic8dec9385a7c763170ebeb1bcddd221c72f46e88
 2014-05-19 23:52:45 -07:00
Wei Wang
319b40c9cf Revert "APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple advertising." 
This reverts commit 2c4e68a86b7a9b9f760a8907b93ff40ccad56c80.

Change-Id: I98c91343d886ebe22d0bf75a710fa0b0abf738b6
 2014-05-20 04:52:35 +00:00
Wei Wang
62d5bc745a APIs for BLE scan, scan filter, batch scan, onFound/onLost and multiple 
advertising.

Change-Id: I1655eb9cffa890b6fe38108bf51078662e90bc03
 2014-05-19 19:40:49 -07:00
Christopher Tate
f15e3bd9e5 Merge "Move the non-market install setting from Global to per-user Secure" 2014-05-20 01:10:05 +00:00
Christopher Tate
aa036a2db0 Move the non-market install setting from Global to per-user Secure 
Bug 13760585

Change-Id: I45b0fa87e72dc5c18d687261fb95cbea5d06163a
 2014-05-19 18:08:30 -07:00
Jinsuk Kim
96658f7167 New keycode definitions for HDMI-CEC 
Following keys are added to be mapped to HDMI-CEC standard keys:

KEYCODE_MEDIA_TOP_MENU
KEYCODE_11
KEYCODE_12
KEYCODE_LAST_CHANNEL
KEYCODE_TV_DATA_SERVICE

Also updated the information on the key code update by removing
some files not present any more.

Change-Id: I305d9b578c1824f34c457144a68132717dc9a97f
 2014-05-20 00:43:38 +00:00
Alan Viverette
c80ad99a33 TouchFeedbackDrawable is now RippleDrawable 
Change-Id: I59f5f04b73089215c6320560556ac21beb03db06
 2014-05-19 16:27:31 -07:00
Rachad
c9550f2ce8 Merge "Add HEVC decoder support ot MediaCodec bug: 14571712" 2014-05-19 23:00:29 +00:00
George Mount
42516d19db API Review: split out BidirectionalTypeConverter. 
Bug 14997858

Change-Id: I1f2ccf7c4e60320c8df759702a8f2fa24fd3acd2
 2014-05-19 15:57:14 -07:00
RoboErik
b19c192654 Merge "Rename session classes to have media prefix, hide routes" 2014-05-19 19:29:06 +00:00
Jim Miller
d08c2aceb2 Update FingerprintManager API after discussions. 
Change-Id: I4d0b5ffc4d572f50961354ac37844c3cca7e5217
 2014-05-19 19:18:50 +00:00
Robert Greenwalt
d19c41c0bb Add javadoc and unhide new API 
Change-Id: I12e475bbf4000c7acec4ca27b1d3bf8f870cc2cf
 2014-05-19 10:34:36 -07: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
Robert Greenwalt
4f05d55296 Add docs for Linkproperties and unhide it. 
Preperation for ConnectivityManager API reveal.

Change-Id: Id2addf424213e796c6077def0b7f30cac9a0f75f
 2014-05-19 09:43:36 -07:00
Robert Greenwalt
f16f5788fa Merge "Apply Doc fixes to RouteInfo" 2014-05-19 15:53:15 +00:00
Robert Greenwalt
386aba8bd1 Apply Doc fixes to RouteInfo 
Change-Id: Ib76df135d5514f7b8baafbbe91fa3d1cdd632f00
 2014-05-19 07:27:46 -07:00
Robert Greenwalt
2631da82ae Merge "Update the docs for NetworkCapabilities" 2014-05-19 14:06:07 +00:00
Ben Murdoch
422c7a5834 Add PackagManager flag for WebView system feature. 
Add a flag for PackageManager.hasSystemFeature to determine
if a functional webview is available on the device.

Bug: 13438487

Change-Id: I770f7e924b3e5fa6be0397904acf18c9306096e4
 2014-05-19 12:46:41 +01:00
Ihab Awad
a611e45774 Merge "Publish new Telecomm API for Connection Services" 2014-05-19 03:39:27 +00:00