188229 Commits

Author SHA1 Message Date
John Reck
073f36c6c1 Merge "Change how Java Bitmaps are accessed in a few places" 2015-04-13 19:20:59 +00:00
Glenn Kasten
bed238fcea Merge "Android MIDI User Guide draft of 4/10/2015" 2015-04-13 18:59:15 +00:00
Phil Burk
1b83e3f75e Android MIDI User Guide draft of 4/10/2015
Change-Id: I80db2c29af581ff3d9d6bd87f5f79c1fde5c3055
Signed-off-by: Glenn Kasten <gkasten@google.com>
2015-04-13 11:54:57 -07:00
Alex Klyubin
d78c2a90d5 Merge "Unhide the new AndroidKeyStore API." 2015-04-13 18:38:12 +00:00
Kenny Guy
e13b15c810 Merge "Add foreground profile changed to user switch observer." 2015-04-13 18:36:23 +00:00
Alex Klyubin
9b3e005a4e Unhide the new AndroidKeyStore API.
Bug: 18088752
Change-Id: I93f87cbb1cd04a4a2e34f3d544d678c92cf052ee
2015-04-13 11:34:04 -07:00
Jeff Brown
fb1e9b7978 Merge "Set initial screen brightness earlier in the boot process." 2015-04-13 18:20:00 +00:00
Alan Viverette
147931e3f9 Merge "Fix date picker dialog size" 2015-04-13 18:13:48 +00:00
Kenny Guy
429796226a Add foreground profile changed to user switch observer.
Called when the focused activity changes from one profile
to another to allow sys ui to vary display based on the
current profile.
This reverts commit 735a3f90598be31bca5d551d781280a205a5f27f.
Resubmitting with fix for build break in another package.

Bug: 19531782
Change-Id: I98cd2968ade3b1d23feb90d98057f306695d569e
2015-04-13 18:03:05 +00:00
Alex Klyubin
fbf1472d61 resolved conflicts for merge of a978a3d6 to master
Change-Id: Ifd7ca9e1dfa0d50a87f2bafef377fcaeb5d9f6d5
2015-04-13 10:54:53 -07:00
Alex Klyubin
a978a3d6e9 am f265bdbf: am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."
* commit 'f265bdbfc70411c08b4aa7d17125cf1b5e9b14e8':
  Use JCA names for block modes, paddings, and digests.
2015-04-13 17:31:40 +00:00
Alex Klyubin
f265bdbfc7 am d1af38a4: Merge "Use JCA names for block modes, paddings, and digests."
* commit 'd1af38a4783c1c0d1a5b7c76a7583beb02a88462':
  Use JCA names for block modes, paddings, and digests.
2015-04-13 17:22:07 +00:00
Tim Kilbourn
62d1d9efe7 Merge "Save search context when dispatching onSearchRequested." 2015-04-13 17:03:25 +00:00
Alex Klyubin
d1af38a478 Merge "Use JCA names for block modes, paddings, and digests." 2015-04-13 17:01:30 +00:00
Alex Klyubin
5927c9f1b1 Use JCA names for block modes, paddings, and digests.
This replaces int-based enums from KeyStoreKeyConstraints with
String values commonly used in JCA API.

As part of under the hood refactoring:
* KeyStoreKeyCharacteristics and KeyStoreKeyConstraints have been
  merged into KeyStoreKeyProperties.
* KeymasterUtils methods operating on KeymasterArguments and
  KeymasterCharacteristics have been moved to their respective
  classes.

Bug: 18088752
Change-Id: I9c8b984cb3c28184adb617e34d87f2837bd1d3a1
2015-04-13 09:59:04 -07:00
George Mount
90941c0f84 Merge "Improve javadoc on SharedElementCallback." 2015-04-13 16:53:43 +00:00
George Mount
59cf0831d9 Merge "Fix transition not properly removing targets on completion." 2015-04-13 16:52:59 +00:00
John Reck
a771b9861d Change how Java Bitmaps are accessed in a few places
Stop assuming that a Java Bitmap has a SkBitmap* that
has some externally managed lifecycle, and instead switch
a bunch of users to accessing the bitmap by providing
their own SkBitmap* on which to set the (ref counted!)
SkPixelRef* instead

