Android Build Merger (Role)
0bf753d2e5
Merge "Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev am: 2a30085e5c" into oc-dev-plus-aosp
2017-04-14 04:34:25 +00:00
Dmitry Dementyev
11e1805ab3
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
...
am: 2a30085e5c
Change-Id: I2f583203d8b97f0a56c8b911d20098a3ed1772eb
2017-04-14 04:33:27 +00:00
Rebecca Silberstein
01d3ad5cf2
Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4 am: 6fc5051613
...
am: 2f7a169618
Change-Id: Id0a6bc3452b909ac22704ab76b2811259f94147f
2017-04-14 04:25:57 +00:00
Rebecca Silberstein
2f7a169618
Merge "Add a default SSID prefix for local only hotspot" am: e98a2942a4
...
am: 6fc5051613
Change-Id: If99dc4527f2d85d803d7ef8eabfbb8601be11071
2017-04-14 04:19:02 +00:00
Rebecca Silberstein
e98a2942a4
Merge "Add a default SSID prefix for local only hotspot"
2017-04-14 04:03:50 +00:00
TreeHugger Robot
2a30085e5c
Merge "Add ACTION_ACCOUNT_REMOVED to Account Manager." into oc-dev
2017-04-14 03:53:52 +00:00
Dongwon Kang
3d9ecc264d
Merge "TIF: add helper methods for making a channel browsable." into oc-dev
...
am: b2eb818a7d
Change-Id: I54b92c8b773706de49ffd2e78df59568e19d3b49
2017-04-13 21:32:15 +00:00
TreeHugger Robot
b2eb818a7d
Merge "TIF: add helper methods for making a channel browsable." into oc-dev
2017-04-13 21:23:48 +00:00
Dmitry Dementyev
a461e30053
Add ACTION_ACCOUNT_REMOVED to Account Manager.
...
AccountManagerService sends an intent with the action when account of any type is removed or renamed.
Test: manual, APCT.
Bug: 37280078
Change-Id: I53b1bb9d6cde1edba5c37ecf3e4e13d748b19005
2017-04-13 21:10:50 +00:00
Chris Tate
636915a2ed
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
...
am: 117ac766a9
Change-Id: I9bec0f90873a5bcb9ff89eadcf7e334e9f0afb89
2017-04-13 19:45:30 +00:00
Chris Tate
117ac766a9
Merge "Introduce PACKAGE_FIRST_ADDED broadcast" into oc-dev
2017-04-13 19:24:13 +00:00
Martijn Coenen
e90bf46a78
Merge "Add persistentFeature application attribute." into oc-dev
...
am: e4960cf495
Change-Id: Idf9355d092efa1ffb7eacd9299e3a8471396d3d6
2017-04-13 17:12:12 +00:00
Martijn Coenen
e4960cf495
Merge "Add persistentFeature application attribute." into oc-dev
2017-04-13 16:53:22 +00:00
TreeHugger Robot
2f522fc904
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-13 15:42:31 +00:00
Tadashi G. Takaoka
6c8c498b5b
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
...
am: d280bfea23
Change-Id: I08a985e79f695ed43f4b873698424263689bd57d
2017-04-13 07:53:39 +00:00
Rebecca Silberstein
84b3139de5
Add a default SSID prefix for local only hotspot
...
Add a default prefix for local only hotspot that will be used to
generate WifiConfiguration objects. This prefix will have
random digits appended to reduce AP name collisions.
Bug: 36704909
Test: compiles
Change-Id: I2b9478a12de27cabe13ece2973bce7cd4976ba2f
2017-04-13 00:43:18 -07:00
Tadashi G. Takaoka
d280bfea23
Merge "Remove supportsDismissingSelfWindow attribute of IME" into oc-dev
2017-04-13 07:41:34 +00:00
Bill Yi
7dc403b158
Import translations. DO NOT MERGE
...
Change-Id: I140e40e34c4ee3482c87f180d292bdba8594961b
Auto-generated-cl: translation import
2017-04-12 21:31:16 -07:00
Dongwon Kang
2e7f5ce709
TIF: add helper methods for making a channel browsable.
...
Test: build and manually tested with a local app.
Bug: 36395259, Bug: 36097352
Change-Id: I512ed6f4da21af01445fdbcd2f200a681c5dde19
2017-04-12 20:55:22 -07:00
Vladislav Kaznacheev
2679fe4e95
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
...
am: 0964a2d9fc
Change-Id: I800980c3c887dd722410b427b7912b254012effc
2017-04-13 03:47:25 +00:00
TreeHugger Robot
0964a2d9fc
Merge "Revert "Make scrollbarSize in Material Design theme configurable"" into oc-dev
2017-04-13 03:36:30 +00:00
Martijn Coenen
441d61bf16
Add persistentFeature application attribute.
...
This allows us to only mark processes as persistent
when a feature it actually depends on is present on
the device.
Also adds a "android.hardware.nfc.any" feature, to
indicate the device supports any of the NFC features
that require the NFC process to run persistently.
Bug: 36873979
Bug: 37269025
Test: NFC is still started on devices with NFC
Change-Id: I5792d75d8714f39718fa957177a632efcbbd37d3
2017-04-12 17:09:37 -07:00
Christopher Tate
ee3b42af3f
Introduce PACKAGE_FIRST_ADDED broadcast
...
When an app first appears on a device, this new broadcast is issued
including to manifest receivers. The more general PACKAGE_ADDED
broadcast continues to be issued for both first install and updates,
but is not delivered to manifest receivers of apps that target O+.
Bug 37219124
Test: manual
Change-Id: I59b0a0b0dce96a909076b41280771f63e59584be
2017-04-12 16:14:17 -07:00
Jiaquan He
557922d37a
Add a public API defaultFocusHighlightEnabled.
...
am: b7daaf8b5f
Change-Id: I189aea9c495255fe68f5af98a6d33bd87dc79e3e
2017-04-12 22:53:09 +00:00
TreeHugger Robot
18d993bb72
Merge changes from topics 'KeyboardFocusHighlight-oc-dev', 'KeyboardFocusHighlight_ mDefaultFocusHighlightEnabled-oc-dev', 'KeyboardFocusHighlight_ hasFocusStateSpecified-oc-dev' into oc-dev
...
* changes:
Fix broken CTS tests.
Draw a default focus highlight if needed.
Add a public API defaultFocusHighlightEnabled.
Detect unhandled keyboard focused state.
2017-04-12 22:40:15 +00:00
Julius D'souza
f72b1104f3
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET. am: 0a8ecc6886
...
am: f72dd4142b
Change-Id: I9466a9f2a35ac3f81b2203347afc9f2f62587b20
2017-04-12 21:20:50 +00:00
Julius D'souza
f72dd4142b
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
...
am: 0a8ecc6886
Change-Id: I262e7497e9256f708847ba7c767f202c91aa1739
2017-04-12 21:10:49 +00:00
Jason Monk
5881209cac
Merge "Make QS light" into oc-dev
...
am: 755138bb1c
Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
2017-04-12 20:50:32 +00:00
TreeHugger Robot
755138bb1c
Merge "Make QS light" into oc-dev
2017-04-12 20:43:16 +00:00
Julius D'souza
0a8ecc6886
DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
...
Bug: 36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit 8e9ea907448c49f573dd045707e37dd14efdf152)
2017-04-12 12:06:50 -07:00
Svet Ganov
400f10fe50
Merge "Fill UI polish" into oc-dev
...
am: c9a83326c2
Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
2017-04-12 19:03:26 +00:00
TreeHugger Robot
c9a83326c2
Merge "Fill UI polish" into oc-dev
2017-04-12 18:54:32 +00:00
Jiaquan He
b7daaf8b5f
Add a public API defaultFocusHighlightEnabled.
...
This commit adds a public API to turn on/off default
focus highlights. When a focused View is detected to
have no state_focused defined, we can use this API to
decide wether we should show a default highlight for it.
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases
-t android.view.cts.View_DefaultFocusHighlightTest
Bug: 35096940
Change-Id: I76b45d6bf5761641a0ed7f4d0b04cb325ed72b52
2017-04-12 18:23:43 +00:00
TreeHugger Robot
2d1fb47916
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-04-12 18:17:56 +00:00
Vladislav Kaznacheev
f619ead8d3
Revert "Make scrollbarSize in Material Design theme configurable"
...
This reverts commit 98329f4da372e2ab00565b88df785620856cfb65.
Bug: 35432058
Test: android.view.cts.ViewTest passes
Change-Id: I4c76450a47b581a8237108180806845f5f66ac39
2017-04-12 11:16:51 -07:00
Svet Ganov
19ffd1d0a5
Fill UI polish
...
1. Avoid jank when the suggesting list scrolled
2. Remove hard-coded values from max popup height
3. UX requested tweaks
4. Remove dead code
Test: manual
bug:37245055
bug:37179467
Change-Id: I6a6760edb06230e3d4925e23863667cfd3ac0601
2017-04-12 09:53:13 -07:00
Robert Greenwalt
8961810748
Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a am: 03f9a489cb
...
am: 7c1460f388
Change-Id: I3f7e26ff002616ebc642f7358e846e7bf093437c
2017-04-12 15:49:19 +00:00
Robert Greenwalt
7c1460f388
Merge "Adding 20 free short codes for DCB and other purposes" am: 70fea2df2a
...
am: 03f9a489cb
Change-Id: Ic4915213105ba31c63d97187297c652a477e99df
2017-04-12 15:37:53 +00:00
Robert Greenwalt
70fea2df2a
Merge "Adding 20 free short codes for DCB and other purposes"
2017-04-12 15:15:34 +00:00
Philip P. Moltmann
0a87b90e82
Merge "Do not inset autofill highlight" into oc-dev
...
am: ac1c224cdc
Change-Id: I8e37f008c016d25077fe690477422fd4e7422f29
2017-04-12 09:50:07 +00:00
TreeHugger Robot
ac1c224cdc
Merge "Do not inset autofill highlight" into oc-dev
2017-04-12 09:43:11 +00:00
Abodunrinwa Toki
9815cc5783
Merge "Make "Paste as plain text" resource string public." into oc-dev
...
am: 7d4cf66b17
Change-Id: I6be7e69dd5b172215494a2736bb7e91e36d7b09c
2017-04-12 09:17:33 +00:00
Hyunyoung Song
ebcc722b74
Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev
...
am: 264f2e40e2
Change-Id: I702c3b790d6b5c0abb9cbc65cdf4e5bfb2b527d9
2017-04-12 09:12:32 +00:00
TreeHugger Robot
7d4cf66b17
Merge "Make "Paste as plain text" resource string public." into oc-dev
2017-04-12 09:12:23 +00:00
TreeHugger Robot
264f2e40e2
Merge "Change AOSP launcher icon mask Test: manual b/36854903" into oc-dev
2017-04-12 09:02:14 +00:00
Julius D'souza
6717748eff
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev am: 9e3c9eeb96
...
am: 3c6d6f53f3
Change-Id: I4a3785a799a523c1e650929cf70f333a2492377e
2017-04-12 02:01:28 +00:00
Julius D'souza
3c6d6f53f3
Merge "DO NOT MERGE: Add WearDisplayService to the system server; add a SET_DISPLAY_OFFSET permission." into cw-f-dev
...
am: 9e3c9eeb96
Change-Id: Ic97ec1a7e4c5b76bcab8350102585e4dd2cd199b
2017-04-12 01:55:57 +00:00
Conrad Chen
081db81a99
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
...
am: 307bec8572
Change-Id: I3550c39408739e0a3d1fce93cc35b09a3b77d70f
2017-04-12 01:17:00 +00:00
Abodunrinwa Toki
0e65e7346b
Make "Paste as plain text" resource string public.
...
Test: no test
Bug: 37164197
Change-Id: Ia15bd434e1d4ccdf9f1711db3a323c89bc2f96ff
2017-04-12 01:27:09 +01:00
Conrad Chen
307bec8572
Merge "TIF: add TvInputManager methods to notify apps" into oc-dev
2017-04-12 00:25:37 +00:00