Commit Graph

77267 Commits

Author SHA1 Message Date
Betty Chang
13aa43c2f8 Merge "[Testing] Use AndroidJUnit4 instead in telephony/gsm/ test files" 2020-09-08 01:33:51 +00:00
Betty Chang
1cf86d1f76 Merge "[Testing] Use AndroidJUnit4 instead in NrDisabledInDsdsFooterPreferenceControllerTest" am: 645da1dac4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12523485

Change-Id: I4f703d6cf6f72d67e48b9301583df3cf1ce776e2
2020-09-07 10:23:09 +00:00
Betty Chang
645da1dac4 Merge "[Testing] Use AndroidJUnit4 instead in NrDisabledInDsdsFooterPreferenceControllerTest" 2020-09-07 09:34:56 +00:00
Hugh Chen
194dd88e7d Fix settings crash
- This CL before, "Previously connected device" didn't
  handle dock device. If user have disconnected dock
  device will cause Settings crash.

  This CL add condition to handle dock device to avoid crash.
- Update test case.

Bug: 157653997
Bug: 167054620
Test: make -j42 RunSettingsRoboTests
Change-Id: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
Merged-In: I769cee3f589e14a993b00a0ae6ec3ddfba8ef281
2020-09-07 02:59:15 +00:00
Hugh Chen
cb057d6e9e Show just disconnected device on previously connected
- This CL before, previously connected devices will show most
  recently connected devices and the maximum is 3.
  In this time, if next most recently connected device is disconnected.
  It's will not show on "previously connected devices", user needs go to
  "see all" page to found that device.
  This CL add rule to compare the priority of most recently connected
  device. If priority of next disconnected device is higher than
  currnect devices that on "previously connected devices".
  Let next disconnected device show on "previously connected devices".
- Update test case.

Bug: 157653997
Test: make -j42 RunSettingsRoboTests
Change-Id: I684501a20a67755b2196ba9d4b5565add01a5d01
Merged-In: I684501a20a67755b2196ba9d4b5565add01a5d01
2020-09-07 02:59:06 +00:00
Hugh Chen
30a97a9cc5 Display "see all" option when bluetooth is off
- This CL before, Bluetooth settings will hide the "see all"
  option when bluetooth is off. For the UX improvement, this
  CL will show the "see all" button when bluetooth is off. And
  turn on the BT when user press "see all" button to let user to
  quick pair their disconnected devices.
- Update and add test case

Bug: 147150367
Test: make -j42 RunSettingsRoboTests
Change-Id: I7a1451a36a31253b6be2203341bea4e59fed7c2b
Merged-In: I7a1451a36a31253b6be2203341bea4e59fed7c2b
(cherry picked from commit bde100849e)
2020-09-07 02:58:39 +00:00
changbetty
bc7475a08f [Testing] Use AndroidJUnit4 instead in telephony/gsm/ test files
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Change Copy Right
4. Workaround the resource getString to resolve the resource not found

Bug:
Test: atest -c AutoSelectPreferenceControllerTest
      atest -c OpenNetworkSelectPagePreferenceControllerTest
Change-Id: Ic80da4fcc6a64e7fde55705dda128741c26ce3cf
2020-09-07 02:31:30 +00:00
changbetty
ca2e8c8250 [Testing] Use AndroidJUnit4 instead in NrDisabledInDsdsFooterPreferenceControllerTest
1. Use AndroidJunit4 instead of RobolectricTestRunner
2. Use ApplicationProvider instead of RuntimeEnvironment to get context
3. Remove the @Ignore tag in isAvailable_dataOnAndDsdsAnd5GSupported_Available

Bug: 167933210
Test: atest -c NrDisabledInDsdsFooterPreferenceControllerTest
Change-Id: I455a543d7a006be21523918e48cc77b403f8b56d
2020-09-07 09:27:17 +08:00
Betty Chang
6518d34c77 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" am: fd1f4cba36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12355979

Change-Id: If682d52519e37c73801cf8d1a4b31ec2f5bc99ae
2020-09-07 00:51:28 +00:00
Betty Chang
fd1f4cba36 Merge "[Testing] Use AndroidJUnit4 instead in TelephonyBasePreferenceControllerTest" 2020-09-07 00:35:18 +00:00
Bill Yi
f1bf74c6d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: de28bc7c7e -s ours am: 089ac7f7d2 -s ours am: 4050ae795b -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I3d73a9a02c5f988e65074fa376ba574dd7279a48
2020-09-06 20:40:09 +00:00
Bill Yi
e4baec30c5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a -s ours am: 6746ecb1c4 -s ours am: 325cf53ebd -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015

