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
* commit '4981ae908349767fee7976cc82c54a7fb00ee4fd':
Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 09:55:24 -08:00
Samuel Tan
76d3072dd6
Merge "Fix PersistableBundle handling in Parcel.writeValue" am: d12959193c
...
am: d3decff052
* commit 'd3decff052c4f7471a21fbbb116b32586181b391':
Fix PersistableBundle handling in Parcel.writeValue
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
* commit '0bc7647f63bcdf2d63ee71d770f9514a239eaba8':
Specify path for native PersistableBundle implementation
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
Steve McKay
a8f03a2d81
Eliminate dialog mode from DocumentsUI.
...
DocumentsActivity to Use standard drawer layout at all display resolutions.
Bug: 26208032
Change-Id: I3b93c81bf97045744074a299e92cdea4aae7628d
2015-12-17 09:44:57 -08: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
Winson Chung
aaeaac1783
Refactoring to AnimatedEvent.
...
Change-Id: I87ce63201120dc687eccd63024801cc2c19bebd6
2015-12-17 11:11:01 -05:00
Winson Chung
aa4f800891
Fixing minor issue with freeform workspace not showing.
...
- Also slightly tweaking drop target sizes to be a bit smaller
Change-Id: I0e877e64acba5dd165c0d7a2cffb24dea88d673f
2015-12-17 15:31:18 +00:00
Łukasz Nowicki
891103c7d7
Fix typo in config.xml file
...
Change-Id: I5902c410ced9418278e0ccf847eac8ea1d70bafe
2015-12-17 15:23:48 +00:00
Matt Sarett
66837204a1
Merge "Clean-ups for BitmapRegionDecoder"
2015-12-17 15:13:14 +00:00
Tomasz Mikolajewski
6e690ac8dc
Merge "Add tests for copying virtual typed files."
2015-12-17 13:36:20 +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
Chris Banes
12a47ac41e
Fix AlertDialog.setIcon() not working when called after show() pt.2
...
BUG: 26183328
Change-Id: I2bd8ff0315e04dd33fe720f0e5c32dec06747afc
2015-12-17 10:00:26 +00:00
Keisuke Kuroyanagi
fbca8264e0
Merge "TextView tests: open context menu on right click."
2015-12-17 08:51:35 +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
Keisuke Kuroyanagi
a0b3c06881
TextView tests: open context menu on right click.
...
- Extend MouseUiController and MouseClickAction to support choosing click
button.
- Introduce ContextMenuUtils to provide useful methods for context menu
testing.
Bug: 25730231
Change-Id: I4f04716428b8cfdcf9f953fe8f8d27f5374b0425
2015-12-17 08:19:56 +00:00
Tomasz Mikolajewski
416b8ea732
Merge "Add support to virtual and typed files in StubProvider."
2015-12-17 08:05:36 +00:00
Tomasz Mikolajewski
f65fdebddb
Add tests for copying virtual typed files.
...
Bug: 26147488
Change-Id: I44cfae518f4b6dfceed5b9f50b132e2acf161b3f
2015-12-17 17:02:42 +09:00
Wonsik Kim
c2d26a0835
Merge "TIF: add signal detection feature for HW inputs"
2015-12-17 07:05:51 +00:00
Wonsik Kim
102d0b7b69
TIF: add signal detection feature for HW inputs
...
Bug: 23820259
Change-Id: If7f03b49f7510ec405dfc4fb2b6f709b8c8b820d
2015-12-17 15:18:39 +09:00
Tomasz Mikolajewski
cca31ebb0e
Add support to virtual and typed files in StubProvider.
...
Bug: 26147488
Change-Id: I40a75547ff16bb7d45f36843c29692268b4291b6
2015-12-17 15:06:29 +09:00
Tomasz Mikolajewski
a416cd02b6
Merge "Append a correct extension in case of copying virtual files."
2015-12-17 06:03:44 +00: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
Shreyas Basarge
0bc4c58ffc
Merge "Fixes NPE bug in JobScheduler.getAllPendingJobs()"
2015-12-17 03:00:00 +00:00
Tomasz Mikolajewski
5fc0240bf5
Append a correct extension in case of copying virtual files.
...
Bug: 26147488
Change-Id: I3e310c102e7c819ea16b47dfe7902d389cfc9d00
2015-12-17 11:27:24 +09:00
Tomasz Mikolajewski
bf0bbc8742
Merge "Fix CopyService after recent refactoring."
2015-12-17 02:04:22 +00:00
Tomasz Mikolajewski
f03ba80ebf
Fix CopyService after recent refactoring.
...
My recent CL broke tests badly. This time double checked.
Bug: 26218041
Bug: 26176231
Change-Id: Ia1f68d7cff83ec9c3cfb9bccb9c91ff092b25ced
2015-12-17 11:03:10 +09: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
* commit '6de926a7d6439745cd0f01a69a5dd75b006b923d':
Add comments to keep Java and native binder PersistableBundle in sync
2015-12-17 00:54:03 +00:00
Samuel Tan
d3decff052
Merge "Fix PersistableBundle handling in Parcel.writeValue"
...
am: d12959193c
* commit 'd12959193c60254b6b03b2a60a9c6e598e9da2e5':
Fix PersistableBundle handling in Parcel.writeValue
2015-12-17 00:50:53 +00:00
Samuel Tan
0bc7647f63
Merge "Specify path for native PersistableBundle implementation"
...
am: 477fa220b1
* commit '477fa220b1766a3822171fa514983198e09daabb':
Specify path for native PersistableBundle implementation
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
* commit '972c616ce2f83622e5529ef86c9d7f243a60b601':
Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:42:08 +00:00
Adam Lesinski
65f8e2a91f
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23 am: b2c5155638 am: 40d1ab91d2 am: 8c9209183f am: 7f5ad22330 am: 1f7a36b8e6
...
am: 087e0fcba6 -s ours
* commit '087e0fcba687bce677f39fd2b708a9cbb1defcd0':
DO NOT MERGE: AAPT: Dump uses-permission-sdk-23
2015-12-17 00:40:32 +00:00
Eino-Ville Talvala
3282f864f8
Merge "Revert "Camera2: create new streams if surface size has changed"" am: 79ac3edc57
...
am: 6e49caeaab
* commit '6e49caeaabeb852f0b6cd1e75d9871bc6b70b981':
Revert "Camera2: create new streams if surface size has changed"
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
* commit 'c8a16ab564532cbbdd781d0528c825945c63e907':
Camera2: create new streams if surface size has changed
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
* commit '0ccc3a1cb5487fb2640d749be698866475a2c435':
Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:28:04 +00:00
Bryce Lee
0ccc3a1cb5
Merge "Add UUID to BluetoothHeadsetClientCall" into cw-e-dev am: cae2f2415b
...
am: fc3762aafd
* commit 'fc3762aafd58ff9eada0b5ed261de20a40d7b07a':
Add UUID to BluetoothHeadsetClientCall
2015-12-17 00:20:34 +00:00