Commit Graph

57311 Commits

Author SHA1 Message Date
TreeHugger Robot
41eff9f631 Merge "Add quality preference for Bluetooth developer option" 2019-12-09 06:06:37 +00:00
Raff Tsai
9700435b4d Merge "Fix robolectric test error" 2019-12-09 05:37:25 +00:00
TreeHugger Robot
efa2229556 Merge "Add channel mode preference for Bluetooth developer option" 2019-12-09 05:37:21 +00:00
tim peng
e655695690 Merge "Add bit per sample preference for Bluetooth developer option" 2019-12-09 05:12:12 +00:00
timhypeng
dc05caec4d Add quality preference for Bluetooth developer option
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I025557ec0977a1585cf65bfacc4a01020c9ea19a
2019-12-09 12:55:45 +08:00
Raff Tsai
895b380c10 Fix robolectric test error
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.deviceinfo.storage"
Change-Id: I7d9843ece0e5c6ce2a93af13822e26494e3514b2
2019-12-09 12:38:06 +08:00
timhypeng
4db1f25f3b Add channel mode preference for Bluetooth developer option
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: Iace94d24d8d395366c8fb78863d2fe09ecd0f60d
2019-12-09 12:31:30 +08:00
PO HUNG CHEN
1ff95c6ef0 Merge "Show terms of service before install GSI/DSU" 2019-12-09 03:41:00 +00:00
PO HUNG CHEN
7f244d5163 Merge "Add a GSI/DSU Loader to the developer option." 2019-12-09 03:36:46 +00:00
timhypeng
19f0230520 Add bit per sample preference for Bluetooth developer option
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: Idaf9be96f4e48acf46cbf53ae7f7d100db002c7c
2019-12-09 11:27:10 +08:00
tim peng
d100099ecc Merge "Add codec dialog preference for Bluetooth developer option" 2019-12-09 03:21:47 +00:00
TreeHugger Robot
f5ea10b76e Merge "Add a LiveDataController" 2019-12-09 03:03:47 +00:00
jiabin
5a4e364475 [automerger skipped] Merge "Remove DEVICE_OUT_ALL_SCO." am: ada1f6b10b am: 15d7195311
am: a32c7abcac -s ours
am skip reason: change_id Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade with SHA1 a30a209841 is in history

Change-Id: I0c4f08a5392441dc2d1d4c22689c12924ba080b1
2019-12-06 09:45:43 -08:00
jiabin
a32c7abcac Merge "Remove DEVICE_OUT_ALL_SCO." am: ada1f6b10b
am: 15d7195311

Change-Id: I18beff8ccdd6345cf9a790e4f14f58f56254c438
2019-12-06 09:39:58 -08:00
jiabin
15d7195311 Merge "Remove DEVICE_OUT_ALL_SCO."
am: ada1f6b10b

Change-Id: I01878a3b42900ff55b88e9c01705cd8b753388b5
2019-12-06 09:33:50 -08:00
Treehugger Robot
ada1f6b10b Merge "Remove DEVICE_OUT_ALL_SCO." 2019-12-06 17:26:20 +00:00
Ilya Matyukhin
614ebe3737 Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev am: 95820eb001
am: 39f1a86a3a

Change-Id: I54554d6fa2f643eda21f3be4fb56864e2f1d1f0a
2019-12-06 01:10:15 -08:00
timhypeng
a345cc2ee5 [automerger skipped] Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd
am: edb8dd6140 -s ours
am skip reason: change_id Ifa9a31750b9a926e09aec9262aa89e8de66c91e2 with SHA1 3dd4f2cc19 is in history

Change-Id: I8ef3f7e7084e88f5a853422c004ac702e15136d7
2019-12-06 00:53:39 -08:00
timhypeng
53afa1be33 [automerger skipped] Battery icon is too large am: b6b29c1af0
am: 835fa1fd59 -s ours
am skip reason: change_id I5e165e953682fcfdebf0d06475bb1abd171684d9 with SHA1 c71f996da9 is in history

Change-Id: Id957b953d148fa80439a955966675b0ecc134c49
2019-12-06 00:53:32 -08:00
Sarah Chin
a78de60472 [automerger skipped] Merge "Add NGRAN" am: 4ff75ef786 am: 48388d0949
am: 00649c664e -s ours
am skip reason: change_id I5aae9ea088d8a4625d9c8f6600f7d1bddc8fbf9c with SHA1 721084c310 is in history

Change-Id: Ide0fe52a84c514adf10ff6ad1d2262ded619a6a9
2019-12-06 00:17:22 -08:00
timhypeng
2e5dabf88b Add codec dialog preference for Bluetooth developer option
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I27966cedf915b66e6ce1e4ece2fd854dc21a2841
2019-12-06 15:37:14 +08:00
Stanley Wang
98c64c4086 Merge "Add the item in Language page to dynamic index." 2019-12-06 06:20:48 +00:00
TreeHugger Robot
cdcef1f50c Merge "Wifi Setting: Use SoftApConfiguration for Tether Setting" 2019-12-06 03:29:52 +00:00
Goven Liu
6226188c47 Merge "[Wi-Fi] Add multiple networks request case for adding Wi-Fi for apps feature." 2019-12-06 02:33:25 +00:00
Automerger Merge Worker
39f1a86a3a Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev am: 95820eb001
Change-Id: I4937675c9088f53e1c6f82a55c6422f699f5ce36
2019-12-06 02:10:43 +00:00
Ilya Matyukhin
95820eb001 Merge "Fix "Skip lock screen" not working for secondary user" into qt-qpr1-dev 2019-12-06 01:58:55 +00:00
Kevin Chang
5a71dd4411 Merge "Support accessibility shorcut secondary action (1/n)" 2019-12-06 01:52:28 +00:00
Automerger Merge Worker
edb8dd6140 Merge changes from topic "update_battery_icon" into qt-qpr1-dev am: c08f70b7dd
Change-Id: I73ebb69f6bfcff8c3c09b8768dd48c9124d67594
2019-12-06 01:21:32 +00:00
Automerger Merge Worker
835fa1fd59 Battery icon is too large am: b6b29c1af0
Change-Id: I799cccf2808289b8f080cfa339b3bb35bef2690a
2019-12-06 01:21:24 +00:00
TreeHugger Robot
c08f70b7dd Merge changes from topic "update_battery_icon" into qt-qpr1-dev
* changes:
  Sync dimen from SystemUI
  Battery icon is too large
