TreeHugger Robot
5c75d0ee59
Merge "Added Keywords for Device Theme"
2018-06-13 23:37:42 +00:00
Android Build Merger (Role)
4f8a306536
[automerger] Change UI for wireless AP tether band selection am: acff57fa68 am: 389368a241
...
Change-Id: I1a9420f23fe2823d135b2e16f936bc97e41b6487
2018-06-13 21:38:58 +00:00
Salvador Martinez
389368a241
Change UI for wireless AP tether band selection
...
am: acff57fa68
2018-06-13 14:38:42 -07:00
Android Build Merger (Role)
797fc68a98
[automerger skipped] Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev am: 5cb6b79400 skipped: 22df4f43a5
...
Change-Id: I748adb663cdf251edffce05268813cf9e1f79a44
2018-06-13 21:38:01 +00:00
Artem Iglikov
22df4f43a5
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
...
am: 5cb6b79400
2018-06-13 14:37:40 -07:00
Android Build Merger (Role)
dd802f7c3c
[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev am: 2ffa711cd1 -s ours skipped: 3a5859779a
...
Change-Id: I7bfd420524778f682d1836ca21c49361e5330ae7
2018-06-13 21:36:42 +00:00
Ivan Chiang
3a5859779a
[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev
...
am: 2ffa711cd1
2018-06-13 14:36:14 -07:00
TreeHugger Robot
03460fc7e2
Merge "Fix back stack didn't perserved when Files Activity launched by Setting storage then back case."
2018-06-13 18:10:24 +00:00
Andre Garivay
bbf104b17d
Added Keywords for Device Theme
...
Added 'dark theme' as keyword for Device Theme setting.
Change-Id: Ib7b1d322f3451c6502d9d8c3cf28eb56bae08e58
Fixes: 110103985
Test: UI
2018-06-13 18:01:48 +00:00
Salvador Martinez
04233df504
[automerger skipped] Change UI for wireless AP tether band selection am: acff57fa68
...
am: 31a33ba6b6
2018-06-12 18:00:12 -07:00
Salvador Martinez
31a33ba6b6
Change UI for wireless AP tether band selection
...
am: acff57fa68
2018-06-12 17:15:51 -07:00
TreeHugger Robot
7a1d3d9f56
Merge "Add padding between battery text and icon"
2018-06-12 23:32:26 +00:00
Salvador Martinez
acff57fa68
Change UI for wireless AP tether band selection
...
We decided to use the list preference after all due to
some devices not supporting various combinations of AP
configurations. This change makes it so that there are
three different UIs depending on the configurations
which are supported.
- 5.0 GHz unsupported: disable the preference and just
set the value to 2.4 GHz
- all supported, no dual mode: allow the user to choose
EITHER 2.4 GHz or 5.0 GHz
- all supported, dual mode: allow the user to choose
2.4 GHz or BOTH 2.4 GHz & 5.0 GHz with 5.0 being
preferred
Test: atest SettingsRoboTests
Bug: 80315296
Change-Id: I888d35811a98b8cf0155a3cb96c42ff762763378
Merged-In: I888d35811a98b8cf0155a3cb96c42ff762763378
2018-06-12 22:59:28 +00:00
yuemingw
ff2da57804
Remove internal ApnSetting.
...
am: ff73564ea0
2018-06-12 15:55:42 -07:00
TreeHugger Robot
040faac1d0
Merge "Consolidate the 2 app button prefernece controllers."
2018-06-12 22:44:54 +00:00
TreeHugger Robot
cc7c1418cc
Merge "Hide quicksetting tile for dev options when it's turned off"
2018-06-12 21:58:33 +00:00
Doris Ling
2511d108ed
Consolidate the 2 app button prefernece controllers.
...
- move the fuelgauge app button controller and the button dialog
fragment into app info package and change app detail fragment to use
that controller instead.
- remove the original appinfo/AppActionButtonPreferenceController
Change-Id: I94ca072a8dfe6051853eb23efa1f96ac3e13d79d
Fixes: 80312809
Test: make RunSettingsRoboTests
2018-06-12 13:43:25 -07:00
Fan Zhang
63767d2b97
Hide quicksetting tile for dev options when it's turned off
...
Change-Id: I3e11700a59c8a88bb586c77a876963b5e6a62c89
Fixes: 78652607
Test: robotests
2018-06-12 12:32:01 -07:00
TreeHugger Robot
16525f1090
Merge "To show hearing aids device in the available devices group"
2018-06-12 17:03:12 +00:00
Irina Dumitrescu
addc82e454
Clean up KeyStore exception warning caused by adding a new VPN.
...
Bug:109791294
Test: manually navigate to settings and click the + button in VPN.
Change-Id: Ib94778ef3fdab0fc8147477b91f644c54dc04c24
2018-06-12 17:22:12 +01:00
yuemingw
ff73564ea0
Remove internal ApnSetting.
...
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.
Bug: 77511388
Test: existing test
Change-Id: I8ca1fb399026a8ef4ba9afa18678d986daa50606
2018-06-12 15:59:24 +00:00
Artem Iglikov
a5711f1bc6
[automerger skipped] Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev am: 5cb6b79400
...
am: 270c692e7f
2018-06-12 06:37:39 -07:00
Artem Iglikov
270c692e7f
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
...
am: 5cb6b79400
2018-06-12 06:35:19 -07:00
TreeHugger Robot
5cb6b79400
Merge "DO NOT MERGE Revert "Fix gray out previously connected device preference issue"" into pi-dev
2018-06-12 12:47:36 +00:00
Artem Iglikov
ca85cc9d27
DO NOT MERGE Revert "Fix gray out previously connected device preference issue"
...
This reverts commit 95abf59af4
2018-06-12 11:55:31 +00:00
Ivan Chiang
43a0a845b4
[automerger skipped] Merge "Fix gray out previously connected device preference issue" into pi-dev am: 2ffa711cd1
...
am: d718f4bb8b
2018-06-12 04:04:27 -07:00
timhypeng
1c21bff103
To show hearing aids device in the available devices group
...
Bug: 79553082
Test: make -j50 RunSettingsRoboTests
Change-Id: I8fe5eb653d332ef5ac4a566146f150774581167c
2018-06-12 17:52:21 +08:00
Ivan Chiang
d718f4bb8b
Merge "Fix gray out previously connected device preference issue" into pi-dev
...
am: 2ffa711cd1
2018-06-12 01:20:56 -07:00
TreeHugger Robot
2ffa711cd1
Merge "Fix gray out previously connected device preference issue" into pi-dev
2018-06-12 07:34:15 +00:00
lumark
9e25726593
Fix back stack didn't perserved when Files Activity launched by Setting storage then back case.
...
Due to FilesActivity set "android:documentLaunchMode="intoExisting", it will create
new task when launched from Storage Setting page.
When select FilesActivity task from recents & press back key, it will not back
to settings page.
Using startActivityForResult to set task as source task can fix task separated case.
Change-Id: I26362928261a1a9c0e485a486be493423d1fcf61
Fixes: 33117269
Test: Manual
Test: atest StorageItemPreferenceControllerTest
2018-06-12 11:21:45 +08:00
TreeHugger Robot
f817b1e3a5
Merge "Misc clean up. move widgets from graph to widget package."
2018-06-12 01:01:32 +00:00
TreeHugger Robot
d716f0b216
Merge "Suppress "see all" from settings search."
2018-06-12 00:50:27 +00:00
TreeHugger Robot
410c7ddcf7
Merge "Add a switchbar to turn off multi-user feature entirely"
2018-06-11 23:59:18 +00:00
Fan Zhang
670ce333ae
Misc clean up. move widgets from graph to widget package.
...
Bug: n/a
Test: robotests, rebuild
Change-Id: I910f355312d52e81a0bf57b46a3f267e1eb9882a
2018-06-11 16:05:12 -07:00
TreeHugger Robot
58a3d0c67d
Merge "Remove DataSummaryUsageLegacy."
2018-06-11 22:51:13 +00:00
Fan Zhang
c8f021a288
Suppress "see all" from settings search.
...
Bug: 109894919
Test: reindex search
Change-Id: I009c5d2f366af402dcbfd2eb75b56bfcbb9217a6
2018-06-11 15:35:03 -07:00
Fan Zhang
c39238c63f
Add a switchbar to turn off multi-user feature entirely
...
Change-Id: Ibf88bf37899af5065c68aeb2337acd4ee48bc13c
Fixes: 72319180
Test: robotest on new controller. Manual test on UserSettings fragment.
2018-06-11 15:00:08 -07:00
jackqdyulei
6244b5d0aa
Add padding between battery text and icon
...
Change-Id: I4625ae6168278f7e69e9e26ed9c12958645e920e
Fixes: 80281413
Test: Screenshot
2018-06-11 14:37:50 -07:00
TreeHugger Robot
1dd1bdf8bf
Merge "Handle usageevents for work profile apps"
2018-06-11 20:53:33 +00:00
Fan Zhang
48cdfcb32e
Skip device index job if caller is not Settings app. am: 9ecf3e0c11
...
am: 251c324646
2018-06-11 12:26:03 -07:00
Fan Zhang
251c324646
Skip device index job if caller is not Settings app.
...
am: 9ecf3e0c11
2018-06-11 11:40:07 -07:00
Fan Zhang
4f641b5f37
Skip device index job if caller is not Settings app.
...
am: 9ecf3e0c11
2018-06-11 11:39:06 -07:00
Julia Reynolds
cb691873fd
Handle usageevents for work profile apps
...
Test: robotests
Change-Id: Ifdc6e456d76614220b2052e6ca8a8f3676d0e2ee
Fixes: 79142791
2018-06-11 14:23:51 -04:00
Fan Zhang
cd21cb8def
Remove DataSummaryUsageLegacy.
...
Change-Id: I8da039530cafe547008b434b6016add5f9383e94
Fixes: 109943959
Test: robotest/atest
2018-06-11 11:05:54 -07:00
TreeHugger Robot
6610e7ff92
Merge "Remove references to SettingsBase styles"
2018-06-11 18:05:32 +00:00
Fan Zhang
9ecf3e0c11
Skip device index job if caller is not Settings app.
...
Change-Id: I96184f111e83477b46ddf321ec74917bab330048
Fixes: 80437512
Fixes: 109713077
Test: robotests
(cherry picked from commit 74ba1a51d7
2018-06-11 15:54:36 +00:00
Beverly
756e3b6caf
Add summary to PreventRingingParent
...
Parent preference previously didn't have a summary
Moved summary test to PreventRingingParentPreferenceControllerTest
Test: PreventRingingParentPreferenceControllerTest.java
Change-Id: I2891e1ccffc4ea8007c8bd25689f242ee34c652c
2018-06-11 10:45:34 -04:00
TreeHugger Robot
ddd9283ee0
Merge "Change the string"
2018-06-11 03:39:19 +00:00
Xin Li
cdde5166e5
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master am: 44de687b93
...
am: 5a0817ce57
2018-06-09 06:52:22 -07:00
Xin Li
5a0817ce57
Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
...
am: 44de687b93
2018-06-09 03:23:12 -07:00
