Commit Graph

46655 Commits

Author SHA1 Message Date
Doris Ling
ad2d1b91b6 Merge "Do not turn on NFC automatically when airplane mode is off." 2018-06-14 17:11:54 +00:00
TreeHugger Robot
2c31aa6807 Merge "Remove reference to preference_category_material_settings" 2018-06-14 17:06:43 +00:00
TreeHugger Robot
9d08b92afb Merge "Increase the character limit" 2018-06-14 03:09:20 +00:00
TreeHugger Robot
cc10e9c55a Merge "Usage graphs support RTL style." 2018-06-14 02:35:28 +00:00
Android Build Merger (Role)
50b0daf0c8 Merge "[automerger skipped] Merge "Remove internal ApnSetting." am: 4079677883 am: 1fc6859126 -s ours am: 5b255c9cbc -s ours" 2018-06-14 00:25:56 +00:00
TreeHugger Robot
e972a82a5a Merge "Fix crash in ChooseLockGenericFragment." 2018-06-14 00:25:15 +00:00
Pengquan Meng
201b665701 [automerger skipped] Merge "Remove internal ApnSetting." am: 4079677883 am: 1fc6859126 -s ours
am: 5b255c9cbc  -s ours

Change-Id: I84b1b8f943e55a151c25616a766445eb6bb2e5a2
2018-06-13 17:24:31 -07:00
TreeHugger Robot
5c75d0ee59 Merge "Added Keywords for Device Theme" 2018-06-13 23:37:42 +00:00
Pengquan Meng
5b255c9cbc [automerger skipped] Merge "Remove internal ApnSetting." am: 4079677883
am: 1fc6859126  -s ours

Change-Id: Ic6772c2b65d98c78863c5e9b60e7c1ac1cc714cb
2018-06-13 16:19:25 -07:00
Pengquan Meng
1fc6859126 Merge "Remove internal ApnSetting."
am: 4079677883

Change-Id: I130a2038c2c5b289c107d9e640c038965ef60e34
2018-06-13 15:33:56 -07: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

Change-Id: I2b6d82bc9338969cd2d05bf995d89c51c1d7f069
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

Change-Id: I45f7f696e439daf826e717cc1c722237a3eec0c5
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  -s ours

Change-Id: I7df1d799566f9cfef1a94fdc98c2b43c978b1752
2018-06-13 14:36:14 -07:00
Pengquan Meng
4079677883 Merge "Remove internal ApnSetting." 2018-06-13 20:47:13 +00:00
Doris Ling
6776da1cad Do not turn on NFC automatically when airplane mode is off.
- besides checking the value for AIRPLANE_MODE_TOGGLEABLE_RADIOS, also
check the value for AIRPLANE_MODE_RADIOS to determine if we should turn
off NFC when airplane mode is on.
- when user turns off airplane mode, only re-enable the NFC preference
and do not enable NFC by default.
- remove listening to airplane mode directly from the android beam
preference controller, as it is already listening to Nfc state, which
handles the beam state already.

Change-Id: Id41fef15fb2de873729d20d7f53b1a88b164cf95
Fixes: 80217047
Test: make RunSettingsRoboTests
2018-06-13 13:44:15 -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
Antony Sargent
b81953228c Remove reference to preference_category_material_settings
This layout in settingslib has been migrated to the support library's
preference_category_material, so we can just reference that.

Bug: 110037570
Test: manual (format of category headers should look normal in Settings
timezone picker)

Change-Id: I32df326e1d4afd4d7ae6f694c38554f3d0f54e84
2018-06-13 10:35:24 -07:00
yuemingw
b98d538bbe Remove internal ApnSetting.
Remove com.android.internal.telephony.dataconnection.ApnSetting and
use android.telephony.data.ApnSetting instead.

Bug: 77511388
Test: existing test
Change-Id: Idb66b7af22c0531d4ffc324075849abc08667a87
Merged-In: I8ca1fb399026a8ef4ba9afa18678d986daa50606
2018-06-13 13:33:59 +01:00
hughchen
6741ae41a7 Increase the character limit
Increase the character limit to "CHAR LIMIT=NONE" for linguist request,
the "CHAR LIMIT=30" is not enough for translated.

Bug: 110086224
Test: Build pass
Change-Id: Ie6ffe96d94b1fd4ea1137d2b956ff1a6711a103a
2018-06-13 11:09:41 +08:00
Salvador Martinez
04233df504 [automerger skipped] Change UI for wireless AP tether band selection am: acff57fa68
am: 31a33ba6b6  -s ours

Change-Id: Ied6d51a306ac9b7442ee482d16d1ed31f0007b3d
2018-06-12 18:00:12 -07:00
Salvador Martinez
31a33ba6b6 Change UI for wireless AP tether band selection
am: acff57fa68

Change-Id: I47124f2fa50015eca97cee589b4a1f94f43123fd
2018-06-12 17:15:51 -07:00
Doris Ling
06d264de19 Fix crash in ChooseLockGenericFragment.
- in onActivityResult(), the intent data can be null. Check for non null
intent data before trying to read the extra string from the intent.

Change-Id: I14c42725a7885a84688ae39fde63e30ad0536001
Fixes: 109675331
Test: make RunSettingsRoboTests
2018-06-12 16:39:09 -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

Change-Id: I8faf14404a5e59f598cc531a776b53471cb17fce
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  -s ours

Change-Id: I7fe330c63ac16dd515782135e8d7b6f51151ee78
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

Change-Id: I6c958dc1d0c4d87eeafe1855da6455f4185597da
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.

Reason for revert: Crashes settings (b/110075201)

Bug: 110075201
Change-Id: Ie6ea94e0891754f18576bd21447b64410d2fd23a
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  -s ours

Change-Id: Ie6c4a274fae210ca72ed746d430b863a85dca2c7
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

Change-Id: Id889619b77d10826ad0c0eefe494b7aea3a4d779
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
Leo Hsu
2e4f9fe61b Usage graphs support RTL style.
Flips the canvas horizontally before drawing paths under RTL mode.

Bug: 78008951
Test: manually verified graphs of wifi data usage, app data usage, and
battery usage.

Change-Id: I79286e9f3f98632e3a9710d42c3e197231a14c39
2018-06-12 12:48:20 +08: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