10845 Commits

Author SHA1 Message Date
Andreas Gampe
ee0cdce2a8 Frameworks/base: Add is64Bit method to Process
Add a public method to Process to query whether the current runtime
is running in 64-bit mode.

Bug: 21069469
Change-Id: Ifaf4251f05bbe5eba135fa977190e475632856bd
2015-06-09 09:22:55 -07:00
Adam Skory
a28863e769 Merge "Record provision of custom Intents in AssistContent" into mnc-dev 2015-06-06 01:01:00 +00:00
Adam Skory
cd70c64f50 Record provision of custom Intents in AssistContent
Simplifies behavior wrt automatically setting the
web URI for ACTION_VIEW Intents, by not doing so
for custom Intents.

Adds a boolean isAppProvidedIntent() as a signal for
recepients of the AssistContent that a custom Intent
was provided. Custom Intents are more likely to be
relevant.

Change-Id: Ibe4bfa040eba904411b9820ab4ddfcf509413829
2015-06-05 18:55:29 -06:00
James Cook
6cf397508e Allow different visual and voice assist prompts
* Introduce VoiceInteractor.Prompt, holding multiple voice prompts
("What genre?", "What genre of music?", "What genre of music, for
example classical?") as well as a different visual prompt to show
on screen ("Choose genre").
* Migrate framework voice interactor code from a CharSequence prompt
to Prompt.

Bug: 21024958
Change-Id: Ib595fbdb2801cc558085e9b8366d619ff1d4d656
2015-06-05 16:36:22 -07:00
ztenghui
5dfe9d30b4 Merge "Add reset to AVD" into mnc-dev 2015-06-05 22:47:30 +00:00
ztenghui
9605271806 Add reset to AVD
b/21664621

Change-Id: Ie40c3723860e183c8e4fedd2a76b9debbdf64a2a
2015-06-05 15:42:59 -07:00
Jonathan Basseri
69822f0d63 Renaming carrier config variable keys.
API council advised us to use KEY_NAME_TYPE for our key constants.

Bug: 21571894
Change-Id: Ibe55ad5a31ef618455e763b5c5265fc817c934ab
2015-06-05 15:08:55 -07:00
Amit Mahajan
48cf298cb8 Merge "Change to hide BEARER_BITMASK." into mnc-dev 2015-06-05 18:24:05 +00:00
ztenghui
e1352de673 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:10 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
2015-06-05 14:41:51 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00
ztenghui
83a52031fd Setup the animation callback for AnimatedVectorDrawable
b/21341096

Change-Id: I84e20366db21ceaa4f044be3e322f9215bb06ad2
2015-06-04 12:55:21 -07:00
Clara Bayarri
7938cdbf98 Separate the SelectionActionMode into Insertion and Selection.
When we got rid of the paste popup, we merged it into the Selection
ActionMode and moved all its invocations to the ActionMode. Some apps
actually want the paste popup without the Selection ActionMode, hence
separating them again allows them to cancel the one they want.

Bug: 21571422
Change-Id: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3
2015-06-04 20:46:19 +01:00
Johnson Hsieh
1ef714a284 Updates AlarmClock intent API.
Changes to the AlarmClock intent API based on feedback from Alarm team:

1. s/VOICE_CANCEL_ALARM/DISMISS_ALARM/g - "Cancel" is a bit unclear, so we're
changing it to "dismiss". Also, remove "VOICE_" since we should also add
support for this in multi-modal.

2. Removed DELETE_ALARM - we will likely not complete this for Android M.

3. Removed ALARM_SEARCH_MODE_NONE = "none". Instead, if
EXTRA_ALARM_SEARCH_MODE is missing (and alarm data URI is not given), then:
* If exactly one active alarm exists, it is dismissed.
* If more than one active alarm exists, the user is prompted to choose
  the alarm to dismiss.

4. Add ALARM_SEARCH_MODE_LABEL, which allows searching for alarms by a
(partially) matching label.

5. Add SNOOZE_ALARM for snoozing an alarm, with optional
extra EXTRA_ALARM_SNOOZE_DURATION.

Change-Id: I39502532e54d5f0fe51a8545a4c586615f5e5e89
2015-06-04 10:43:19 -07:00
Adam Powell
f6d9cd19e2 Add DENSITY_360
Add 360dpi as a supported screen density to closer match some
hardware's physical specifications. This gives a dp multiplier of
2.25.

Bug 19529059

Change-Id: Ibf9c768fba53765ea684ff228d24caf091f27a3e
2015-06-04 10:41:44 -07:00
Dianne Hackborn
b0a5e78fc0 Merge "More API changes." into mnc-dev 2015-06-04 16:56:52 +00:00
Zhijun He
b1300e39c7 Camera2: add high speed video APIs
Interface only.

Bug: 21442271
Change-Id: If81caa0f2dc9f7802af564abcd9541aff3e30901
2015-06-03 17:50:22 -07:00
Zhijun He
fab663ebfd camera_metadata: update high speed video recording API
Update high speed video recording API to support batch mode recording.

Bug: 21442271
Change-Id: I62de6067c75fcfbe6320dd987cce65843d810021
2015-06-03 17:45:48 -07:00
Raph Levien
88ac4e04a5 Merge "Rename setTextDir to setTextDirection" into mnc-dev 2015-06-03 23:09:49 +00:00
Svetoslav
a2011d232b Adding missing permission API to fragment
Change-Id: I90309a23a08a82f0ab93eb4f6185db09e035aac1
2015-06-03 15:43:59 -07:00
Raph Levien
a6a082862b Rename setTextDir to setTextDirection
StaticLayout.Builder used "setTextDir" as a shorthand, but it's not
as clear as spelling it out. So, setTextDirection.

Bug: 21572282
Change-Id: Ia94476562d70678f963196b87bb63511d30836b6
2015-06-03 13:20:45 -07:00
Tyler Gunn
bb6d060585 Merge "API Cleanup: Remove VideoState class." into mnc-dev 2015-06-03 17:13:41 +00:00
Tyler Gunn
87b73f370e API Cleanup: Remove VideoState class.
- Remove VideoState class.
- Replace references to VideoState constants with VideoProfile equivalent.
- Push VideoState static methods into VideoProfile.

Bug: 21573551
Change-Id: I1bca02772b5b7d86643f612824b07faef7618725
2015-06-03 10:09:59 -07:00
Soonil Nagarkar
597492c963 Add NO_BATCH flag to WifiScanner
Change-Id: Idd521f724684986ff84306327d42b810f7b30245
(cherry picked from commit b9e6d98c6c0a05ebfc73a14d1ac2a47d58290241)
2015-06-03 05:17:57 +00:00
Dianne Hackborn
69c6adc96e More API changes.
Start moving Assist* stuff to android.app.assist.

Clean up some more of the VoiceInteractionSession APIs.

Clearly document that finish() is not the same as hide(),
always call hide() instead, and fix the finish() path to
also always do a hide to make sure everything is cleaned
up correctly.

Change-Id: I962d4069fcb34fe89547a95d395ae1b9fa3b4148
2015-06-02 16:56:41 -07:00
Alan Viverette
e25f6587d8 Merge "API review feedback for ThemedSpinnerAdapter, Spinner" into mnc-dev 2015-06-02 23:51:07 +00:00
Jonathan Basseri
97769b0c43 Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 23:14:45 +00:00
Jorim Jaggi
7d01d2c6cf Merge "Fix API review: Camera prewarm" into mnc-dev 2015-06-02 22:25:29 +00:00
Nicolas Prevot
db6ac0e912 Merge "Make ACTION_PROVISION_MANAGED_DEVICE public." into mnc-dev 2015-06-02 22:11:11 +00:00
Brian Attwell
c7a4eabe98 Merge "Rename PhoneNumberUtils APIs" into mnc-dev 2015-06-02 22:02:24 +00:00
Alan Viverette
2add9bcf8c API review feedback for ThemedSpinnerAdapter, Spinner
Moves themed interface out of Spinner and extends SpinnerAdapter, updates
Spinner constructor to take a Theme rather than a Context.

Does NOT change BaseAdapter to implement ThemedSpinnerAdapter, because
the BaseAdapter class does not have any notion of layout inflation and
that would break the contract implied by ThemedSpinnerAdapter.

Bug: 21571899
Change-Id: Id7e8d630458857ce6c93a6a8b8f920e169ee1152
2015-06-02 14:54:40 -07:00
Svetoslav
c5ff0020a2 Merge "Add API to hint whether to show on-board UI before a permission request." into mnc-dev 2015-06-02 21:53:20 +00:00
Svetoslav
20770ddbd4 Add API to hint whether to show on-board UI before a permission request.
bug:21511988

Change-Id: I9d1d7adf34b68074e65510f53b6e642cf784cf6b
2015-06-02 14:48:38 -07:00
Brian Attwell
115c04410e Rename PhoneNumberUtils APIs
In response to more API review.

Bug: 21571895
Change-Id: Ia1fa69da07a3427997919ba61c77fcbad7e79f2a
2015-06-02 21:34:33 +00:00
Jonathan Basseri
f31ac338af Migrating MmsConfig to CarrierConfigManager.
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

This was originally Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a

Bug: 21085630
Change-Id: I5a55873465c36ea8a7e3915b8b98a65b47c60dfa
2015-06-02 14:29:04 -07:00
Jonathan Basseri
abdf79aba0 Merge "Revert "Migrating MmsConfig to CarrierConfigManager."" into mnc-dev 2015-06-02 21:15:05 +00:00
Jonathan Basseri
27a7b78e40 Revert "Migrating MmsConfig to CarrierConfigManager."
Forgot to update-API

This reverts commit 9444f4be82d2bbc6b8668e73e91cfa70aee2d4dc.

Change-Id: I8e1bb7ff5b86d478ae7a79497d28ee9310209de6
2015-06-02 21:13:48 +00:00
Nicolas Prevot
64bf7b2870 Make ACTION_PROVISION_MANAGED_DEVICE public.
Also remove the doc saying that factory reset is impossible if there
is a device owner: the device owner may not set the user restriciton
DISALLOW_FACTORY_RESET.

BUG:19889110

Change-Id: Iadc084a38e541061c0b0c95bfc95da73d48842d7
2015-06-02 14:04:41 -07:00
Brian Attwell
b36ad5dc6b Decouple ProviderStatus & internal provider state
Bug: 21090207
Change-Id: I7e93e36ad0c0d667ac56983c76acb1b97bd8755c
2015-06-02 20:56:27 +00:00
Adrian Roos
56dbe3ee4b Merge "Hide and disable emergency assist API" into mnc-dev 2015-06-02 20:50:55 +00:00
Jonathan Basseri
ffa8f101cc Merge "Migrating MmsConfig to CarrierConfigManager." into mnc-dev 2015-06-02 20:43:11 +00:00
Amith Yamasani
ff3b76d046 Merge "Temporarily whitelist an app for network during doze" into mnc-dev 2015-06-02 20:34:59 +00:00
Wale Ogunwale
c9a0452244 Merge "@hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type." into mnc-dev 2015-06-02 18:54:55 +00:00
Wale Ogunwale
3540f93654 @hide TYPE_APPLICATION_ABOVE_SUB_PANEL window type.
Bug: 21572285
Change-Id: Iff56a8ee5b91e02bd20afb7891bd94a0ec1abba9
2015-06-02 11:07:07 -07:00
Amith Yamasani
af575b9f8e Temporarily whitelist an app for network during doze
API to allow an app to be whitelisted for network and wakelock
access for a short period. So even if the device is in idle
mode, such apps can be given a chance to download the payload
related to a high priority cloud-to-device message.

This API is meant for system apps only.

A new permission CHANGE_DEVICE_IDLE_TEMP_WHITELIST is required
to make this call.

Bug: 21525864
Change-Id: Id7a761a664f21af5d7ff55aa56e8df98d15511ca
2015-06-02 11:05:03 -07:00
Carlos Valdivia
2ed6369c5d Merge "System Health: Support expiring tokens" into mnc-dev 2015-06-02 17:31:29 +00:00
Wei Wang
6f54da32c9 Merge "Expose a few system APIs for BLE scan only mode." into mnc-dev 2015-06-02 17:24:00 +00:00
Wei Wang
f9e3e9e3dd Expose a few system APIs for BLE scan only mode.
Bug: 21562349
Change-Id: Ifc58efcf01edac5b4f9e5266adb966e7bc492209
2015-06-02 10:22:20 -07:00
Jonathan Basseri
9444f4be82 Migrating MmsConfig to CarrierConfigManager.
Define variables in CarrierConfigManager that mirror those in
SmsManager. These will replace MmsConfig. The literal values had to be
moved into this class because classes in frameworks/base/telephony
cannot reference classes in frameworks/opt/telephony.

There is no change to the SmsManager API, but the data available from
SmsManager#getCarrierConfigValues is moving from mms_config.xml files
into the new carrier config API.

Bug: 21085630
Change-Id: I8a88f46c770ddcb3ac6988c29d86f0ca1f211f4a
2015-06-02 10:08:08 -07:00