George Mount
7f55215afd
Merge "Reset accessibility after Activity enter transition."
2015-12-18 15:29:52 +00:00
Winson Chung
0583d3d188
Hiding pinned stack tasks from overview
...
Bug: 25381158
Change-Id: Iad442b7f5dc49109529cb5dab2168b19837af6e3
2015-12-18 10:05:13 -05:00
Bryce Lee
bd17928afc
resolve merge conflicts of 6b9e5bf0c2 to master.
...
Change-Id: Idada49313619533bfeb375ee232c942589457fa4
2015-12-18 03:05:20 +00:00
Jeff Sharkey
fc82a8c4bb
Merge "Make printing framework encryption-aware."
2015-12-17 23:04:18 +00:00
Jeff Sharkey
0999c0d6e9
Make printing framework encryption-aware.
...
Only create UserState objects when a user has been unlocked, meaning
we can connect to the spooler. Ignore package events that occur
while a user is locked, since we'll kick off updateIfNeededLocked()
when that user is eventually unlocked.
In all other cases, throw if someone tries obtaining UserState for
a still-locked user. This should help catch any edge cases in the
system, and communicate clearly through public APIs that printing
isn't available until the user is unlocked.
Bug: 26246836
Change-Id: If15744621890baee206d355484fe20933afc65d8
2015-12-17 15:12:26 -07:00
Julia Reynolds
9d7381e28b
Merge "Allow users to set app-wide Importance default"
2015-12-17 22:12:04 +00:00
Julia Reynolds
a07af88b95
Allow users to set app-wide Importance default
...
And the associated ui changes to the notification guts.
Bug: 22451710
Change-Id: I4e0b11e7b24d70b039a432c5e6cd76c9c7cc547c
2015-12-17 16:53:36 -05:00
Jason Monk
161ccb5dfe
Small fixes in TileService
...
Change-Id: I4d10c43d8e40697d144802067fcd4f95d866e4e0
2015-12-17 21:46:58 +00:00
Bryce Lee
6b9e5bf0c2
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05 am: 9eaa59a1ff
...
am: 132814f20d
2015-12-17 19:56:12 +00:00
Bryce Lee
132814f20d
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev am: cf91b45c05
...
am: 9eaa59a1ff
2015-12-17 19:51:17 +00:00
Bryce Lee
9eaa59a1ff
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
...
am: cf91b45c05
2015-12-17 11:45:17 -08:00
Bryce Lee
cf91b45c05
Merge "Add setting for declaring disabled bluetooth profiles." into cw-e-dev
2015-12-17 19:40:47 +00:00
Julia Reynolds
1ac1e3104c
Merge "Aidl it all!"
2015-12-17 19:15:30 +00:00
Alan Viverette
31c2ac78d9
Merge "Handle null result from getVirtualChildAt()"
2015-12-17 19:07:29 +00:00
Todd Kennedy
36a832dd12
Merge "revert quick install"
2015-12-17 18:49:08 +00:00
Todd Kennedy
373f0b4313
revert quick install
...
bug: 25118622
Change-Id: I61c3a1ea9015599dc45bd9e656f99f6bf8c4ec02
2015-12-17 10:32:49 -08:00
Gustav Sennton
081dcb82ff
Merge "Allow several valid signatures per WebView provider."
2015-12-17 18:04:38 +00:00
Filip Gruszczynski
233c1c57c1
Merge "Only add noDisplay activities to freeform source tasks."
2015-12-17 17:57:49 +00:00
Filip Gruszczynski
3d0267143f
Only add noDisplay activities to freeform source tasks.
...
We started adding noDisplay activities to source tasks to make the
resolver activity show up within the same task bounds as what caused it
to appear. However, in other cases it might cause to add a noDisplay
activity to a task in which we don't expect anything to appear, e.g.
home task when launching from home.
Bug: 26128908
Bug: 26023670
Change-Id: I2f64e82b3c3754cdbcb4cac3f907674344e67e04
2015-12-17 09:56:45 -08:00
Samuel Tan
a6d4744e89
Merge "Add comments to keep Java and native binder PersistableBundle in sync" am: 6de926a7d6
...
am: 4981ae9083
2015-12-17 09:55:24 -08:00
Samuel Tan
76d3072dd6
Merge "Fix PersistableBundle handling in Parcel.writeValue" am: d12959193c
...
am: d3decff052
2015-12-17 09:53:44 -08:00
Samuel Tan
19091a7fad
Merge branch 'master' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/frameworks/base
2015-12-17 09:52:47 -08:00
Samuel Tan
33d5888d7a
Merge "Specify path for native PersistableBundle implementation" am: 477fa220b1
...
am: 0bc7647f63
2015-12-17 09:52:11 -08:00
Alan Viverette
0cc6b5a496
Merge "Propagate TextView drawable state after resolving RTL drawables"
2015-12-17 17:51:53 +00:00
Alan Viverette
ad52693cf3
Handle null result from getVirtualChildAt()
...
Also adds final where the method was being called, adds Nullable
annotation to method, and updates docs.
Bug: 25985497
Change-Id: I847a8507f2e3970f1340cddf4abf8650dda22b35
2015-12-17 12:42:39 -05:00
Gustav Sennton
5c2454cde1
Allow several valid signatures per WebView provider.
...
If one of the signatures match the package signature the package is
considered valid. This makes it possible to match signatures in user
builds for both signed and unsigned builds.
Bug: 26220882
Change-Id: Ie2e7567bf518d4859d68b5fdf5b9833fcdaa7670
2015-12-17 17:10:01 +00:00
Filip Gruszczynski
92e432c30e
Refactor and improve window layering.
...
This CL moves layer calculation into a separate class, so the whole
logic can be encapsulated. It also extracts special cases from the
general loop and instead applies them at the end. This simplifies the
logic in the main algorithm and makes it clearer what needs to happen
for special cases.
Bug: 26144888
Change-Id: I87347bf0198bd0d3cd09e4231b4652ab979f2456
2015-12-17 08:55:50 -08:00
Alan Viverette
ad217b68f8
Merge "Don't call public non-final getResources() from getAssets()"
2015-12-17 16:38:42 +00:00
Esteban Talavera
f3378a29e9
Merge "Device or profile owner can let another app manage app restrictions"
2015-12-17 10:59:16 +00:00
Mahaver Chopra
699d537d1b
Merge "Adding DPM.reboot"
2015-12-17 10:59:01 +00:00
Esteban Talavera
bf60f728cc
Device or profile owner can let another app manage app restrictions
...
The device or profile owner can allow another
package to set app restrictions for any app in that user
Similar to the way it can give permission to access
CA certificate related APIs from M.
Bug: 22541936
Change-Id: I0c1b0804ad300dfa4fbdc1c7721c5d8653d77861
2015-12-17 10:57:09 +00:00
Keisuke Kuroyanagi
d056081e50
TextView: Open context menu on right click.
...
- Construct context menu in #onCreateContextMenu.
- Ignore non-primary buttons for selection.
- Don't open context menu on long click.
Bug: 19544351
Bug: 19397276
Bug: 24872170
Change-Id: I4690e1485682be4f9b504b8fb6af936b979f13b8
2015-12-17 17:50:42 +09:00
Vladislav Kaznacheev
d9ab9b1889
Merge "Rename and simplify DropPermissionHolder"
2015-12-17 04:07:39 +00:00
Keisuke Kuroyanagi
b5703105de
Merge "Change cursor shape to STYLE_HAND on ClickableSpans"
2015-12-17 04:05:49 +00:00
Vladislav Kaznacheev
9149d2b117
Rename and simplify DropPermissionHolder
...
Rename DropPermissionHolder to DropPermissions and move
all server-side implementation details into a separate class.
Rename DragEvent.getDropPermissionHolder to
requestDropPermissions and make it take the permissions
implicitly.
Change-Id: Ia83f7cb8af07ce13ba9536d24b0f9d63331d8736
2015-12-16 17:10:36 -08:00
Samuel Tan
4981ae9083
Merge "Add comments to keep Java and native binder PersistableBundle in sync"
...
am: 6de926a7d6
2015-12-17 00:54:03 +00:00
Samuel Tan
d3decff052
Merge "Fix PersistableBundle handling in Parcel.writeValue"
...
am: d12959193c
2015-12-17 00:50:53 +00:00
Samuel Tan
0bc7647f63
Merge "Specify path for native PersistableBundle implementation"
...
am: 477fa220b1
2015-12-17 00:49:19 +00:00
Bryce Lee
3a0ea6254d
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b am: fc3762aafd am: 0ccc3a1cb5
...
am: 972c616ce2
2015-12-17 00:42:08 +00:00
Eino-Ville Talvala
3282f864f8
Merge "Revert "Camera2: create new streams if surface size has changed"" am: 79ac3edc57
...
am: 6e49caeaab
2015-12-17 00:39:07 +00:00
Eino-Ville Talvala
fefcb9bae2
Merge "Camera2: create new streams if surface size has changed" am: bcb636d423
...
am: c8a16ab564
2015-12-17 00:37:41 +00:00
Samuel Tan
6de926a7d6
Merge "Add comments to keep Java and native binder PersistableBundle in sync"
2015-12-17 00:35:58 +00:00
Samuel Tan
d12959193c
Merge "Fix PersistableBundle handling in Parcel.writeValue"
2015-12-17 00:35:43 +00:00
Samuel Tan
477fa220b1
Merge "Specify path for native PersistableBundle implementation"
2015-12-17 00:35:35 +00:00
Bryce Lee
972c616ce2
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b am: fc3762aafd
...
am: 0ccc3a1cb5
2015-12-17 00:28:04 +00:00
Bryce Lee
0ccc3a1cb5
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b
...
am: fc3762aafd
2015-12-17 00:20:34 +00:00
Bryce Lee
fc3762aafd
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev
...
am: cae2f2415b
2015-12-17 00:09:56 +00:00
Bryce Lee
e457fa4b9d
Add UUID to BluetoothHeadsetClientCall
...
This will allow for unique identification of a call as id only provides
uniqueness per session.
Bug: 26016489
Change-Id: I643d24bf5ff5680c26e530075649ef2a4f378295
2015-12-16 15:33:59 -08:00
Eino-Ville Talvala
6e49caeaab
Merge "Revert "Camera2: create new streams if surface size has changed""
...
am: 79ac3edc57
2015-12-16 23:20:29 +00:00
Eino-Ville Talvala
c8a16ab564
Merge "Camera2: create new streams if surface size has changed"
...
am: bcb636d423
2015-12-16 23:09:29 +00:00
