Commit Graph

5460 Commits

Author SHA1 Message Date
Alan Viverette
228fd600ce Merge "Implement landscape layout for time picker dialog" 2015-02-27 18:13:54 +00:00
Dianne Hackborn
93ec05ca47 Merge "Rework voice interaction session lifecycle." 2015-02-26 18:59:57 +00:00
Alan Viverette
62c79e9a64 Implement landscape layout for time picker dialog
Adds support overriding default alert dialog panel elements by including
them in the dialog's custom content view, but no public API (yet!) since
the panel IDs have never been public. Some minor cleanup and refactoring
in TimePickerDialog. Removes Holo styles for "clock" and "calendar" style
pickers since they are new in Material. If the new styles are used against
Holo they will match Material but with Holo primary/accent colors.

Also implements themed color state lists to resolve TODOs in both time
and date pickers.

Bug: 19431361
Change-Id: I095fd8d653e02d9e5d20d66611432a08a7a5685e
2015-02-26 09:47:10 -08:00
George Mount
ccf3edb3ab Merge "Fix target location on nested shared elements." 2015-02-26 17:41:24 +00:00
Nicolas Prevot
abc03c7ae8 Merge "Fail silently when changing BLUETOOTH_ON/WIFI_ON directly" 2015-02-26 16:51:56 +00:00
Benjamin Franz
6cdb27e732 Fix javadoc for setLockTaskPackages
Bug: 19523388
Change-Id: Idc6bdb6c7c37de2448eb2db84ab1685660639100
2015-02-26 12:26:53 +00:00
Nicolas Prevot
41916d492c Fail silently when changing BLUETOOTH_ON/WIFI_ON directly
If the device owner tries to change BLUETOOTH_ON or WIFI_ON via
DevicePolicyManager.setGlobalSetting, fail silently.

There was not much point for the device owner to do it since it can
also change bluetooth/wifi state via normal bluetooth and wifi apis.

BUG:19311992

Change-Id: Ifba163800aa413865b8a2877cb21aacfa5cfc6c8
2015-02-26 11:57:29 +00:00
Alan Viverette
745677f117 Merge "Clean up AlertDialog javadocs, add overlay theme for dialogs" 2015-02-26 01:36:49 +00:00
Dianne Hackborn
ffeecb1bfb Rework voice interaction session lifecycle.
We now have a formal concept of the session being shown and
hidden, with it being able to continue running while hidden
as long as there is enough RAM.

This changes the flow that a VoiceInteractionSession will
see: onCreate() is when it is first created, onCreateContentView()
is when its UI first needs to be built, onShow() is called each
time it needs to be shown and has the arguments given when the
show request was made (which has been renamed from startSession to
showSession), and then onHide() will be called when the UI is
no longer shown.

The methods show() and hide() now allow a VoiceInteractionSession
subclass to control when it is shown and hidden, working with the
shown state being maintained by the system.

Change-Id: Ic4a430ec7e8bf76a5441fd0425e2932806170fcc
2015-02-25 17:36:17 -08:00
Jeff Brown
6e53931f49 Add Context.getSystemService(Class<?>).
Added an overload of getSystemService() that takes a class instead of a
service name to eliminate the extra cast and provide more type safety.

Cleaned up docs.

Removed the default constructor of BatteryManager which should not have
existed.

Change-Id: I9da46b20641fc83ecd3342560e5b94cb721f289c
2015-02-25 17:04:13 -08:00
Fyodor Kupolov
47ed3195f9 Merge "Allow alternative policy description for secondary users" 2015-02-25 20:17:21 +00:00
Jim Miller
74160d8cdb am b060f018: am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit 'b060f018effb27a79797e55f9eb6a592db2cb39a':
  Remove TrustAgent whitelisting API
2015-02-25 18:30:10 +00:00
Jim Miller
b060f018ef am 91aa1bdb: am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '91aa1bdb57a82b59401afd88aaeb429ea4c73bac':
  Remove TrustAgent whitelisting API
2015-02-25 18:23:20 +00:00
Jim Miller
91aa1bdb57 am 19847b07: am b46e4806: Merge "Remove TrustAgent whitelisting API" into lmp-mr1-dev
* commit '19847b07e81b9b29e3574ce6ab8acf7a958a1a63':
  Remove TrustAgent whitelisting API
2015-02-25 18:17:13 +00:00
Jim Miller
bc4f2ccf6c Remove TrustAgent whitelisting API
Due to a bug caught late in the release, this API is broken
and should be removed from API 22 because it's too late for
a fix and there's no workaround.

Bug 19461292

Change-Id: Ib0757a4484b14afe7f83ae9527bb3f5f4834ee62
2015-02-24 20:15:02 -08:00
George Mount
42161c5cb4 Fix target location on nested shared elements.
Bug 19502062

