Commit Graph

13801 Commits

Author SHA1 Message Date
Jae Seo
7128f82cea Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311 am: 3488ed71d2
am: d0006f584f

* commit 'd0006f584fb8c5ff2283d6211bbc957b96065243':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Ifc07ec617b326bc29e7126116aa2a33a9d635bee
2016-05-17 19:10:29 +00:00
Jae Seo
d0006f584f Merge "TIF: Throw a more appropriate runtime exception when building TvInputInfo" into nyc-dev am: 7996b96311
am: 3488ed71d2

* commit '3488ed71d26b62ec7f4f5f6e8a02a19ba4440ab6':
  TIF: Throw a more appropriate runtime exception when building TvInputInfo

Change-Id: Iac43c8b1fb1484ea0b66080f941d247b116dcff5
2016-05-17 18:58:53 +00: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
Makoto Onuki
1b537cc623 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev am: 8295332d83
am: 37d5cb3181

* commit '37d5cb3181b4fc94b5e180f1a011330b893fcd84':
  ShortcutManager: API changes for DR

Change-Id: Id585b05388cb487aba19f5c7fee3e13bd467e808
2016-05-17 18:20:19 +00:00
Makoto Onuki
37d5cb3181 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev
am: 8295332d83

* commit '8295332d83d1e664a7ef3a731370ae71242688a1':
  ShortcutManager: API changes for DR

Change-Id: I0006667d4bbe2fa92015ac442ae1e8362cbcacbd
2016-05-17 18:14:39 +00:00
Makoto Onuki
8295332d83 Merge "ShortcutManager: API changes for DR" into nyc-mr1-dev 2016-05-17 18:01:29 +00:00
Phil Weaver
2a72e8b390 Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7 am: 11ece94702
am: 3070a2a97c

* commit '3070a2a97c40f78b0f716a92b8428ea9815d3d83':
  Hide UiAutomation#destroy as test api.

Change-Id: I81b65ece02a7b48bbc93d12f032af2bc8cced820
2016-05-17 17:41:19 +00:00
Phil Weaver
bcaaac3ea1 Merge "Hide UiAutomation#destroy as test api." into nyc-dev
am: 89d3ba72b7

* commit '89d3ba72b7f3318d8911b136af306375051c828a':
  Hide UiAutomation#destroy as test api.

Change-Id: Ie68602fc2b301430dcfa98d4b61515f2014db71a
2016-05-17 17:36:17 +00:00
Phil Weaver
3070a2a97c Merge "Hide UiAutomation#destroy as test api." into nyc-dev am: 89d3ba72b7
am: 11ece94702

* commit '11ece94702f68f96af44cf7aafca462709bf4937':
  Hide UiAutomation#destroy as test api.

Change-Id: I06c78c7bb99268ea3fd559990d2acde3e611f3ab
2016-05-17 17:35:24 +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
Zoltan Szatmary-Ban
e0267426c2 Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117 am: 07e232371f
am: 96489e0c2a

* commit '96489e0c2a370b970fc243a23ccfb3e0a73d0298':
  Introduce system API to get source of user restriction

Change-Id: Id368f8b1a096a86195097ba87a18539f0558a72a
2016-05-17 15:33:28 +00:00
Zoltan Szatmary-Ban
96489e0c2a Merge "Introduce system API to get source of user restriction" into nyc-dev am: 690c2ea117
am: 07e232371f

* commit '07e232371f5249de1c8fe4d8ac277b22b646576c':
  Introduce system API to get source of user restriction

Change-Id: Iaec13f6b56a138b67a066c9eb1c234a7a653c4bd
2016-05-17 15:29:25 +00: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
fc66ec971c 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: Iab98753f85774d741c5126395d56af194c8b0ca8
2016-05-17 15:23:59 +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
Makoto Onuki
20c95f854e ShortcutManager: API changes for DR
See https://goto.google.com/shortcutmanager-spec-dr for
the details.

This CL contains changes to ShortcutInfo and all the new API
entry points, but not the implementation of the new APIs.