Change-Id: Ia5d899072e682542198de91fe42322ec7bdb0efd
2020-09-06 20:40:04 +00:00
Bill Yi
15d9d5d6a1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: 3f9c81573d -s ours am: 13281b0aeb -s ours am: 3fde685eb3 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: Ifab40cba5029e0152cda7fddb1e97978382f8ec2
2020-09-06 20:39:58 +00:00
Bill Yi
4050ae795b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: de28bc7c7e -s ours am: 089ac7f7d2 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I1f1ea8cbabf3b7da8594e78b3ae2e3302839245f
2020-09-06 20:27:10 +00:00
Bill Yi
325cf53ebd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a -s ours am: 6746ecb1c4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015

Change-Id: I36a1e20fb32a5a3c54deaa1679fb85e865f0e41b
2020-09-06 20:27:05 +00:00
Bill Yi
3fde685eb3 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: 3f9c81573d -s ours am: 13281b0aeb -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I08752f246684e1cd98e937c527a3fe818017ffcf
2020-09-06 20:26:55 +00:00
Bill Yi
089ac7f7d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: de28bc7c7e -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I27f9496735033b8b7d8666ceb7a66e4abeaec921
2020-09-06 20:06:51 +00:00
Bill Yi
6746ecb1c4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d9a2be8b1a -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531015

Change-Id: Iade07158a0cb1462fbe74bfa0a8875179bc5d8bf
2020-09-06 20:06:46 +00:00
Bill Yi
13281b0aeb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours am: 3f9c81573d -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I57d32cce1ab7cb2a9acd576b1564c5dcc8c31777
2020-09-06 20:06:03 +00:00
TreeHugger Robot
279c2e3c21 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 72c4f4c332 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531737

Change-Id: I33fb275d67399f77e3e825ff9435f754cc197a35
2020-09-06 19:53:07 +00:00
Bill Yi
a07d2bb77a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6c0b923be9 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531738

Change-Id: I338d7923f7ce5704f588e50e5872c0d3cf88bb17
2020-09-06 19:52:57 +00:00
Bill Yi
de28bc7c7e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I027479bbfa400ad6bb51b1a64d8b70e0dfb68800
2020-09-06 19:52:48 +00:00
Bill Yi
3f9c81573d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ee8c3875ba -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12531014

