Skuhne
8aa7d161a1
Adding menu to arrange one or two tasks and arrange them accordingly
...
Added dialog with buttons for task arrangement upon click on decorator
icon.
BUG: 19492945,19868830,19656507
Change-Id: Ie31e2788efb097db1c1f54f0ef1b2fda1ccc71ec
2015-03-24 09:20:51 -07:00
Craig Lafayette
1cef419688
Merge "Add Bluetooth connection extras to DPM."
2015-03-24 12:19:35 +00:00
Craig Lafayette
97e473e1e1
Add Bluetooth connection extras to DPM.
...
These extras will be used in ManagedProvisioning to allow
Bluetooth connections from provisioned devices.
Change-Id: I7118acd4ea71e2028a0c9f0c61031c78deef8908
2015-03-24 07:03:23 -04:00
Dongwon Kang
a7b212d9f1
Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract.Programs"
2015-03-24 04:07:25 +00:00
Qiwen Zhao
44f388a3ed
Merge commit 'ff4bdd0b'
2015-03-23 20:18:22 -07:00
Miao Wang
ab452f70fc
am 2b30b73b: am 6f6f44b0: am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
...
* commit '2b30b73b017f10bc2ce514981b577c2efaeab739':
[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
2015-03-24 02:59:12 +00:00
Anthony Hugh
568e391872
am c8bb597f: (-s ours) am 09ebc52a: am 7c08dd61: Merge "DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier" into lmp-mr1-modular-dev
...
* commit 'c8bb597fba16589b9d76959bae22da22d00967d4':
DO NOT MERGE: Set the appliance (tv/watch) in the configuration earlier
2015-03-24 02:58:56 +00:00
Filip Gruszczynski
90214cd7f5
Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base
2015-03-24 02:58:54 +00:00
Dmitriy Ivanov
6a225edccd
Merge "Load libraries directly from apk"
2015-03-24 02:57:10 +00:00
Michael Wright
d99c5f6fb6
am 72261270: am b42baaa8: am 978cfc39: Merge "SystemUI needs the SET_WALLPAPER permission"
...
* commit '722612707e7eef745dab573ff226e2bd904295cb':
SystemUI needs the SET_WALLPAPER permission
2015-03-24 02:56:08 +00:00
Jeff Sharkey
bafd48d027
Merge "Introduce per-user GIDs for storage."
2015-03-24 02:38:48 +00:00
Craig Mautner
6a1cbb106a
Merge "Prevent unexpected rotation while going back to keyguard"
2015-03-24 02:24:59 +00:00
Jeff Sharkey
00f3904629
Introduce per-user GIDs for storage.
...
This will eventually allow us to have a single unified filesystem
instead of requiring zygote to use bind mounts.
Change-Id: I29b819ab51498b4bab874e0367b1ab4165f84025
2015-03-23 19:14:19 -07:00
Svet Ganov
95c1adea0c
Add install option to grant all runtime permissions.
...
Change-Id: I72ba67a72025646a3d53611621b0353d3a86677c
2015-03-24 01:53:50 +00:00
Svetoslav
ca7256ef32
Merge "Runtime permissions: per user permission tracking."
2015-03-24 01:52:11 +00:00
Svetoslav
c6d1c345f4
Runtime permissions: per user permission tracking.
...
Before all permissions were granted at install time at once, so the user
was persented with an all or nothing choice. In the new runtime permissions
model all dangarous permissions (nomal are always granted and signature
one are granted if signatures match) are not granted at install time and
the app can request them as necessary at runtime.
Before, all granted permission to an app were identical for all users as
granting is performed at install time. However, the new runtime model
allows the same app running under two different users to have different
runtime permission grants. This change refactors the permissions book
keeping in the package manager to enable per user permission tracking.
The change also adds the app facing APIs for requesting runtime permissions.
Change-Id: Icbf2fc2ced15c42ca206c335996206bd1a4a4be5
2015-03-23 18:50:35 -07:00
Geoff Mendal
27f285bf9e
am abdbf186: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev
...
* commit 'abdbf1860c7855687aacbb4e293a6e6ec40c0213':
Import translations. DO NOT MERGE
2015-03-24 01:34:14 +00:00
Geoff Mendal
c1885e82b6
am 4d17b954: (-s ours) am 2f12b803: (-s ours) am eded9424: (-s ours) Import translations. DO NOT MERGE
...
* commit '4d17b9549e0223b1efb2b66cf71e36b7a56420ee':
Import translations. DO NOT MERGE
2015-03-24 01:33:04 +00:00
Christopher Tate
c75517c160
Merge "Back up and restore the set of enabled IMEs"
2015-03-24 01:13:20 +00:00
Griff Hazen
9018354a67
Merge "Merge commit '583c7c56' into master"
2015-03-24 01:12:26 +00:00
Jeff Tinker
3910eb551c
Merge "Note in docs that MediaDrm methods throw IllegalStateException"
2015-03-24 00:10:21 +00:00
Jeff Tinker
8873f848aa
Merge "Report key request message type for unprefixed EME"
2015-03-24 00:05:34 +00:00
Dianne Hackborn
312035232b
Merge "Add view ID, rework assist API."
2015-03-24 00:02:38 +00:00
Craig Mautner
93f724b04e
Merge "Recalculate input method top edge."
2015-03-23 23:56:42 +00:00
Griff Hazen
daf5c0ebd0
Merge commit '583c7c56' into master
...
Change-Id: I89c2c63005fbb6b1c058b2022f4469be5244505f
2015-03-23 16:34:11 -07:00
tiger_huang
21637018f9
Prevent unexpected rotation while going back to keyguard
...
The original logic would let the app hidden by keyguard be able to
decide the orientation. While going back from a show-when-locked app
to keyguard, there would be a short time that keyguard is unable to
decide the orientation, which causes WMS uses the wrong orientation
from the wrong app.
https://code.google.com/p/android/issues/detail?id=155640
Change-Id: Ibc17bfe4603f68b241dc7380459ec9de42a3e259
2015-03-23 16:28:53 -07:00
Christopher Tate
7b9a28c7f0
Back up and restore the set of enabled IMEs
...
The restored set of enabled IMEs/subtypes is merged into the
current state of the system, rather than simply replacing it.
This is because we do not want to accidentally disable or
reconfigure something that the user is currently relying on.
There's a certain amount of repetitive activity here, rebuilding
the enabled-state data structures in a different format, but it's
important for maintainability that the restore code be able to
rely on the core InputMethodUtils implementation of reading/writing
the settings element.
Bug 19822542
Change-Id: If0104151b3526da6ecc669adde3119a239ecafeb
2015-03-23 16:28:21 -07:00
Alan Viverette
8a9225eb94
am 12062c6e: am 19537c0a: am 38fcaf40: Merge "Move arrow_pointer hotspot to better match actual tip"
...
* commit '12062c6e99a8c17637177fe0e41ec95ea0fd977b':
Move arrow_pointer hotspot to better match actual tip
2015-03-23 23:25:02 +00:00
Chad Brubaker
781df04511
am 6050eb54: am 5b11b3d6: am 31cee318: Merge "Specify public exponent for RSA"
...
* commit '6050eb5459a00b95bf135d40e9e37cd043c863e4':
Specify public exponent for RSA
2015-03-23 23:24:51 +00:00
Jeff Tinker
4cdc2de0e4
Report key request message type for unprefixed EME
...
bug: 19771299
Change-Id: If76fa2988ca45632d0afff601c12f8f5f9908ed1
2015-03-23 16:23:12 -07:00
Dongwon Kang
55113971e2
Merge "TIF: fix NPE in the case a hardware TV input is not ready to use."
2015-03-23 23:18:29 +00:00
Alan Viverette
7b74a5cd7e
Merge "Fix build"
2015-03-23 23:03:09 +00:00
Geoff Mendal
d5a914f52c
am 7163a0a1: (-s ours) am 57d7b5f4: (-s ours) am 1f9bad3c: (-s ours) Import translations. DO NOT MERGE
...
* commit '7163a0a1a68e464b00273e71851b56769aecaeb3':
Import translations. DO NOT MERGE
2015-03-23 22:56:40 +00:00
Alan Viverette
5c243723dd
Fix build
...
Change-Id: Iaa8f3e7f4030b8eecc595cc1ab11e83c046714f1
2015-03-23 15:37:28 -07:00
Winson Chung
f21ef3d25a
Merge "Adding null check for focused stack before trying to switch affiliated tasks."
2015-03-23 22:16:38 +00:00
Winson Chung
98127fb818
Adding null check for focused stack before trying to switch affiliated tasks.
...
Bug: 19870065
Change-Id: I674914b9d4a63cb9c73fa71bbc4b82c210e2001f
2015-03-23 15:12:53 -07:00
Craig Mautner
386b397b0b
Merge "Add null check and call destroy from single point."
2015-03-23 22:12:17 +00:00
Alan Viverette
634ef35b96
Merge "Update date and time picker headers for dark theme"
2015-03-23 22:11:29 +00:00
Alan Viverette
fd6cd3b6f0
Update date and time picker headers for dark theme
...
Bug: 19849816
Change-Id: If8e15fccbea322e9349fddc02f9dcf7d387f881b
2015-03-23 15:09:53 -07:00
Craig Mautner
ff4bdd0be5
am 26d577b0: am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard"
...
* commit '26d577b08f4cbd4d44f9cfc8360849293e2f2d0c':
Prevent unexpected rotation while going back to keyguard
2015-03-23 22:09:48 +00:00
Craig Mautner
26d577b08f
am f8a2ba51: Merge "Prevent unexpected rotation while going back to keyguard"
...
* commit 'f8a2ba511ee2dc5360f323c71eff5e0f2465dd99':
Prevent unexpected rotation while going back to keyguard
2015-03-23 22:03:14 +00:00
Wale Ogunwale
e7666f9e45
Merge "Default ActivityInfo.resizeable to false for all SDK versions."
2015-03-23 22:00:01 +00:00
Alan Viverette
835d798606
Docs nit
...
Change-Id: I390997826db6997f843cafc4136633937e185e82
2015-03-23 14:54:35 -07:00
Craig Mautner
f8a2ba511e
Merge "Prevent unexpected rotation while going back to keyguard"
2015-03-23 21:48:57 +00:00
Alan Viverette
167fa2fdb7
Merge "Clean up date picker"
2015-03-23 21:36:08 +00:00
Alan Viverette
452fe34984
Clean up date picker
...
Bug: 19758502
Change-Id: I11ed62245d15d155335f5652000b9dc81185e2f9
2015-03-23 14:26:09 -07:00
Miao Wang
2b30b73b01
am 6f6f44b0: am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
...
* commit '6f6f44b0387c88b35d9345775a9e909ad484fe68':
[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
2015-03-23 21:23:16 +00:00
Miao Wang
6f6f44b038
am b2b0c4c2: Merge "[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks."
...
* commit 'b2b0c4c2072459612c6ed078d84b189cba326de1':
[RenderScript] Add create(Context, int) to be compatible with the thunker layer & minor tweaks.
2015-03-23 21:15:35 +00:00
Geoff Mendal
bb522cb336
am d4f45766: (-s ours) Import translations. DO NOT MERGE
...
* commit 'd4f45766fabe3e305049dcd2f5b16b7e058a203a':
Import translations. DO NOT MERGE
2015-03-23 21:11:37 +00:00
Wale Ogunwale
8ed9946a8b
Merge "Changed recent multi-window UI to use persist.sys.debug.multi_window"
2015-03-23 21:10:43 +00:00