Commit Graph

58043 Commits

Author SHA1 Message Date
Bonian Chen
f980a2985a [Settings] Code refactor
Code refactor.

Bug: 146985715
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=AirplaneModePreferenceControllerTest
Change-Id: I3ecc85f0f4ae1a0164a88bf811fe4c865d517d03
2019-12-30 11:24:58 +08:00
TreeHugger Robot
5900c5a6ac Merge "Use flag to confirm whether callback should unregister" 2019-12-30 02:39:03 +00:00
Bonian Chen
b14af41430 [Settings] Correct spelling in source code
Rename mSubsciptionsMonitor into mSubscriptionMonitor.

Test: build pass
Change-Id: Ib0444c61fbe4238f743bf83f6ff96656be433c9d
2019-12-30 10:27:57 +08:00
Automerger Merge Worker
2951e4eddf [automerger skipped] Import translations. DO NOT MERGE am: 7369a964a2 -s ours am: 60bcb71b58 -s ours
am skip reason: subject contains skip directive

Change-Id: I319f38b746ccc1a679a156544c5df65bc73920cb
2019-12-30 00:10:02 +00:00
Automerger Merge Worker
60bcb71b58 [automerger skipped] Import translations. DO NOT MERGE am: 7369a964a2 -s ours
am skip reason: subject contains skip directive

Change-Id: Idc4419449dcd445230b9905565ba699013ac632f
2019-12-29 23:56:52 +00:00
Bill Yi
7369a964a2 Import translations. DO NOT MERGE
Change-Id: I450573e52646e40a777bc10ddd4afa56458f5f18
Auto-generated-cl: translation import
2019-12-28 20:54:14 -08:00
Automerger Merge Worker
96453ec9d9 [automerger skipped] Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev am: f9f41df89a -s ours am: 5b01a22369 -s ours
am skip reason: Change-Id Id62a2bf4b2c44efcd48319734d1cab6ed969ee06 with SHA-1 b7633cc59d is in history

Change-Id: I61ae93fbf17743d9f23ea71a1a5056b872663238
2019-12-27 19:02:41 +00:00
Automerger Merge Worker
5b01a22369 [automerger skipped] Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev am: f9f41df89a -s ours
am skip reason: Change-Id Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c with SHA-1 be5216cacb is in history

Change-Id: Icb018b000b85680699bf2f56568cf4e97ffd90b2
2019-12-27 18:44:34 +00:00
TreeHugger Robot
082a9de20f Merge "Enlarge height of Edit box in "Profile info" dialog" 2019-12-27 18:30:35 +00:00
TreeHugger Robot
605759721c Merge "Settings: Increase char limit of show refresh rate" 2019-12-27 18:27:05 +00:00
SongFerng Wang
f9f41df89a Merge "Phone Info UI shows network type list which depends on RAT supported" into qt-qpr1-dev 2019-12-27 18:26:49 +00:00
Arc Wang
b0e9d44478 [Wi-Fi] Support intent extra "wifi_start_connect_ssid" in WifiSettings2
This is a similar code merge of ag/575560 & ag/2588374

Bug: 143328194
Test: manual
      Connect to a Wi-Fi network with wrong network.
      Click the fail notification and launch Wi-Fi picker.
      Check if the editor shows the specified Wi-Fi network.

Change-Id: I5bc8cd0ea51e7baf3d6d2d6d522a3973b74ef930
2019-12-27 14:11:36 +00:00
Arc Wang
46721efd99 [Wi-Fi] Support intent extra "wifi_enable_next_on_connect" in WifiSettings2
This is a similar code merge of ag/489459.

