136580 Commits

Author SHA1 Message Date
Alan Viverette
3b5c4272db Various API review fixes to resources and drawables
BUG: 15025565
Change-Id: If00c85816f8288338967f7a85453d21f858f5ca7
2014-05-20 13:20:42 -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
Winson Chung
1bba1c8c1a Should not be closing system dialogs when Recents is hidden. (Bug 15109551)
Change-Id: Ia73753074ce620ede136cd4b156d6bfeadb900cf
2014-05-20 13:12:12 -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
Vinit Deshpande
3fff22173c Merge "Fix a runtime break caused by merge conflict" 2014-05-20 19:06:45 +00:00
Robert Greenwalt
eeb11cde21 Merge "Add NetworkFactory names and unregistration." 2014-05-20 19:03:45 +00:00
Mike Lockwood
304ebe60b2 Merge "USB: Fix race condition in acquiring global reference in UsbRequest JNI code" 2014-05-20 18:59:05 +00:00
Mike Lockwood
5633e37ec1 Merge "USB: Minor cleanup from API council review" 2014-05-20 18:58:35 +00:00
Vinit Deshpande
e715e8cc00 Fix a runtime break caused by merge conflict
Kwd changed the name of WifiHotspotService to PasspointService; and
the reference to the name was moved in master. Merge ended up picking
up incorrect name WifiPasspointService. This change fixes that.

Bug: 15106138
Change-Id: Ib6d8aee53db39314a9d98abcbd8e0863210de1bb
2014-05-20 11:50:17 -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
Baligh Uddin
8c21a372b5 Import translations. DO NOT MERGE
Change-Id: Iefca96a5edab44bb985c635377a80711c2f168da
Auto-generated-cl: translation import
2014-05-20 11:38:34 -07:00
Mike Lockwood
b2a4658a63 USB: Fix race condition in acquiring global reference in UsbRequest JNI code
Fixes bug https://code.google.com/p/android/issues/detail?id=59467

Change-Id: I8365e1be4eb0f1f2da49b658af677b590a80e382
2014-05-20 11:33:35 -07: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
Andy Hung
b5eb843e4b Merge "Fix 64 bit long pointer size for media scanning" 2014-05-20 17:36:11 +00:00
Mindy Pereira
56e533a5f6 Make a smaller cliff for dismissing cards
Fixes b/14997474 swipe to dismiss cliff guard may be too big

Change-Id: I3e681f1c6dc3eaac37a0e840b36f4c7041e86e62
2014-05-20 10:19:03 -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
Maurice Lam
99c6e072aa Disable swipe-to-reveal nav bar / status bar during setup
Make the system refuse to show system navigation bar when immersive
mode is on before finishing setup.

Change-Id: Id6383e13bdb7e4c4b93b2fbaf83c154c387af694
2014-05-20 09:38:22 -07:00
Michael Wright
e4ca30503c resolved conflicts for merge of b3ce4b1b to master
Change-Id: I7f9abc0eb75f7c7042037e73c8fdb67025a2ee2a
2014-05-20 09:35:36 -07:00
Brian Colonna
200475be8e Fix 14988763: FUL only shows on bouncer now
FUL used to show on the notification shade when returning from
something that was occluding keyguard such as navigation or
secure camera.  This fix makes FUL only display on the bouncer,
never on the notification shade.

Change-Id: I6b6dc1453a167161330132c1e2703c296050bf0e
2014-05-20 12:34:18 -04:00
Baligh Uddin
58cdca5ac9 Import translations. DO NOT MERGE
Change-Id: I22e8f15798ef15540c370bb14eea6cf9af6ae43c
Auto-generated-cl: translation import
2014-05-20 09:15:04 -07:00
Baligh Uddin
7d95733061 Import translations. DO NOT MERGE
Change-Id: I2a1b7fbb0bd146cdb8689dae216e87a041c5bcc7
Auto-generated-cl: translation import
2014-05-20 09:12:39 -07:00
Baligh Uddin
f982274db9 Import translations. DO NOT MERGE
Change-Id: If356617f03ddecc5b3512f53e4061887c9e74bb0
Auto-generated-cl: translation import
2014-05-20 09:08:39 -07:00
Robert Greenwalt
a67be03f9e Add NetworkFactory names and unregistration.
Some Factories come and go (Telephony) and so they need to be able to unregister.
Also, debugging is tough when the factories are anonymous, so add names for logging.