Change-Id: I0fd9e193968b41e5597784140d56b4885906864a
2015-04-13 09:50:42 -07:00
Tim Kilbourn
6a975b3c35 Save search context when dispatching onSearchRequested.
The InputDevice used to trigger the search is saved in a SearchEvent
so an application implementing onSearchRequested determine the device
triggering the search.

Bug: 15374820
Change-Id: If2cd14f77ce572a5ee131697cd63145fbea63f27
2015-04-13 09:39:24 -07:00
Fyodor Kupolov
05ce40e1af Merge "Use UserHandle instead of int for public APIs" 2015-04-13 16:33:10 +00:00
Fyodor Kupolov
385de624aa Use UserHandle instead of int for public APIs
Bug: 20049349
Change-Id: If5671fb47aa9a3cffebff16787daeae9ca7361e8
2015-04-13 09:31:16 -07:00
Kenny Guy
48a09a0678 Merge "Revert "Add foreground profile changed to user switch observer."" 2015-04-13 16:13:33 +00:00
Kenny Guy
735a3f9059 Revert "Add foreground profile changed to user switch observer."
This reverts commit 99b9030a3ececd9b88e5011c98be0a5b9499c776.

Change-Id: If152904f298ecd9e6fd5d038797d061a5c85eec8
2015-04-13 16:12:55 +00:00
Kenny Guy
d10bd48522 Merge "Add foreground profile changed to user switch observer." 2015-04-13 14:41:37 +00:00
Geoff Mendal
fb18a0b5af Merge "Import translations. DO NOT MERGE" 2015-04-13 14:24:49 +00:00
Geoff Mendal
acab314423 Import translations. DO NOT MERGE
Change-Id: I91769fd8b7950875d8d6c99971eabe690b8294c8
Auto-generated-cl: translation import
2015-04-13 07:23:11 -07:00
Geoff Mendal
989b5b26be Merge "Import translations. DO NOT MERGE" 2015-04-13 13:00:31 +00:00
Geoff Mendal
9c240f37e8 Import translations. DO NOT MERGE
Change-Id: Ib5334deb0b529ee02756b9e31e4ff89b59ed1718
Auto-generated-cl: translation import
2015-04-13 05:58:15 -07:00
Geoff Mendal
300ab1e78d Merge "Import translations. DO NOT MERGE" 2015-04-13 12:51:12 +00:00
Geoff Mendal
0b2264de87 Import translations. DO NOT MERGE
Change-Id: Ib690eecfcb1e45a9753a606fafda8ef85a2b0b6b
Auto-generated-cl: translation import
2015-04-13 05:38:00 -07:00
Geoff Mendal
e7477d6672 Import translations. DO NOT MERGE
Change-Id: I37c3e2c0945bebbf7dd814bad8aa9de1e2c6bef7
Auto-generated-cl: translation import
2015-04-13 05:21:38 -07:00
Niels Egberts
1fbdc5c782 Merge "Fix parens typos in documentation." 2015-04-13 10:13:14 +00:00
Jeff Brown
5d6443bf7c Set initial screen brightness earlier in the boot process.
Previously we had to wait for systemReady before setting the brightness
due to the order in which the display power controller was initialized.
Unfortunately it could take us a rather long time to reach that stage,
particularly after an OTA where the screen would remain at maximum
brightness for minutes while "Optimizing Apps".

This change moves the brightness backlight setting code deeper
into the display manager which has a couple of nice side-benefits
in that it now becomes much easier to coordinate display power mode
changes with display backlight changes.  So this change also resolves
some issued with changing the backlight while in DOZE_SUSPEND and
ensuring that backlight changes generally end up being performed
before executing a power mode change except in the case where the
display needs to come out of suspend first.  (So now the backlight
will be set before entering DOZE from the ON state.)

Deleted some dead code in LightService which was in the way.

Bug: 19029490
Change-Id: I494b5223e676248daf2ff8be3ec338845977f73c
2015-04-13 01:51:22 -07:00
Jeff Sharkey
834a91dda7 Merge "DocumentsUI roots can have settings." 2015-04-13 05:18:52 +00:00
Wale Ogunwale
0a9bce976a am 110919d9: am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"
* commit '110919d9952a60eb9a2ff1696f3e13818428ee6a':
  Clean-up state if we have an exception when acquiring provider
2015-04-13 05:06:30 +00:00
Jeff Sharkey
1407d4c777 DocumentsUI roots can have settings.
Roots use a flag to indicate they have settings, and DocumentsUI
offers to launch towards someone who handles a new Settings intent.