Bug: 143328194
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2Test
Change-Id: I666b3293f00aa1822a6fdcc3760ae19d27019597
2019-12-27 14:10:24 +00:00
TreeHugger Robot
19747ba32a Merge "[Wi-Fi] Apply WifiDialog2 in WifiSetings2" 2019-12-27 09:18:57 +00:00
Lee Chou
1c5f319f3c Changed reference of telecom.Log to util.Log
Bug: 146912511
Test: make and test manually
Change-Id: Ibc077c71c6181cf7724279fd73e4370aaf8fefa1
2019-12-27 17:12:18 +08:00
TreeHugger Robot
fb54889efc Merge "[Wi-Fi] Replace AccessPoint with WifiEntry for WifiDialog2" 2019-12-27 08:47:36 +00:00
TreeHugger Robot
8b5d71396e Merge "Modify NFC function description" 2019-12-27 08:11:28 +00:00
TreeHugger Robot
b897eb8551 Merge "[Wi-Fi] Branch WifiDialog files for WifiTracker2 development" 2019-12-27 07:42:52 +00:00
Edgar Wang
9a2d348aa0 Enlarge height of Edit box in "Profile info" dialog
Fixes: 140002880
Test: manual
Change-Id: If9f8c3f4360e886cfecabc3eb8c1a6da452f45d2
2019-12-27 15:35:34 +08:00
SongFerngWang
75c5940b7c Phone Info UI shows network type list which depends on RAT supported
Phone Info UI shows preferred network type list which depends on
device RAT supported. If device is 5G supported, UI shows 5G list.
If device is not 5G supported, UI shows LTE list.

Bug: 146504601
Test: 1.Build pass.
2. go to Phone Info UI, and set preferred network type (PASS)

Change-Id: I079d40b4ed593dd6629caf96ca8a94aaf69e9f04
Merged-In: Id32982fe3e6fbf686fafe94ecc6c8549c7a5243c
Merged-In: Id62a2bf4b2c44efcd48319734d1cab6ed969ee06
2019-12-27 07:02:39 +00:00
Jason Chiu
b2639ad11f Merge "Fix the ripple effect of homepage slice cards" 2019-12-27 04:03:19 +00:00
TreeHugger Robot
dcf4dcae2f Merge "Settings: fix ShowRefreshRatePreferenceControllerTest" 2019-12-27 03:55:23 +00:00
Automerger Merge Worker
261b991169 Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2 am: cd46f2df4f
Change-Id: If269602bf8b34b08fcc9bf9bedd3b47219134e3e
2019-12-27 03:13:18 +00:00
TreeHugger Robot
08bd74c59c Merge "Finish bluetooth detail fragment if device is BOND_NONE" 2019-12-27 03:03:49 +00:00
Automerger Merge Worker
cd46f2df4f Merge "[Settings] Replace getSimCount() API" am: b0bddfec15 am: 92f25fadd2
Change-Id: I709109c86262dcc6886ccd2dbccf84fbc7188650
2019-12-27 02:58:25 +00:00
Bonian Chen
92f25fadd2 Merge "[Settings] Replace getSimCount() API"
am: b0bddfec15

Change-Id: Ic3ddc7317f92b3d61b841aaa476e2bd734044796
2019-12-26 18:48:55 -08:00
Bonian Chen
b0bddfec15 Merge "[Settings] Replace getSimCount() API" 2019-12-27 02:45:42 +00:00
Menghan Li
7cbba20eec Merge "Fix CodeInspectionTest for CaptionPropertiesFragment" 2019-12-27 02:32:13 +00:00
Ady Abraham
68aacdd487 Settings: Increase char limit of show refresh rate
Increase the char limit for the developer option "show refresh rate"
to accommodate translations.

Bug: 146766957
Bug: 146766391
Change-Id: I324356278a31551db6da74ef0eb09068d36122b2
Test: Set a 36 char string on "show_refresh_rate" and observe no truncation
Test: Set a 58 char string on "show_refresh_rate_summary" and observe no truncation
2019-12-26 20:03:03 +00:00
Ady Abraham
21eaa773f5 Settings: fix ShowRefreshRatePreferenceControllerTest
ShowRefreshRatePreferenceControllerTest is using an incorrect type
(Int vs. Bool) which causing a test to fail.

Bug: 146767072
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.development
Change-Id: I9269c01619eebac9c0eac29e23f248d1c6d48ba5
2019-12-26 19:39:32 +00:00
TreeHugger Robot
e780606358 Merge "[DPP R2] Update ACTION_PROCESS_WIFI_EASY_CONNECT_URI intent" 2019-12-26 19:19:54 +00:00
Automerger Merge Worker
29f5c3bb20 [automerger skipped] Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08 am: a58c7ba27a -s ours
am skip reason: Change-Id I8a1819b70a8d4ec56ae40f2b8b613bcd65a12b11 with SHA-1 e9c59f5fad is in history