- ShortcutInfo.activityComponent is now mandatory.
- Publishers can now disable shortcuts.  ShortcutInfo can now have
"disabled message".
- ShortcutInfo now supports string resources for all the String
fields.
  -> When launcher fetches shortcuts, ShortcutService will
  automatically load resources and expose as strings.
- LauncherApps now supports getShortcutIconDrawable() and
getShortcutBadgedIconDrawable() to be consistent with
LauncherActivityInfo.

- ShortcutInfo.weight is replaced with "rank".

- Added ShortcutManager.reportShortcutUsed(), which will be used for
usage tracking / suggestion.

Bug 28536054
Bug 28536066
Bug 28564134
Bug 28594168

Change-Id: Ib8245b39bb1e753991a9de89c0b73accacd90355
2016-05-16 16:25:50 -07: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
9f8c39a8e3 Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211 am: 9e0ff89010
am: 56ef817f1e

* commit '56ef817f1e8805b6da304067a60a06b4fa86f995':
  Remove onUhandledInputEvent API.

Change-Id: Ic0a52c81f611719e5bd8d51a141b48fa62ea8222
2016-05-16 15:31:12 +00:00
Michael Wright
56ef817f1e Merge "Remove onUhandledInputEvent API." into nyc-dev am: a1e4cbe211
am: 9e0ff89010

* commit '9e0ff89010dd2003bc9952ffedcf0f6c8d080cbb':
  Remove onUhandledInputEvent API.

Change-Id: I067333a191a5d581f397f5e9c09f6b7feae8d1f5
2016-05-16 15:27:37 +00: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
Michael Wright
eb1ca626f0 Merge "Remove onUhandledInputEvent API." into nyc-dev
am: a1e4cbe211

* commit 'a1e4cbe2116bef9fad7c98836926317bde95d33e':
  Remove onUhandledInputEvent API.

Change-Id: I206665559c16852a6405af7081481c4e7c17cf81
2016-05-16 15:24:08 +00:00
Clara Bayarri
bec98ff68b Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e am: 8184f2e545
am: 8bccf39875

* commit '8bccf39875b479c6e09eab3b107817028d90c793':
  Rename requestKeyboardShortcutsHelper

Change-Id: I83b36970bf652530797d7f383dbbbd090cd972ca
2016-05-16 15:18:36 +00:00
TreeHugger Robot
a1e4cbe211 Merge "Remove onUhandledInputEvent API." into nyc-dev 2016-05-16 15:18:20 +00:00
Clara Bayarri
8bccf39875 Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev am: d34396443e
am: 8184f2e545

* commit '8184f2e5452a8c5133da8c8d9ae957cf5182ce5a':
  Rename requestKeyboardShortcutsHelper

Change-Id: I43fd7494218d2c1662bb3647671a0f02592ffc2d
2016-05-16 15:11:37 +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
f76e417c52 Merge "Rename requestKeyboardShortcutsHelper" into nyc-dev
am: d34396443e

* commit 'd34396443e712a96572d26c820809a9485e57da3':
  Rename requestKeyboardShortcutsHelper

Change-Id: I6fb4ae2c7b39b24fb4b9c916552bd9fb4534f546
2016-05-16 15:08:09 +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
27a855d172 Merge "Address API review comments." into nyc-dev am: 9a32929def am: 1ffef9a239
am: 2386212c05

* commit '2386212c057009014b16c378910e0aea5292a09f':
  Address API review comments.

Change-Id: Iba1c5f79cdb527b710026e1e5ae9f3e337ff754b
2016-05-16 09:32:31 +00:00
Martijn Coenen
2386212c05 Merge "Address API review comments." into nyc-dev am: 9a32929def
am: 1ffef9a239

* commit '1ffef9a239a67016607f62dfd023bf7fefb85370':
  Address API review comments.

Change-Id: I1f7da4c07988923b22bfab5689d48531cfb95aa1
2016-05-16 09:28:57 +00: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
a87343fbeb Merge "Address API review comments." into nyc-dev
am: 9a32929def

* commit '9a32929def3425c55a1bc96ea20346bf95357ae4':
  Address API review comments.