Lastly, only send single set of NetworkRequests to a newly registered NetworkFactory
and only send the requests.

Change-Id: I717d63363f25c446f8ecf38d933b1a35d744af6e
2014-05-20 09:03:57 -07:00
Baligh Uddin
6343e4da7c Import translations. DO NOT MERGE
Change-Id: Icef6a475d648a2970d5918e9ab7abe98cf676117
Auto-generated-cl: translation import
2014-05-20 09:03:51 -07:00
Baligh Uddin
0d6cfd6fb1 Import translations. DO NOT MERGE
Change-Id: I154e5f25182ab3b16360623f3433ae8f745594f1
Auto-generated-cl: translation import
2014-05-20 09:02:00 -07:00
Baligh Uddin
8d8fe50d80 Import translations. DO NOT MERGE
Change-Id: I4d391197238f1062086ed72546fa1cdaae15b443
Auto-generated-cl: translation import
2014-05-20 08:56:49 -07:00
Baligh Uddin
e5762bc2b4 Import translations. DO NOT MERGE
Change-Id: I813af1cbb2db0674a3cf81649f0d130ebb2d6164
Auto-generated-cl: translation import
2014-05-20 08:27:22 -07:00
Baligh Uddin
3f6651391b Import translations. DO NOT MERGE
Change-Id: Ide5f95ce0a67fd2782750bc64e20b27583c35f0b
Auto-generated-cl: translation import
2014-05-20 08:21:10 -07:00
Baligh Uddin
e1f61548be Import translations. DO NOT MERGE
Change-Id: Ic7ea2f12eba189dba86047d66b0ca86af36b9dc7
Auto-generated-cl: translation import
2014-05-20 08:18:14 -07:00
Baligh Uddin
c8128b0bd8 Import translations. DO NOT MERGE
Change-Id: Idcca08557f575b7a9f5cb66df19eaa01f7989ac8
Auto-generated-cl: translation import
2014-05-20 08:17:35 -07:00
Baligh Uddin
1de821cc85 Import translations. DO NOT MERGE
Change-Id: I70eb28f41b715d1843f3b90c95c0efa71f005e8a
Auto-generated-cl: translation import
2014-05-20 08:16:45 -07:00
Baligh Uddin
f56c3b879a Import translations. DO NOT MERGE
Change-Id: Iefebad182cd2aef382d47eaa2719bf6a49e624f1
Auto-generated-cl: translation import
2014-05-20 08:15:58 -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
Adrian Roos
7a4f3d448b Add dumpsys facility and a history to TrustManagerService
TrustManagerService now keeps track of all events that
influence its state and reports them when it is dumped or
a bugreport is collected.

Bug: 15079129

Change-Id: Iac13de8a848d2b12c8d06168a6969f55b264144a
2014-05-20 16:46:36 +02:00
Sander Alewijnse
c7ae2adbee Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE.
Change-Id: I386c16cc9649d4684bd69966b3c1d2abcb97ca4e
2014-05-20 15:26:48 +01:00
John Reck
1fcc3b1896 Merge "Baby steps" 2014-05-20 14:10:53 +00:00
Adrian Roos
2566bc82cc Merge "Fix typo causing immersive mode transition flickering." 2014-05-20 14:10:07 +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
Narayan Kamath
b851c89d22 Improve ABI handling for shared user ids.
The key improvement is that we need to keep track of
the package that's currently being scanned (this includes
new installs and upgrades of existing packages) and treat
it specially. If we didn't do that, In the case of upgrades
we would perform the shared UID calculation based on the ABI
of the old package, and not the current package.

This change also allows us to perform the CPU ABI calculation
before dexopt, which saves us from having to do it twice and
fixes a bug where we were using the wrong package path to
dexopt a package.

This also has the side effect of fixing 15081286.

bug: 15081286

Change-Id: I20f8ad36941fc3df29007f0e83ce82f38f3585c8
2014-05-20 14:09:12 +01:00
Jason Monk
87be9ba1ea Merge "Fix reference to ProxyInfo extra" 2014-05-20 12:59:52 +00:00