Change-Id: I3b5e256b0d5be8922d8716955d1744b140835122
2020-09-06 19:52:05 +00:00
TreeHugger Robot
72c4f4c332 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-06 19:43:44 +00:00
Bill Yi
6c0b923be9 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ide59455cd1b841a223175cc3220d695d485bc9e0
2020-09-06 14:15:37 +00:00
Bill Yi
888bee48da Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ida3e8b455f55d6ef179908c01f2758dbed42e447
2020-09-06 13:40:20 +00:00
Bill Yi
d9a2be8b1a Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idf95416dc8ce50515dd6763c3ae24ebf89722c6a
2020-09-06 13:05:51 +00:00
Bill Yi
ee8c3875ba Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I0eedcd75ce4aca6fffdd86fb7da8b177c01a9696
2020-09-06 12:31:40 +00:00
Treehugger Robot
fb47a8e4db [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours am: 8b2080e7cc -s ours am: 002c5b1143 -s ours am: bcb6d4f444 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393

Change-Id: I66c7a7a33149c119a6d9e824d35a31d738fbbe60
2020-09-05 20:18:12 +00:00
Treehugger Robot
bcb6d4f444 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours am: 8b2080e7cc -s ours am: 002c5b1143 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393

Change-Id: If9d62d8e22ba63fd8254be2ea75386aa5403f7a3
2020-09-05 19:58:39 +00:00
Treehugger Robot
002c5b1143 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours am: 8b2080e7cc -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393

Change-Id: I69831a3612d01d0447f5a75426cce5b6f2f846a6
2020-09-05 19:43:50 +00:00
Treehugger Robot
8b2080e7cc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours am: f75d48d9f8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393

Change-Id: Ieac8fcc9f4209d6682556ba2dd89f0191d138ffe
2020-09-05 19:31:31 +00:00
Treehugger Robot
f75d48d9f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours am: ada75ad54d -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393

Change-Id: I8d01018b9590b293954df3c7690477b99ee72e4e
2020-09-05 18:56:42 +00:00
Treehugger Robot
ada75ad54d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 681beda2f8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420393

Change-Id: I7972af3db5cb995b4a7c4deb982eeef6c3dddaad
2020-09-05 18:44:03 +00:00
Treehugger Robot
681beda2f8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-05 18:32:54 +00:00
Treehugger Robot
81d6469601 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours am: 966f8a889b -s ours am: 3867542239 -s ours am: f85d3b3f5f -s ours am: 42c86c42f1 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390

Change-Id: Ib939f9ca94867eaafaacc127a4f0f5aab36241cc
2020-09-05 15:59:56 +00:00
Treehugger Robot
9cff47fcce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours am: a2329d7450 -s ours am: 1db92597d7 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392

Change-Id: I3af44ec28ab861a1c6f46996ef2b10d40f045ef6
2020-09-05 15:59:49 +00:00
Treehugger Robot
f2ad5e2642 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours am: 701ea4dff8 -s ours am: 9e06009c51 -s ours am: 2050052fc5 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389

Change-Id: I8b45cf572d614f16af6219ed35e4d618d83ba466
2020-09-05 15:59:42 +00:00
Treehugger Robot
42c86c42f1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours am: 966f8a889b -s ours am: 3867542239 -s ours am: f85d3b3f5f -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390

Change-Id: I5b9224e9efa903b8d9c06a063b7b8b71ef4ffd2b
2020-09-05 15:45:26 +00:00
Treehugger Robot
1db92597d7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours am: a2329d7450 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392

Change-Id: I9ae7fa453ca40f688b62c9724a78499d9245efba
2020-09-05 15:45:20 +00:00
Treehugger Robot
2050052fc5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours am: 701ea4dff8 -s ours am: 9e06009c51 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389

Change-Id: I125b6da60d5b666da7614460a0cef1df213dd2c4
2020-09-05 15:44:38 +00:00
Treehugger Robot
f85d3b3f5f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours am: 966f8a889b -s ours am: 3867542239 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390

Change-Id: I0e2e4d7c4fbab1d836706528b665b2db9d21cf21
2020-09-05 15:29:00 +00:00
Treehugger Robot
a2329d7450 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours am: 52b60555b5 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392

Change-Id: I4f9a4a3b1daa382df98a7e59d99137767835c2a2
2020-09-05 15:28:54 +00:00
Treehugger Robot
9e06009c51 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours am: 701ea4dff8 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389

Change-Id: I29b4a1f22c5f3b566d49c5d3e2ac263edf31348e
2020-09-05 15:28:35 +00:00
Treehugger Robot
3867542239 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours am: 966f8a889b -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390

Change-Id: I5eed324de754c4ab34a26002ce1ca122dde916f0
2020-09-05 15:17:20 +00:00
Treehugger Robot
52b60555b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours am: 2d241c544d -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392

Change-Id: I044f323df73102f23202d6d2b3e70333fa2ef6d4
2020-09-05 15:17:13 +00:00
Treehugger Robot
701ea4dff8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours am: d1b40cfb18 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389

Change-Id: I1b8b1e30adb80b033f5491a099e257fc522434ee
2020-09-05 15:17:00 +00:00
Treehugger Robot
966f8a889b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: e30450cd68 -s ours am: 0749b2e5b1 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420390

Change-Id: Ifeeb5b1ed6feed0931e8b486485ab03cf1d37555
2020-09-05 15:02:28 +00:00
Treehugger Robot
2d241c544d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 992e9bc161 -s ours am: a4bfe8a50f -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420392

Change-Id: Id8aea55919ca80fb40dc091d3325889f08fbc926
2020-09-05 15:02:22 +00:00
Treehugger Robot
d1b40cfb18 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 88fe7c9897 -s ours am: 809f01fc74 -s ours
am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1420389

Change-Id: I55ff3c61ba1febe39d468c0a59cd558dd08ed677
2020-09-05 15:02:05 +00:00