Commit Graph

35668 Commits

Author SHA1 Message Date
Alan Viverette
426a6bc99d am 6f6e64a7: Merge "Add null bg check to switch"
* commit '6f6e64a7a3fbcc01950d610820f441853601b3f9':
  Add null bg check to switch
2014-04-23 20:00:42 +00:00
Deepanshu Gupta
0ee958ce44 am 5c1d4327: Merge "Add view cookies for action bar menus."
* commit '5c1d43272904398ba4b82c80ed2e6809d7dd9572':
  Add view cookies for action bar menus.
2014-04-23 19:56:19 +00:00
Alan Viverette
6f6e64a7a3 Merge "Add null bg check to switch" 2014-04-23 19:54:04 +00:00
Emily Bernier
34a617456b am 9c32cd49: Fix build.
* commit '9c32cd498a8067d4487a97fbf93d8587bfcec1fd':
  Fix build.
2014-04-23 19:52:05 +00:00
Alan Viverette
aec98fee14 Add null bg check to switch
BUG: 14271950
Change-Id: I6f4833c916ddc8d939f5bfa6ab7b1ed1993e862e
2014-04-23 12:51:16 -07:00
Deepanshu Gupta
5c1d432729 Merge "Add view cookies for action bar menus." 2014-04-23 19:50:00 +00:00
Emily Bernier
9c32cd498a Fix build.
Don't link to MANAGE_USERS permission in Javadoc.

Change-Id: Iad1391a0281a3fad06529a86b277f787791e94fc
2014-04-23 15:42:10 -04:00
Deepanshu Gupta
1001961f90 Add view cookies for action bar menus.
The change adds the view cookies for the menus rendered in the action
bar. This enables the IDE to map the menu to the relevant XML Tag in the
menu xml and show the highlighting accordingly.

Change-Id: Idcfc263a8ebe0a4f25afa3a1eb085fa628fd03ca
2014-04-23 12:27:30 -07:00
Craig Mautner
d76b43a86f am 5723feba: Merge "Introduce PersistableBundle"
* commit '5723febadc1877c045389afffa111913698e32e2':
  Introduce PersistableBundle
2014-04-23 18:53:37 +00:00
Craig Mautner
5723febadc Merge "Introduce PersistableBundle" 2014-04-23 18:48:56 +00:00
Emily Bernier
9601bbb473 am 8a0fa6e8: Merge "Allow device or profile owner app to modify user restrictions."
* commit '8a0fa6e823ddbdfd17869d52f838b1cc0a46bd2b':
  Allow device or profile owner app to modify user restrictions.
2014-04-23 18:32:21 +00:00
Emily Bernier
8a0fa6e823 Merge "Allow device or profile owner app to modify user restrictions." 2014-04-23 18:27:45 +00:00
Emily Bernier
7a2b4d11c7 Allow device or profile owner app to modify user restrictions.
Currently this is gated on being a system or root app with the
MANAGE_USERS permission; third-party MDM apps set as device or profile
owner should have this ability as well.

Bug: 13585295

Change-Id: I61d21b13b9ec66fc0cb497ec2007ee732461d448
2014-04-23 14:20:15 -04:00
Alan Viverette
b7a11d78c4 am 70ad9bc0: Fix null and bounds checks
* commit '70ad9bc03341cc0a5b8d6c9c1f43afac6bcc9c62':
  Fix null and bounds checks
2014-04-23 17:41:18 +00:00
Alan Viverette
70ad9bc033 Fix null and bounds checks
BUG: 14271950
BUG: 14271753
BUG: 14270202
Change-Id: I8708107d3803b170a323f584a268ea6b096458ce
2014-04-23 10:20:11 -07:00
Neil Fuller
13b1d7000d am ceb5d17f: am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit 'ceb5d17f6a2f5c144948ada1d59ec4f12da64799':
  Changes to support asynchronous close interruption
2014-04-23 16:55:04 +00:00
Neil Fuller
ceb5d17f6a am d720ef54: am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit 'd720ef541d06be87de3b3e03c1e7fb349299a21f':
  Changes to support asynchronous close interruption
2014-04-23 16:51:47 +00:00
Neil Fuller
d720ef541d am caf6497b: am 683cf1bf: Merge "Changes to support asynchronous close interruption"
* commit 'caf6497b9a0347da7d5acbe678adc2c8187176c0':
  Changes to support asynchronous close interruption
2014-04-23 16:48:34 +00:00
Neil Fuller
43582df3db Changes to support asynchronous close interruption
This change contains fixes to base from libcore change
I37de3e7d1a005a73821221e6156d10b95c595d7a

Bug: 13927110

Change-Id: I2d96e50307611c269dcf47886cd4d976854da8fc
2014-04-23 16:40:35 +00:00
Jorim Jaggi
1083139ad7 am e84d544f: Merge "Move redaction logic showing from Keyguard to PhoneStatusBar."
* commit 'e84d544fe4b238efc408280ec7e01f9c3f04a1b6':
  Move redaction logic showing from Keyguard to PhoneStatusBar.