2019-12-06 01:05:30 +00:00
Alex Lin
d3d2af130b Merge "Add country blacklist support" 2019-12-05 23:37:05 +00:00
jiabin
70858ea40b Remove DEVICE_OUT_ALL_SCO.
Due to the refactor of audio device type, DEVICE_OUT_ALL_SCO has been
removed. Use DEVICE_OUT_BLUETOOTH_SCO_HEADSET for the test instead.

Bug: 135621476
Test: make RunSettingsRoboTests ROBOTEST_FILTER="AudioOutputSwitchPreferenceControllerTest"
Change-Id: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
Merged-In: Ib32f4c313c5d318b6f99e1f0591c98c4c7c82ade
2019-12-05 15:32:32 -08:00
Sarah Chin
00649c664e Merge "Add NGRAN" am: 4ff75ef786
am: 48388d0949

Change-Id: I131d35236c4fab49ea1a407479b7d75718399c62
2019-12-05 13:56:01 -08:00
Sarah Chin
48388d0949 Merge "Add NGRAN"
am: 4ff75ef786

Change-Id: I18dcc1c05ade3e240beb8ca0c2577c7090064bcb
2019-12-05 13:49:10 -08:00
Sarah Chin
4ff75ef786 Merge "Add NGRAN" 2019-12-05 21:37:37 +00:00
Quang Luong
7719c8e3d8 Merge "Add call to WifiEntry.connect() when tapping on WifiEntryPreference" 2019-12-05 21:03:47 +00:00
TreeHugger Robot
1481bb9c93 Merge "Import translations. DO NOT MERGE" 2019-12-05 19:16:48 +00:00
Bill Yi
0cf5208b59 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a90da5ea94 -s ours
am: 615f2311d9 -s ours
am skip reason: subject contains skip directive

Change-Id: I4b353de20d5fb665668e85f802d0e0b53cffe6eb
2019-12-05 10:56:03 -08:00
Automerger Merge Worker
615f2311d9 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a90da5ea94 -s ours
am skip reason: subject contains skip directive

Change-Id: I0abef5f40c0fedbde20e38b7463b4ac88b6f12b2
2019-12-05 18:51:26 +00:00
TreeHugger Robot
a90da5ea94 Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev 2019-12-05 18:33:31 +00:00
Neil Fuller
dc2058e931 Merge "Switch settings to use TimeDetector" am: 5da6521458 am: 72ed7e8f64
am: 5f1c405f30

Change-Id: Iaf7c3fb33f57ada39a8baef016fbc838f633be14
2019-12-05 09:17:42 -08:00
Neil Fuller
5f1c405f30 Merge "Switch settings to use TimeDetector" am: 5da6521458
am: 72ed7e8f64

Change-Id: Ia2f12a24835f83136c9400641992348b69f40270
2019-12-05 09:15:16 -08:00
Neil Fuller
72ed7e8f64 Merge "Switch settings to use TimeDetector"
am: 5da6521458

Change-Id: Ibcdf80e3616fd5f3093fbe2bbe7fd4b26576734e
2019-12-05 09:13:16 -08:00
Neil Fuller
5da6521458 Merge "Switch settings to use TimeDetector" 2019-12-05 17:05:05 +00:00
TreeHugger Robot
1c405e3581 Merge "Fixed the roboletric test failed" 2019-12-05 14:37:17 +00:00
TreeHugger Robot
7090a805b8 Merge "Navigate to work tab if start intent from work profile user" 2019-12-05 13:37:16 +00:00
Sunny Shao
e966714a9b Fixed the roboletric test failed
Fixes: 145730755
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
Change-Id: Ie60985cdf6802e8723c68e5e1f2104965f0d440b
2019-12-05 21:33:34 +08:00
Anna Trostanetski
971cb4f02e Merge "Add descriptions to compat changes." am: fdb5a1ce2a am: d76cef9f7c
am: ba1e18dff9

Change-Id: Ib182f7f77ebd1018e9a6bbfff09e86a2ecb9de79
2019-12-05 04:39:43 -08:00
Anna Trostanetski
ba1e18dff9 Merge "Add descriptions to compat changes." am: fdb5a1ce2a
am: d76cef9f7c

Change-Id: I7eca4097e3c795dab6bd045877ebdc6308bb24d0
2019-12-05 04:36:20 -08:00
Anna Trostanetski
d76cef9f7c Merge "Add descriptions to compat changes."
am: fdb5a1ce2a

Change-Id: I97ba671e7520c8111e31d53764b45cbbefab3e53
2019-12-05 04:31:10 -08:00