When shared elements were nested, they *could* end in the wrong
location. Also, when the shared element transition was interrupted,
the final location was calculated incorrectly. This fixes
both conditions.

Change-Id: I23792507c1e9e96920721d38d7a2a21299f23112
2015-02-25 00:21:02 +00:00
Wale Ogunwale
53a29a90f3 Added ActivityManager API and AM command to resize a task.
Also fixed issue with ActivityStackSupervisor.moveTaskToStackLocked()
functionality not working correctly.

Change-Id: Ia13f1e92a7c59ce6543c226533ac8ea623488290
2015-02-24 09:33:18 -08:00
Fyodor Kupolov
b343d6db28 Allow alternative policy description for secondary users
For policies like wipe-data, device admin policy description should be
customizable for secondary users.

Bug: 19194766
Change-Id: Idadbdf84d378cf4f1b42ac246a48edbfa97eaa9a
2015-02-24 09:26:09 -08:00
Alan Viverette
49f118ef08 Clean up AlertDialog javadocs, add overlay theme for dialogs
Also cleans up CheckedTextView javadocs.

Bug: 19482450
Change-Id: I47559533784b19267e9381af10c456ce0d20d329
2015-02-23 17:15:27 -08:00
Mike Lockwood
f3c7276a4f Merge "Add MIDI Manager API tweaks:" 2015-02-23 23:03:36 +00:00
Mike Lockwood
b673770f71 Add MIDI Manager API tweaks:
- Change the package name from android.midi to android.media.midi

- Add option for specifying a Handler for DeviceCallback notifications

Change-Id: Ia9e9817a651c06299f4e02ee1da3c9666ff64cb9
2015-02-23 14:32:23 -08:00
Scott Kennedy
7be99fc667 Merge "Add some more @Nullable annotations" 2015-02-23 19:09:19 +00:00
Scott Kennedy
3c32b62044 Add some more @Nullable annotations
Change-Id: I586d542e087eafa8355f0eaa606d66876c0f5a56
2015-02-22 20:43:56 -08:00
Ying Wang
7f38aab7ab Fix docs.
Change-Id: Iaa7f498dac5b87ee8f3cc6cfeabb04b51ce93245
2015-02-20 11:50:09 -08:00
Alexandra Gherghina
eeab1fa96c Merge "New intent action for returning account migration result" 2015-02-20 16:46:24 +00:00
John Reck
df570c6e66 Merge "Initial attempt at jank-tracking stat collection" 2015-02-20 16:28:30 +00:00
John Reck
ba6adf66d3 Initial attempt at jank-tracking stat collection
Is a bit naive, perhaps overly aggressive, but sorta works

Change-Id: I01a774e00dbe681439c02557d9728ae43c45ce50
2015-02-20 08:27:38 -08:00
Alexandra Gherghina
db4bc57760 New intent action for returning account migration result
Bug: 18551835
Change-Id: Ifc5dedf1753a7779793a8b056bac5f5733a2783d
2015-02-20 11:55:52 +00:00
Scott Kennedy
7db73ed198 Mark Service#onBind() @Nullable
Change-Id: I6e600dd018e1cb2b51b666ec5acf56b2885c0083
2015-02-19 15:31:11 -08:00
Wale Ogunwale
9176a30d36 Merge "Set compatInfo to default if unset in ContextImpl constructor." 2015-02-19 01:05:29 +00:00
Wale Ogunwale
9cf9954432 Set compatInfo to default if unset in ContextImpl constructor.
Will cause NPE when ResourceManager.getTopLevelResources() is called
if unset.

Bug: 19427781
Change-Id: I8c990cc425025cf426a87cac9dede09a14aa640c
2015-02-18 16:31:34 -08:00
Tor Norbye
7b9c912f53 Add @ResourceInt annotations on APIs
Change-Id: I119cc059c2f8bd98fd585fc84ac2b1b7d5892a08
2015-02-18 07:49:03 -08:00
Wale Ogunwale
0233aee840 Merge "Fixed NPE in ResourceManager when Activity.recreate is called." 2015-02-18 03:23:39 +00:00
Wale Ogunwale
93f543ca98 Fixed NPE in ResourceManager when Activity.recreate is called.
Bug: 19408756
Change-Id: I291badce7fe9a6feaf2a5e8ce1005e6a86b30147
2015-02-17 16:55:03 -08:00
Craig Mautner
2007a630d4 am 28de8edb: am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit '28de8edb7d72f938f47d7fdd8ce058c5c8933b8e':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:53:11 +00:00
Craig Mautner
28de8edb7d am ab8f60e4: am a94e4297: Merge "Do not make ActivityContainer available to apps. DO NOT MERGE" into lmp-mr1-dev
* commit 'ab8f60e425a90045eca06c09f0274f402b062d8f':
  Do not make ActivityContainer available to apps. DO NOT MERGE