2014-04-23 16:28:27 +00:00
Jorim Jaggi
e84d544fe4 Merge "Move redaction logic showing from Keyguard to PhoneStatusBar." 2014-04-23 16:24:04 +00:00
Jorim Jaggi
1568250853 Move redaction logic showing from Keyguard to PhoneStatusBar.
This removes a race condition and makes redaction more stable.

Change-Id: I4084cdf490c0e52fe26f45cb00524e0876a068bc
2014-04-23 17:02:25 +02:00
Jeff Sharkey
3e5991c1eb am 21de56a9: Add directory selection to DocumentsProvider.
* commit '21de56a94668e0fda1b8bb4ee4f99a09b40d28fd':
  Add directory selection to DocumentsProvider.
2014-04-23 07:15:32 +00:00
Jeff Sharkey
d5f8b4d26a am 846318a3: Allow prefix-based Uri permission grants.
* commit '846318a3250fa95f47a9decfbffb05a31dbd0006':
  Allow prefix-based Uri permission grants.
2014-04-23 07:15:26 +00:00
Jeff Sharkey
21de56a946 Add directory selection to DocumentsProvider.
Introduce new ACTION_PICK_DIRECTORY that allows users to grant access
to an entire document subtree.  Instead of requiring grants for each
individual document, this leverages new prefix URI permission grants
by defining new "via"-style URIs:

content://com.example/via/12/document/24/

This references document 24 by using a prefix grant given for
document 12.  Internally, we use isChildDocument() to enforce that
24 is actually a descendant (child, grandchild, etc) of 12.  Since
this is an optional API, providers indicate support with
Root.FLAG_SUPPORTS_DIR_SELECTION.

Extend DocumentsUI to support picking directories.  Expose
createDocument() API to work with returned directories.

Offer to canonicalize via-style URIs into direct URIs, generating
exact permission grants along the way.  Override openAssetFile()
to pass through CancellationSignal.  Move testing code into ApiDemos.

Bug: 10607375
Change-Id: Ifffc1cff878870f8152eb6ca0199c5d014b9cb07
2014-04-22 22:18:21 -07:00
Jeff Sharkey
846318a325 Allow prefix-based Uri permission grants.
Define new FLAG_GRANT_PREFIX_URI_PERMISSION which indicates that a
Uri permission grant should also apply to any other Uris that have
matching scheme, authority, and path segments.  For example, a prefix
grant for /foo/ would allow /foo/bar/ but not /foo2/.

Allow persistable and prefix grants to be issued directly through
grantUriPermission().  Relaxing persistable is fine, since it still
requires the receiver to actively take the permission.

