Michael Wright
1831ca8f04
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
...
am: a1e0cebf3a
* commit 'a1e0cebf3a18ac097d370e21d698e079f974bfff':
DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
Change-Id: I20532a3148a99d4ea91ba7dc050f8669d5f19400
2016-05-19 15:12:30 +00:00
TreeHugger Robot
a1e0cebf3a
Merge "DO NOT MERGE Rename PointerIcon and Pointer Capture APIs" into nyc-dev
2016-05-19 15:03:36 +00:00
Andrii Kulian
81ce16a2e6
Merge "Rename minWidth/Height attributes" into nyc-dev
...
am: 42b3acf9d3
* commit '42b3acf9d3eed15324bfa67e92ad751a10e45718':
Rename minWidth/Height attributes
Change-Id: I1710ea3bec982917ce0d163f56b07042a5869281
2016-05-19 01:48:19 +00:00
Andrii Kulian
42b3acf9d3
Merge "Rename minWidth/Height attributes" into nyc-dev
2016-05-19 01:42:15 +00:00
Christopher Tate
8d71edc83d
Add default lock wallpaper capability and API
...
am: 5d99d47f39
* commit '5d99d47f39d741ebe4a1ede53affc8c6bd198b2f':
Add default lock wallpaper capability and API
Change-Id: Ib617878c13d4a6530a12365199742fa7ffb5d590
2016-05-19 00:02:47 +00:00
Christopher Tate
c5bbf34cd9
Merge "API feedback: rename JobInfo methods for clarity" into nyc-dev
...
am: b100777562
* commit 'b1007775622f1814c87eef3ee5a325f606adb26c':
API feedback: rename JobInfo methods for clarity
Change-Id: I4fb08a73a64233e9d016f520f08944e22ec5ccd3
2016-05-18 23:58:03 +00:00
Christopher Tate
5d99d47f39
Add default lock wallpaper capability and API
...
If present, the system property "ro.config.lock_wallpaper" provides a
filesystem path to a decodeable image file to use as the system's
out-of-the-box lock wallpaper imagery. In the absence of this
system property, or if the indicated file is absent or unreadable,
then the new framework resource
com.android.internal.R.drawable.default_lock_wallpaper is consulted to
locate a usable asset. This mechanism parallels the existing one for
the default system wallpaper.
By default there is no specific lock wallpaper asset; the resource is
defined to be @null in the standard config.xml file. A product that
wants to define such a factory-default lock-only wallpaper image
will provide the asset as part of its framework resource overlay.
Bug 27828056
Change-Id: Iebf3706222370d0a0a4baf88d71a59ead07a25c7
2016-05-18 23:57:46 +00:00
Christopher Tate
a9b4f3f628
API feedback: rename JobInfo methods for clarity
...
Bug 28773330
Change-Id: I081fa225380a1966010d41020200fb3b9549a195
2016-05-18 13:59:16 -07:00
Svet Ganov
1129a0f473
Merge "Hide ephemeral API" into nyc-dev
...
am: 68c2919f70
* commit '68c2919f70299352ae649e1d7a05e9431f8b7aa0':
Hide ephemeral API
Change-Id: I1de27c7aac1ba488c755d615f039a069928ba7be
2016-05-18 20:16:38 +00:00
Svetoslav Ganov
68c2919f70
Merge "Hide ephemeral API" into nyc-dev
2016-05-18 20:10:28 +00:00
Svet Ganov
2265fddba6
Hide ephemeral API
...
bug:28825660
Change-Id: I4e9cdd6e29df44a173136aed13c4039443d944cc
2016-05-18 07:38:29 -07:00
Yohei Yukawa
ddaf3f4681
Merge "Move LocaleList to avoid layering violation." into nyc-dev
...
am: 31884efd13
* commit '31884efd13b3ac60078edaa0b7e8a4b75d995538':
Move LocaleList to avoid layering violation.
Change-Id: I9132fe456a8d79569c651dac0a0bce0153444767
2016-05-18 02:18:38 +00:00
Yohei Yukawa
31884efd13
Merge "Move LocaleList to avoid layering violation." into nyc-dev
2016-05-18 02:14:26 +00:00
Andrii Kulian
06a325c3e3
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
...
am: 47aa3f61ac
* commit '47aa3f61ac26195e11d7244c84bce3a1ea2dfb3f':
DO NOT MERGE Hide decor caption APIs
Change-Id: I7654435d1b251d1349125beb0b5d4a35c81855b1
2016-05-18 00:55:12 +00:00
Andrii Kulian
47aa3f61ac
Merge "DO NOT MERGE Hide decor caption APIs" into nyc-dev
2016-05-18 00:51:17 +00:00
Joe Onorato
6b10cec210
Merge changes If51568c3,Idd434c19 into nyc-dev
...
am: 45165c9373
* commit '45165c9373f1bf2dbe0c3f11b271daa24414ea35':
Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
@hide SystemHealthManager.from
Change-Id: Id56c7ee80254eac26132956ef62b83c405a0e2f8
2016-05-18 00:49:54 +00:00
TreeHugger Robot
45165c9373
Merge changes If51568c3,Idd434c19 into nyc-dev
...
* changes:
Demote the log in ProcessState.ensureNotDead from a wtf to a warning.
@hide SystemHealthManager.from
2016-05-18 00:46:47 +00:00
Hangyu Kuang
993f685045
Merge "Hide HdrCapabilities constructor." into nyc-dev
...
am: c189934573
* commit 'c1899345730ab3c4504cb314b371b4fa43ca0702':
Hide HdrCapabilities constructor.
Change-Id: Id3e15f6d3f26634dc632caa8f775071516436cd5
2016-05-18 00:46:35 +00:00
Hangyu Kuang
c189934573
Merge "Hide HdrCapabilities constructor." into nyc-dev
2016-05-18 00:42:55 +00:00
Adrian Roos
3a0f4f4b64
Merge "Adjust Notification APIs per API council" into nyc-dev
...
am: 718ba309cf
* commit '718ba309cfc9bbc3bbf785bbe5dfc1049ce02d20':
Adjust Notification APIs per API council
Change-Id: I282bb2b6e4718f7b1afb3eb418a8d37deaa457b0
2016-05-18 00:13:14 +00:00
Yohei Yukawa
23cbe85610
Move LocaleList to avoid layering violation.
...
Since LocaleList needs to depend on android.os.Parcelable, we cannot let
that class belong to "android.util" package, which causes layering
violation.
Bug: 28819696
Change-Id: Ia8de2ee9df3dd0a42b1fe84574439519b680fe18
2016-05-17 16:42:58 -07:00
Adrian Roos
96b7e20ba6
Adjust Notification APIs per API council
...
Also fixes a slight bug where a CharSequence extra
was retrieved as a string.
Change-Id: I8a40ab1934b8a20355c3cd4afd66a4a7b91fb517
Fixes: 28775580
Fixes: 28775582
2016-05-17 15:35:33 -07:00
Joe Onorato
22cfef381d
@hide SystemHealthManager.from
...
Bug: 28820055
Change-Id: Idd434c196428178e2c66facea36a7e010246611c
2016-05-17 15:29:51 -07:00
Hangyu Kuang
1e7d1aa6a6
Hide HdrCapabilities constructor.
...
Bug:25684127
Change-Id: I1a30ab3c162d8891c8aea1447757c85942033a0d
2016-05-17 14:21:01 -07:00
Andrii Kulian
5c96320e40
DO NOT MERGE Hide decor caption APIs
...
Hiding the APIs for now since we're not releasing freeform yet and it's
better not to expose them now in case we'll decide to change them later.
Bug: 28774476
Change-Id: Ic2de33c5a611a515fc1c72535587ebf2e0a03a7f
2016-05-17 20:56:24 +00:00
Andrii Kulian
f66a83db41
Rename minWidth/Height attributes
...
Rename WindowLayout#minimalWidth and #minimalHeight to #minWidth
and #minHeight to be consistent with other APIs.
Bug: 28775586
Change-Id: Ib7dc26318c4391693ef23f908b4d6090138dd0d7
2016-05-17 13:00:53 -07:00
Jae Seo
3488ed71d2
Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev
...
am: 7996b96311
* commit '7996b96311eec2343c16d3677fb834d2ec7cf082':
TIF: Throw a more appropriate runtime exception when building TvInputInfo
Change-Id: Ic7a930eb85984bab3e4a83ffa02ad30c30a568cf
2016-05-17 18:51:02 +00:00
TreeHugger Robot
7996b96311
Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev
2016-05-17 18:45:44 +00:00
Phil Weaver
11ece94702
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
...
am: 89d3ba72b7
* commit '89d3ba72b7f3318d8911b136af306375051c828a':
Hide UiAutomation#destroy as test api.
Change-Id: I91cbc4571a110be81f1c25fc0f19fed81d3b2819
2016-05-17 17:32:24 +00:00
Phil Weaver
89d3ba72b7
Merge "Hide UiAutomation#destroy as test api." into nyc-dev
2016-05-17 17:27:01 +00:00
Jae Seo
18c0cfb075
TIF: Throw a more appropriate runtime exception when building TvInputInfo
...
Bug: 28775591
Change-Id: I934c8d7fed3dda356cdc3bafe51a79f585918ed0
2016-05-17 10:06:36 -07:00
Michael Wright
f9d9ce7705
DO NOT MERGE Rename PointerIcon and Pointer Capture APIs
...
This is a response to API council feedback.
Bug: 26830970
Change-Id: Ia2d284b5c1ab8365bedfdc37d129be4b8146036b
2016-05-17 18:02:32 +01:00
Zoltan Szatmary-Ban
07e232371f
Merge "Introduce system API to get source of user restriction" into nyc-dev
...
am: 690c2ea117
* commit '690c2ea117f90b7759ac280a1c84f5966b1e7938':
Introduce system API to get source of user restriction
Change-Id: Iec3a08471bc56a3aec1aff43b3c7361931c13539
2016-05-17 15:24:20 +00:00
Zoltan Szatmary-Ban
690c2ea117
Merge "Introduce system API to get source of user restriction" into nyc-dev
2016-05-17 15:16:56 +00:00
Phil Weaver
e6269c3f1d
Hide UiAutomation#destroy as test api.
...
Bug: 28771617
Change-Id: Ib113883d3d12fc6a9e8c038e2c4eb1731b026b38
2016-05-16 12:55:08 -07:00
Michael Wright
9e0ff89010
Merge "Remove onUhandledInputEvent API." into nyc-dev
...
am: a1e4cbe211
* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
Remove onUhandledInputEvent API.
Change-Id: I13835ddbe40330694763d34d37e01b8deeb701d7
2016-05-16 15:24:10 +00:00
TreeHugger Robot
a1e4cbe211
Merge "Remove onUhandledInputEvent API." into nyc-dev
2016-05-16 15:18:20 +00:00
Clara Bayarri
8184f2e545
Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
...
am: d34396443e
* commit 'd34396443e712a96572d26c820809a9485e57da3':
Rename requestKeyboardShortcutsHelper
Change-Id: I0522d4d9bcfdce6b79dc672dcc0c515dc747b99d
2016-05-16 15:08:15 +00:00
Clara Bayarri
ac6f034f2a
Rename requestKeyboardShortcutsHelper
...
Per API council feedback
Bug: 28775576
Change-Id: I1c4f98d7ec0d848f0c387aaedf8a0ed80628c64e
2016-05-16 14:15:14 +01:00
Martijn Coenen
1ffef9a239
Merge "Address API review comments." into nyc-dev
...
am: 9a32929def
* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
Address API review comments.
Change-Id: Ieb67cdc7846a06d84280e9ea9ca1cbe34dbff78f
2016-05-16 09:25:58 +00:00
Martijn Coenen
9a32929def
Merge "Address API review comments." into nyc-dev
2016-05-16 09:18:36 +00:00
Adam Powell
f1dda81c42
Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
...
am: a6c0cc0992
* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
Add Fragment#onAttachFragment for parent fragments
Change-Id: I9138e3ee5706cbd35a119843f0007f548021e2f9
2016-05-13 21:57:57 +00:00
Adam Powell
e30299f990
Add Fragment#onAttachFragment for parent fragments
...
Framework edition
Add a matching onAttachFragment method to Fragment to match the
fragment host version.
Bug 28760393
Change-Id: I5f50b3446449cae7110da6b4e468ee80f413e1e5
2016-05-13 13:38:45 -07:00
Adrian Roos
a4f8525fdc
Merge "DPM control for remote input when locked" into nyc-dev
...
am: 11c8f5315b
* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
DPM control for remote input when locked
Change-Id: Id7074ffdc541d53d4607652cefc4bfdecaaaa335
2016-05-12 20:58:55 +00:00
Adrian Roos
11c8f5315b
Merge "DPM control for remote input when locked" into nyc-dev
2016-05-12 20:52:26 +00:00
Tingting Wang
2fc6bf3936
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
...
am: 752129929f
* commit '752129929fcbe8d7740d25014f7878e835d4f4ef':
Rename CONTACT_METADATA_SYNC GService Flag.
Change-Id: Ibef9e072b3ff5216de1802558d93e66661bd7764
2016-05-12 17:16:17 +00:00
Tingting Wang
752129929f
Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev
2016-05-12 17:11:44 +00:00
Makoto Onuki
82c64a485a
Merge "Remove ShortcutManager" into nyc-dev
...
am: 26edcba2c9
* commit '26edcba2c950701ff2dd8794687552bc37e4dfc8':
Remove ShortcutManager
Change-Id: I4b99a5fe6d73400070ba5829573255283c7b7a5c
2016-05-12 16:36:06 +00:00
Makoto Onuki
26edcba2c9
Merge "Remove ShortcutManager" into nyc-dev
2016-05-12 16:32:56 +00:00
Chris Wren
08eb83f8b0
Merge "document the return type of getImportance" into nyc-dev
...
am: 3041d49d88
* commit '3041d49d888cf0732c8aafb88d1d931b696b1d41':
document the return type of getImportance
Change-Id: I03bb7490b62e749e16a417297a672769283aebdd
2016-05-12 13:00:50 +00:00