Change-Id: Id397091f72c9ca3d50809a3e029e8b12ee86ea26
2016-05-16 09:25:57 +00:00
Martijn Coenen
9a32929def Merge "Address API review comments." into nyc-dev 2016-05-16 09:18:36 +00:00
Daniel Nishi
b4128249e6 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev am: e8ed2ed331
am: 057a101453

* commit '057a101453ea46a6207588b53952d78c2a80898c':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I1f823bcdde7b48f37bfe9016ba68bbc3c27a4357
2016-05-14 01:20:39 +00:00
Daniel Nishi
057a101453 Merge "Add an Activity action to go into the Deletion Helper." into nyc-mr1-dev
am: e8ed2ed331

* commit 'e8ed2ed331a056fe2262ac649f71d781df25f363':
  Add an Activity action to go into the Deletion Helper.

Change-Id: I09b09f645b455c8a2cde7bd0eadb34b2cc704178
2016-05-14 01:17:24 +00:00
Daniel Nishi
ac62b4b360 Add an Activity action to go into the Deletion Helper.
Applications may want to jump to the Deletion Helper to free up
storage when the device is under storage pressure.

Bug: 28675265
Change-Id: I709c39f3e699ab5f51f4ad1272468583276ff050
2016-05-14 00:01:33 +00:00
Adam Powell
c68c2b44ab Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992 am: 46ca7d8c28
am: bbb2c35902

* commit 'bbb2c359023a0cd8ee3790235ed35cec2c13ea27':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I0561042957f8f150c5206cd5a3cfb3b2d5ce4035
2016-05-13 22:03:16 +00:00
Adam Powell
bbb2c35902 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev am: a6c0cc0992
am: 46ca7d8c28

* commit '46ca7d8c288da4414f40de7e8b1d8f929816bd82':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I6862300fc5aff480c4215d66eb8c9167ed17e448
2016-05-13 22:00:46 +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
46ca7d8c28 Merge "Add Fragment#onAttachFragment for parent fragments" into nyc-dev
am: a6c0cc0992

* commit 'a6c0cc099221a5321505b1343f623e76f52b2ad5':
  Add Fragment#onAttachFragment for parent fragments

Change-Id: I04c96f7a7ecf73d63b401bb0e1e7d3900fd59310
2016-05-13 21:57:52 +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
9240b15a1a Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b am: f46fdf877e
am: d5bd2b647c

* commit 'd5bd2b647c8f0acaffae72090748d346cae2351b':
  DPM control for remote input when locked

Change-Id: Ic97f9dbb0f4013709b62ee8dbf7d49c29c5fe807
2016-05-12 21:04:41 +00:00
Adrian Roos
d5bd2b647c Merge "DPM control for remote input when locked" into nyc-dev am: 11c8f5315b
am: f46fdf877e

* commit 'f46fdf877ef54adc236698635967ff79d7a0dfe2':
  DPM control for remote input when locked

Change-Id: I7eb3cdf17b4a61865bfe85ae6d9c281b113aeb9f
2016-05-12 21:01:32 +00: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
f46fdf877e Merge "DPM control for remote input when locked" into nyc-dev
am: 11c8f5315b

* commit '11c8f5315b195d6a63f981a7ff434fa7937ba5d3':
  DPM control for remote input when locked

Change-Id: I330777f47f51dee00623ace614271f42b6d4fca7
2016-05-12 20:58:53 +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
fc48c6a703 Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f am: 2fc6bf3936
am: c8242b22ab

* commit 'c8242b22ab12e0ee5d6c3fd5672bf8b5dd7ac101':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: I5032c5f617e9c4b04893bfd124e6b38196d3dc8e
2016-05-12 17:29:11 +00:00
Tingting Wang
c8242b22ab Merge "Rename CONTACT_METADATA_SYNC GService Flag." into nyc-dev am: 752129929f
am: 2fc6bf3936

* commit '2fc6bf3936951764569bef3256bf41823f3986d4':
  Rename CONTACT_METADATA_SYNC GService Flag.

Change-Id: Ib348fbd43a4071156894045e301554ac2631127f
2016-05-12 17:24:34 +00:00