Since exact- and prefix-match grants for the same Uri can coexist,
we track them separately using a new UriGrant key.  (Consider the
case where an app separately extends READ|PREFIX and WRITE for
the same Uri: we can't let that become READ|WRITE|PREFIX.)

Fix revoke to always take away persisted permissions.  Move prefix
matching logic to Uri and add tests.  Add new flags to "am" tool, and
various internal uses around Intent and Context.  Switch some lagging
users to ArraySet.

Bug: 10607375
Change-Id: Ia8ce2b88421ff9f2fe5a979a27a026fc445d46f1
2014-04-22 21:06:49 -07:00
Alan Viverette
d8b34e9f3e am 2b38072e: Merge "Add ripple to switches, radio buttons, check boxes, seek bars"
* commit '2b38072e1fb4f158c8de9d92825f72145c9343bb':
  Add ripple to switches, radio buttons, check boxes, seek bars
2014-04-23 02:24:37 +00:00
Alan Viverette
2b38072e1f Merge "Add ripple to switches, radio buttons, check boxes, seek bars" 2014-04-23 02:19:20 +00:00
Craig Mautner
719e6b1670 Introduce PersistableBundle
The PersistableBundle class is similar to Bundle except that only
objects that have meaning across reboots can be stored and there
is a limited number of types that can be stored. More
specifically Binders, FileDescriptors, Parcelables, Booleans,
Bytes, Shorts, Chars, CharSequences, Floats, and ArrayLists
cannot be stored.

Fixes bug 13736007.

Change-Id: If6595b2e6fd92af6b7f60c4f7140ae867c258794
2014-04-22 19:15:33 -07:00
Alan Viverette
6195660681 Add ripple to switches, radio buttons, check boxes, seek bars
BUG: 14231772
Change-Id: Ie40eac9f68815294460175965a999dd75f4144b5
2014-04-22 19:07:06 -07:00
Michael Wright
6dd00bb20e am eeb81561: Merge "Add ViewRootImpl#unhandledInputEvent API stub."
* commit 'eeb815615c3582f0cd000c12f05f3d102c6d4e78':
  Add ViewRootImpl#unhandledInputEvent API stub.
2014-04-23 02:00:48 +00:00
Michael Wright
3da2834f0e Add ViewRootImpl#unhandledInputEvent API stub.
Doesn't actually work yet for non-KeyEvents.

Change-Id: I3482ff780a9a7aef8ae27436f91a3619490b369f
2014-04-22 17:00:11 -07:00
Ruchi Kandoi
3286df9e08 am 62b8a498: Adds Content Observer for the Low power mode in developer options.
* commit '62b8a49856cc0822905dcb7a213f082b92fa69e3':
  Adds Content Observer for the Low power mode in developer options.
2014-04-22 21:03:44 +00:00
Ruchi Kandoi
62b8a49856 Adds Content Observer for the Low power mode in developer options.
Change-Id: Ibed319e734340dfd5348dbeb8fe20c01b1adaac5
Signed-off-by: Ruchi Kandoi <kandoiruchi@google.com>
2014-04-22 20:55:31 +00:00
John Spurlock
4f3693de49 am 860107a2: Merge "Do not disturb: persist user config."
* commit '860107a2cced79f4a19542bfd19676367951ee49':
  Do not disturb: persist user config.
2014-04-22 15:09:53 +00:00
John Spurlock
860107a2cc Merge "Do not disturb: persist user config." 2014-04-22 15:03:08 +00:00
John Spurlock
056c519df1 Do not disturb: persist user config.
Load and store user configuration for do not disturb.  Separate
out service-related aspects into new helper.  Make config availble
over NoMan for settings.

Implement phone + message based filtering (package whitelist for now).

Implement automatic enter/exit zen mode overnight scheduler.

Bug:14211946
Change-Id: Ib28aab0e4c5c9a5fd0b950b2884b1ab618fdfeca
2014-04-22 11:01:24 -04:00
Craig Mautner
b25910ea52 am 6c83b77b: am 43c6a98f: am 6985badc: Fix black ActivityView
* commit '6c83b77b87a1f8b247874c9544d4975d13da7d23':
  Fix black ActivityView
2014-04-22 13:39:28 +00:00
Craig Mautner
36ea20ce0e am 6e2a3542: am 51bd56c9: am 6cdf51f2: Don\'t use finalize on ActivityView to cleanup.
* commit '6e2a3542e1ee6797d157a3e19f9ff0508523d8f3':
  Don't use finalize on ActivityView to cleanup.
2014-04-22 13:39:24 +00:00
Craig Mautner
26f31dccfd am 7ad27288: am c00c89b1: am f4c909bc: Fix ActivityView lifecycle
* commit '7ad27288f1b66733a4fcb2bdcb17dd5db6c6423d':
  Fix ActivityView lifecycle
2014-04-22 13:39:20 +00:00
Craig Mautner
6c83b77b87 am 43c6a98f: am 6985badc: Fix black ActivityView
* commit '43c6a98f0ffe079429735a485acaa81841740fac':
  Fix black ActivityView
2014-04-22 13:33:08 +00:00
Craig Mautner
6e2a3542e1 am 51bd56c9: am 6cdf51f2: Don\'t use finalize on ActivityView to cleanup.
* commit '51bd56c953e2bd860e4a2d97a0bf95267cf3fda2':
  Don't use finalize on ActivityView to cleanup.
2014-04-22 13:33:04 +00:00
Craig Mautner
7ad27288f1 am c00c89b1: am f4c909bc: Fix ActivityView lifecycle
* commit 'c00c89b1add5bcbf6a76287c9a3384877449c746':
  Fix ActivityView lifecycle
2014-04-22 13:32:54 +00:00
Craig Mautner
43c6a98f0f am 6985badc: Fix black ActivityView
* commit '6985badc632f2ff8425aa86423577a96eafc49e9':
  Fix black ActivityView
2014-04-22 13:27:53 +00:00
Craig Mautner
51bd56c953 am 6cdf51f2: Don\'t use finalize on ActivityView to cleanup.
* commit '6cdf51f21df1ca2397618635767e6e53a65799ad':
  Don't use finalize on ActivityView to cleanup.
2014-04-22 13:27:49 +00:00
Craig Mautner
c00c89b1ad am f4c909bc: Fix ActivityView lifecycle
* commit 'f4c909bcb87d6f103c9f9e8255fa61bd86f4de67':
  Fix ActivityView lifecycle
2014-04-22 13:27:44 +00:00
Alan Viverette
8c6c260aa4 am 4899e66d: Merge "Add touch feedback to edit text"
* commit '4899e66db9897279e4ae704b139c50b384a1ae34':
  Add touch feedback to edit text
2014-04-22 13:24:30 +00:00
Youngsang Cho
ac27f9f488 am 6b2c07cb: Merge "Add overlay view in Tv Input Framework"
* commit '6b2c07cb3655b0f98990961e15c2b6077aaad5ca':
  Add overlay view in Tv Input Framework
2014-04-22 13:24:24 +00:00
Jeff Davidson
71dd3d9121 am 2ca3962b: Merge "Initial implementation of NetworkScoreManager\'s backing service."
* commit '2ca3962bc0168d360cf9567a313608347da51944':
  Initial implementation of NetworkScoreManager's backing service.
2014-04-22 13:24:14 +00:00
Alan Viverette
4899e66db9 Merge "Add touch feedback to edit text" 2014-04-22 00:31:55 +00:00