tim peng
ea1106494d
Merge "Add codec dialog preference controller for Bluetooth developer option"
2019-12-10 02:49:17 +00:00
Arc Wang
220936ad7a
Merge "[Wi-Fi] Fix transition mode problems"
2019-12-10 02:43:13 +00:00
TreeHugger Robot
821db5c036
Merge "Add sample rate preference for Bluetooth developer option"
2019-12-10 01:42:16 +00:00
Xiangyu/Malcolm Chen
1d8158fc0b
Merge "Add disable pSIM option in Settings"
2019-12-09 22:30:06 +00:00
TreeHugger Robot
1fe113d922
Merge "Raise string length limits per linguist's requests"
2019-12-09 19:32:27 +00:00
Howard Chen
c542c01672
Fix flame boot failure
...
Bug: 145890923
Test: Compile
Change-Id: I8fe011a471fe92006d153ed531c19abd3b02fb05
2019-12-09 20:53:59 +08:00
Bonian Chen
28227a3117
Merge "[Settings] Fix crash when no SIM"
2019-12-09 10:29:22 +00:00
TreeHugger Robot
41eff9f631
Merge "Add quality preference for Bluetooth developer option"
2019-12-09 06:06:37 +00:00
Bonian Chen
8a512ca7b4
[Settings] Fix crash when no SIM
...
Airplane mode enabler exception under the condition of
no active subscription. This is due to incorrect null pointer
checking within source code.
Bug: 145830780
Test: manual
Change-Id: I47cb4d82b7b99b4c34270023cd58f479347477da
2019-12-09 13:39:27 +08: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
timhypeng
8e2aa11e3a
Add codec dialog preference controller for Bluetooth developer option
...
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I5cff61f9f90d9e6a125455685a3608be043f6e7c
2019-12-09 13:14:58 +08:00
tim peng
e655695690
Merge "Add bit per sample preference for Bluetooth developer option"
2019-12-09 05:12:12 +00:00
timhypeng
588a1ca250
Add sample rate preference for Bluetooth developer option
...
Bug: 142227996
Test: make -j50 RunSettingsRoboTests
Change-Id: I5cae9498082d1839add63d2bc01e29639a0c20ee
2019-12-09 13:10:28 +08: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
Malcolm Chen
e5dcd02f4c
Add disable pSIM option in Settings
...
As we start disabling pSIM option in R, we check that if the feature is
supported, add the "Use SIM" toggle back to pSIM page.
Bug: 141018421
Test: manual test
Change-Id: I1af497ce5ede93f823825718b8136ff8ae0ab49c
2019-12-06 13:20:06 -08:00
Victor Hsieh
1ab2c789f4
Raise string length limits per linguist's requests
...
Test: build
Bug: 145711825
Bug: 145716674
Bug: 145716707
Bug: 145716705
Change-Id: Idfc5943b3b1d5476f921e303a0088618eebcaeb6
2019-12-06 13:16:43 -08: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
Arc Wang
5f23a43660
[Wi-Fi] Fix transition mode problems
...
Replace SECURITY_PSK_SAE_TRANSITION & SECURITY_OWE_TRANSITION with
AccessPpoint#isPskSaeTransitionMode() &
AccessPpoint#isPskOweTransitionMode()
Bug: 144320676
Bug: 144320649
Bug: 144325162
Bug: 144321574
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.wifi
Change-Id: Ic3c7ac1238a51b6e215ed63761720d2bc371d012
2019-12-06 18:17:07 +08: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