2015-02-17 23:43:33 +00:00
Craig Mautner
ca0653a424 Do not make ActivityContainer available to apps. DO NOT MERGE
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 20:41:39 +00:00
Craig Mautner
aa7e3ed947 Do not make ActivityContainer available to apps.
A security leak was discovered whereby a malicious app could get the
IActivityContainer object from one app and use it to inject events
into another app. This fix removes the availability of the
IActivityContainer and replaces its one use with a method for
returning the information the IActivityContainer was used for.

Fixes bug 19394591.

Change-Id: Ib3cec25b25130cd8e098892c057742cfd575cfdd
2015-02-17 10:31:20 -08:00
Robin Lee
abf3570f38 DevicePolicy: Make uid parameter an int
This should not have been a long to begin with.

Change-Id: Icbf6e2e97cb6301b968b3eb8b3f9a46331f7983e
2015-02-17 14:18:32 +00:00
Robin Lee
f6901eb9e2 Merge "Device Policy API to choose a private key silently" 2015-02-16 10:47:51 +00:00
Wale Ogunwale
421d6ad191 Merge "Adjust activity display metrics based on stack configuration." 2015-02-15 20:20:08 +00:00
Wale Ogunwale
7c72668f19 Adjust activity display metrics based on stack configuration.
Apps normally use context.getResources().getDisplayMetrics()
or getWindowManager().getDefaultDisplay() to get information
about the screen dimensions. Not all the screen space is available
for apps in a multi-window environment, so we limit the dimensions
of the display object exposed to the app to that of the containing
stack.

Bug: 19225079
Bug: 19354838
Change-Id: I8dc3a6c9b99ecedcca28fc4ddaba9f31feb4f871
2015-02-13 21:12:47 -08:00
Dianne Hackborn
682c8e509b Merge "Update voice interaction layer for new UI design." 2015-02-13 20:16:04 +00:00
Dianne Hackborn
ae6688b096 Update voice interaction layer for new UI design.
Can switch from a pure overlay at the top of the screen,
to interactive mode with the voice UI drawing at the bottom
and pushing its target activity up like an IME.

Add mechanism to get assist data to the voice interaction UI.

Add some basic visualization of the assist data, outlining
where on the screen we have text.

Add a test ACTION_ASSIST handler, which can propagate the
assist data it gets to the voice interaction session so
you can see what kind of data we are getting from different
apps.

Change-Id: I18312fe1601d7926d1fb96a817638d60f6263771
2015-02-13 11:27:57 -08:00
Chet Haase
50dd4c1c59 Merge "Add ClipReveal window transition for application launch" 2015-02-13 19:02:15 +00:00
Chet Haase
10e23ab61b Add ClipReveal window transition for application launch
Issue #19362772 Better material launch animations

Change-Id: Ic94fde910b6b5554ee954dfbbf374949f9eb189d
2015-02-13 11:00:55 -08:00
John Spurlock
b25334ca3c Merge "Allow sysui-managed remote volume controllers." 2015-02-13 14:50:50 +00:00
John Spurlock
cdb57aeb0e Allow sysui-managed remote volume controllers.
- Relax restriction on audio service calls that assume the volume
  ui is systemui, allow calls from a blessed component app.
- Blessed component app service saved in secure settings.
- SystemUI mediates requests to replace the volume dialog, prompts
  the user on activation.
- Show a low pri ongoing notification when the volume dialog is
  being replaced, to allow user restoration at any time.
- Replace the controller management code in VolumeUI to use a
  ServiceMonitor, backed by the new blessed app component setting.
- Add proper zen-related noman client wrappers, make avail to the
  registered volume controller.
- Everything is still @hidden, no api impact.

Bug: 19260237
Change-Id: Ie1383f57659090318a7eda737fdad5b8f88737d4
2015-02-12 22:48:37 -05:00
Benjamin Franz
d51584dee7 am dd0027cf: am 40ab8bb2: am c70d0e71: Fix the javadocs for lock task mode intents.
automerge: 6076ef9

* commit '6076ef9355fec90c40d84abaf2c71345f32badfb':
  Fix the javadocs for lock task mode intents.
2015-02-12 19:37:50 +00:00
Alan Viverette
4cc1e9e707 Add support for user-selectable night mode
Adds a Material theme that automatically selects light or dark UI based
on the night mode resource qualifier.

Removes restriction that night mode only works when car mode is enabled
or the device is docked, which was applied inconsistently anyway and
only actually worked when in car mode (regardless of docked state).
Night mode is now always applied according to the system preference.

Change-Id: I526807c907eb29a2ab588d15932afe3e6ab180c2
2015-02-12 11:01:06 -08:00