Change-Id: I71bf1676d977129c86feb2200d44e83c98772663
2019-12-26 14:26:56 +00:00
Automerger Merge Worker
a58c7ba27a Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" am: e8cf63ddd3 am: 8ead010c08
Change-Id: I558dad7bbc41bc1dc30a72665da0d96e263e67ed
2019-12-26 14:15:29 +00:00
Zoey Chen
8ead010c08 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState"
am: e8cf63ddd3

Change-Id: I1bd0fc19e4150e26ebd2418b0c2b3b7dca41e605
2019-12-26 06:01:41 -08:00
Zoey Chen
e8cf63ddd3 Merge "[Settings] Replace #getServiceStateForSubscriber with #getServiceState" 2019-12-26 13:44:58 +00:00
Jason Hsu
24af3f4c81 Merge "Accessibility shortcut secondary action - divide different fragment for different fragment type" 2019-12-26 13:42:17 +00:00
Automerger Merge Worker
252553c07c [automerger skipped] Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c am: b206208982 -s ours
am skip reason: Change-Id Idec4b7ed362a3be0693fa9670ecb2aba7c7fd1d1 with SHA-1 353926a446 is in history

Change-Id: Ie12e64a32b2c403151f7dab6406ac80967a2e206
2019-12-26 13:26:53 +00:00
Automerger Merge Worker
b206208982 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" am: 47634431c6 am: 4359db040c
Change-Id: I2489531d3b940c6de8ad0805fc138a66b1607ba2
2019-12-26 13:11:36 +00:00
Zoey Chen
4359db040c Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()"
am: 47634431c6

Change-Id: I6ff3a75a9455059835ca5f9d9776ee724ccf3122
2019-12-26 05:02:24 -08:00
TreeHugger Robot
cdae626f2a Merge "Fix failed tests on ResetPreferenceControllerTest" 2019-12-26 13:01:58 +00:00
menghanli
4a1617e44f Fix CodeInspectionTest for CaptionPropertiesFragment
Bug: 146883790
Test: make RunSettingsRoboTests2
Change-Id: I387149fa720c9c98291c00c63f99dc4d838c06aa
2019-12-26 20:56:14 +08:00
TreeHugger Robot
31a8699e77 Merge "Remove un-used category from Date & Time Settings" 2019-12-26 12:04:37 +00:00
robertluo
91751f8d68 Modify NFC function description
Fixes: 140156062
Test: manually and check if new string is applied
Screenshot: https://screenshot.googleplex.com/SQH204CZBVN.png

Change-Id: Ie1eb2387f8763f77aaf87a93c14b4d8d778ac7ee
2019-12-26 12:04:01 +00:00
Zoey Chen
47634431c6 Merge "[Settings] Replace #getSubscriberId(I) with #getSubscriberId()" 2019-12-26 12:01:22 +00:00
Automerger Merge Worker
aad8fd1e57 Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28 am: 9494af9634
Change-Id: I283ca8f4b4183ecbd894fa0b36cd4c35335ba6ac
2019-12-26 11:57:42 +00:00
Automerger Merge Worker
9494af9634 Merge "Modify 5G RAT into Bearer field." am: 79977fadca am: 7664d08e28
Change-Id: I5410a38cf933c4f661731d2a810b5e7a00637763
2019-12-26 11:46:46 +00:00
Jason Chiu
b1cac8303c Fix failed tests on ResetPreferenceControllerTest
Should config shadow ShadowUserManager before using it

Fixes: 146881352
Test: robotest
Change-Id: I1ef33a8ee3c8c98eef2e3e257b7da81a9264783f
2019-12-26 19:45:44 +08:00
Daniel Huang
7664d08e28 Merge "Modify 5G RAT into Bearer field."
am: 79977fadca

Change-Id: Ie14628c1795dbd02393ef901a0fd7a699a9eba93
2019-12-26 03:32:40 -08:00
Daniel Huang
79977fadca Merge "Modify 5G RAT into Bearer field." 2019-12-26 11:29:13 +00:00
Bonian Chen
b373aeedfe [Settings] Replace getSimCount() API
Change design of monitor change in Settings.Global.MOBILE_DATA and
Settings.Global.DATA_ROAMING in order to avoid from accessing
getSimCount().

Bug: 144251589
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=RoamingPreferenceControllerTest
Change-Id: If50c57e7c1b27f9a0baf2bd46cc0930e0a0be2bd
2019-12-26 19:02:57 +08:00