Slight rename of browse intent for clarity.

Bug: 19993667
Change-Id: I86302ec1cfac5e435d8bc5701bdb85fb9b0dcbae
2015-04-12 22:02:44 -07:00
Wale Ogunwale
110919d995 am bd59764a: am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"
* commit 'bd59764a2c20deeebe945c5008abf9a62df09a1e':
  Clean-up state if we have an exception when acquiring provider
2015-04-13 04:56:21 +00:00
Daichi Hirono
fe4d95c3fc Merge "DocumentsUI: Add new private intent action to select copy destination." 2015-04-13 04:53:09 +00:00
Daichi Hirono
bbe2292bc6 DocumentsUI: Add new private intent action to select copy destination.
The CL adds INTENT_ACTION_OPEN_COPY_DESTINATION, and implements the behavior to
respond the intent action.

The directory picker:
 * filter out read only roots
 * return document URI instead of document tree URI
for the intent action.

BUG=b:20146034
Change-Id: I96c565100c3cdaa57cc7abd8cf6d895d148941a7
2015-04-13 13:49:31 +09:00
Wale Ogunwale
bd59764a2c am 8f0e0c1f: Merge "Clean-up state if we have an exception when acquiring provider"
* commit '8f0e0c1f3d7c02dff6fe4877477af583e490e6ee':
  Clean-up state if we have an exception when acquiring provider
2015-04-13 04:46:31 +00:00
Tomasz Mikolajewski
97397938c4 Add support for notifying about child changes in StubProvider.
Change-Id: I256856a2bbefa6d831e6b912583eca86eeb03ba7
2015-04-13 13:35:23 +09:00
Wale Ogunwale
8f0e0c1f3d Merge "Clean-up state if we have an exception when acquiring provider" 2015-04-13 04:25:29 +00:00
Tomasz Mikolajewski
d5d5c91dfc Add support for opening files in StubProvider.
Change-Id: Ia3df58850cc3df24dc310b29035a41fb75eadeff
2015-04-13 13:03:23 +09:00
Tomasz Mikolajewski
738154ee84 Add support for removing files and directories in StubProvider.
Along the way it updates clients about changes in used storage.

Change-Id: I02fb1333e1f97f1476b87310a27b75d99fa00854
2015-04-13 11:40:04 +09:00
Tomasz Mikolajewski
40355c2e96 Merge "Simulate running out of space in StubProvider." 2015-04-13 02:37:51 +00:00
Tomasz Mikolajewski
e1a03f8eec Show copy destination when clicking on the copy notification in Documents UI.
Change-Id: I3d955595bc46903c134c0633a6d32663cc2d0c05
2015-04-13 11:35:27 +09:00
Tomasz Mikolajewski
30b669465d Simulate running out of space in StubProvider.
Change-Id: I0a069c07bcf8784aeb5c5993d90d0a6db6e2afb1
2015-04-13 09:37:54 +09:00
Jeff Sharkey
9e3cb0461c Merge "Browse mode for DocumentsUI, removed volume state." 2015-04-12 23:10:16 +00:00
Jeff Sharkey
59d577a518 Browse mode for DocumentsUI, removed volume state.
The existing management mode is too specific, and requires that
storage backends add queryChildDocumentsForManage(), etc.  Instead,
to offer more natural browsing support, add a new BROWSE_ROOT intent.

It behaves mostly like MANAGE_ROOT, except that it doesn't mutate
its Uris with setManageMode(), and it shortcuts straight to VIEW on
clicked documents.

It can be launched like this:

$ adb shell am start -a android.provider.action.BROWSE_ROOT
    -d content://com.android.externalstorage.documents/root/8405-1DFB
    -c android.intent.category.DEFAULT

Also rename a MetricsConstants to make it clearer, and don't
auto-mount all emulated volumes.

Fix bugs around parceling of DiskInfo/VolumeInfo.  Method to resolve
the best description for a VolumeInfo, which might need to fall
back to DiskInfo.

Add back "removed" volume state so we send broadcast when a volume
is destroyed, matching the expected public API behavior.

Bug: 19993667
Change-Id: I13aff32c5e11dfc63da44aee9e93a27f4690a43f
2015-04-12 16:03:50 -07:00
Prerepa Viswanadham
d4ea01b4ac Merge "Merge commit 'e593d0a' into merge_work" 2015-04-12 21:46:15 +00:00