Commit Graph

76208 Commits

Author SHA1 Message Date
Bill Yi
3d905a7195 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours am: b7e58c608f -s ours am: ab4566a889 -s ours am: cf1ce08bfa -s ours
am skip reason: subject contains skip directive

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

Change-Id: I237fb4ba90a060bc9cbe284c69f66cd4fff4c0da
2020-08-31 16:51:39 +00:00
Bill Yi
80f8df9906 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 361d4a214c -s ours am: 94734fdd58 -s ours am: c973cf476f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifdde0fcaa4997064681cf0a8e8c8f3a7523a965f
2020-08-31 16:51:31 +00:00
Bill Yi
cf1ce08bfa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours am: b7e58c608f -s ours am: ab4566a889 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I858bf2ef9fcfd49639e6dc1f9561a709917e3b7e
2020-08-31 16:18:39 +00:00
Bill Yi
ab4566a889 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours am: b7e58c608f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7f146486d561d1b05208dbeba2e81829dfca2bb2
2020-08-31 16:12:52 +00:00
Bill Yi
c973cf476f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 361d4a214c -s ours am: 94734fdd58 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ica8ac1a2fd55e9b1dc3153951be7022cea354f26
2020-08-31 16:12:48 +00:00
Bill Yi
94734fdd58 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 361d4a214c -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iad265cf241d09152390251328e2025e35965581a
2020-08-31 15:26:25 +00:00
Bill Yi
b7e58c608f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4249bd150a1c76528ad511c9b8954debac3857d4
2020-08-31 15:26:21 +00:00
Bill Yi
361d4a214c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Icde96a03193c5c91d61dd9354bc4c34d8b53e5be
2020-08-31 13:49:23 +00:00
Bill Yi
09cc09a274 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Idc7c40c329d18ea4bd4061eb37b4672b71a2ce17
2020-08-31 13:11:17 +00:00
TreeHugger Robot
798df295e7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 3879921527 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibb070850cfe76351cddaa2a39641d132904aa498
2020-08-28 23:31:29 +00:00
TreeHugger Robot
3879921527 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-28 23:09:46 +00:00
Bill Yi
3b0a55d898 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ec2203413a44b471a3de7497db2ea9ffe9e08ec
2020-08-28 16:04:37 +00:00
SongFerngWang
286d207e45 [automerger skipped] Fix NullPointerException, TelephonyManager.getServiceState is null am: a12327b5f3 am: 34f35aff90 -s ours am: 5b0d1aeaff -s ours
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 09dc253a47 is in history

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

Change-Id: Ie16d425d83560153caa2740b13a62fa495d3fc1c
2020-08-28 11:52:02 +00:00
SongFerngWang
5b0d1aeaff [automerger skipped] Fix NullPointerException, TelephonyManager.getServiceState is null am: a12327b5f3 am: 34f35aff90 -s ours
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 09dc253a47 is in history

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

Change-Id: I2930152e7fd14e6b5dcb10add5074c8aa69024c6
2020-08-28 11:09:36 +00:00
SongFerngWang
34f35aff90 Fix NullPointerException, TelephonyManager.getServiceState is null am: a12327b5f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12468773

Change-Id: I5baab79d81bd127d8bf1a5092c0821a576b21852
2020-08-28 10:35:58 +00:00
SongFerng Wang
31e6dd17fe Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: ac58388986
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12468772

Change-Id: I506e99799987ee761ad61499ab59afcc520c4d9a
2020-08-28 09:47:40 +00:00
SongFerngWang
a12327b5f3 Fix NullPointerException, TelephonyManager.getServiceState is null
Add the null protect for TelephonyManager.getServiceState.

Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)

Change-Id: I61e59f7ba9d6c64019d620d6cb80099ded41473f
Merged-In: I61e59f7ba9d6c64019d620d6cb80099ded41473f
2020-08-28 09:11:03 +00:00
SongFerng Wang
ac58388986 Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" 2020-08-28 09:10:01 +00:00
SongFerngWang
09dc253a47 Fix NullPointerException, TelephonyManager.getServiceState is null
Add the null protect for TelephonyManager.getServiceState.

Bug: 166676020
Test: 1. make RunSettingsRoboTests ROBOTEST_FILTER=\
RenameMobileNetworkDialogFragmentTest (PASS)
2. make RunSettingsRoboTests ROBOTEST_FILTER=\
AutoSelectPreferenceControllerTest (PASS)
3. make RunSettingsRoboTests ROBOTEST_FILTER=\
PreferredNetworkModePreferenceControllerTest (PASS)
4. make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest (PASS)

Change-Id: I61e59f7ba9d6c64019d620d6cb80099ded41473f
2020-08-28 14:59:00 +08:00
Colin Cross
e564e1e0b4 [automerger skipped] Revert "Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7..." am: 38fa185a27 -s ours
am skip reason: skipped by user ccross

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

Change-Id: I086dd5e357152e716a303c0f5eb41ca9577cc1fd
2020-08-27 23:48:24 +00:00
android-build-team Robot
33fe6000da [automerger skipped] Snap for 6793014 from 3777d883a3 to master am: d48de3c7f7 -s ours
am skip reason: skipped by user ccross

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

Change-Id: I14492ecdff9b7e893b9a7a793b9863decc6c5760
2020-08-27 18:50:55 +00:00
TreeHugger Robot
c1683405f8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: c0935683da -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia79f67e9637aaeebe4bff202e037fca6b9e7c797
2020-08-27 07:08:08 +00:00
TreeHugger Robot
8f7d28eadc Merge "Replaced calls to UserManager.getUsers(true) to UserManger.getAliveUsers()" am: 2c6dfc2273
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12363016

Change-Id: I7f2353fd97b5b3f1fb0f8b701437b271fab160a2
2020-08-27 06:59:35 +00:00
Colin Cross
38fa185a27 Revert "Snap for 6793014 from 3777d883a3857b1a1589181c436d9018d7..."
Revert "Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528460c8b..."

Revert "Snap for 6793014 from a43295d1825da62af038d345a7a861ed7a..."

Revert "Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb386109..."

Revert "Snap for 6793014 from d0e31526c62b2aeb35c293ac96feb180fc..."

Revert "Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376efabd2..."

Revert "Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293b79684..."

Revert "Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57a8e7d5..."

Revert "Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aad87a67..."

Revert "Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24af9964..."

Revert "Snap for 6793014 from 14cb57e107a3abce8b14937b1f92c28d18..."

Revert "Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc03a606..."

Revert "Snap for 6793014 from 8c65adad0bcdfb3acc561063b4048dca24..."

Revert "Snap for 6793014 from b3061942700265e2bf04af9997775dcbbb..."

Revert "Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd0ac3be..."

Revert "Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec70d8da6..."

Revert "Snap for 6793014 from 988d4244914e0c749655e8cb6db18ba44f..."

Revert submission 12465146-release-request-6b259cbc-1f45-4b05-bc7e-c9b893b79d68-for-git_main-busytown-release-6793014

Reason for revert: b/166531456
Reverted Changes:
I5ff7a6c0d:Snap for 6793014 from f2989f9c65556d5155dbd57f82f0...
I77bdff943:Snap for 6793014 from a43295d1825da62af038d345a7a8...
I2ac5c520a:Snap for 6793014 from c3f124cca05579acf0a6cb589ebd...
I023b9702f:Snap for 6793014 from 98756d6d3e2bb0ba28eb125caa7a...
Ibc7893d72:Snap for 6793014 from fd1ad6750ef332d3f50f218f4d5d...
Ic27847bee:Snap for 6793014 from 8c65adad0bcdfb3acc561063b404...
If20bc9352:Snap for 6793014 from 7a3a8c6351d5167a6ae0b33bc376...
I6542d17e8:Snap for 6793014 from 3777d883a3857b1a1589181c436d...
I66e6bb8a9:Snap for 6793014 from 8b8bf0a07b0521bbe8483fbbab12...
I3cd190b6b:Snap for 6793014 from 424180bdc4aa18249e678daebfd0...
If92db7402:Snap for 6793014 from ab1e4a81d09a540a5f927059e5bc...
Iaced03c87:Snap for 6793014 from d0e31526c62b2aeb35c293ac96fe...
I5d28c6b4b:Snap for 6793014 from 4f81304963d19f4511b1e8e7d0aa...
I30d07bea3:Snap for 6793014 from 7594ec6384c4da320726def34f47...
I473205f48:Snap for 6793014 from 551c5953fc62e339e4ee884ec2cd...
I0656b41af:Snap for 6793014 from 44725f06b7f7d6407b5ee82d989b...
I0f9796067:Snap for 6793014 from 4919273b2ac5c6347a18e17c5ec7...
I9a38cda8f:Snap for 6793014 from 2076be4d27078d6ebc0a6b5e5ceb...
I876a82f51:Snap for 6793014 from 11467102abddb6026aaa164c1361...
I749d7d023:Snap for 6793014 from 41471cb21bb16b5c3bcc92f84293...
I038daea41:Snap for 6793014 from 07602cdacf5bcc835db41f7eaa24...
I47aa3131c:Snap for 6793014 from 14cb57e107a3abce8b14937b1f92...
I32dba8a95:Snap for 6793014 from 3157b4ee4325286f0c2ab0f26528...
I2ebc9f9db:Snap for 6793014 from 988d4244914e0c749655e8cb6db1...
Iae7c3370f:Snap for 6793014 from 9ffb8852294e06e2d387dc1fb868...
I6467a7f1b:Snap for 6793014 from 42e5cca3cfb829690c9d8c6aca57...
I8c6375203:Snap for 6793014 from b3061942700265e2bf04af999777...
I843b2e1f3:Snap for 6793014 from 265280bf5cb4bc14e132c3a35ae5...
Ie254f7079:Snap for 6793014 from f22ad3164937a8f2e309965c102b...
I01e0974ed:Snap for 6793014 from bbbccc3c2b7fc7c5780f6c415c42...

Change-Id: Ie8b2b332f7ebaaee7cd39c6f94d280c047426bc9
2020-08-27 04:12:26 +00:00
android-build-team Robot
d48de3c7f7 Snap for 6793014 from 3777d883a3 to master
Change-Id: I6542d17e841a2006a3fddbedbfa7ded27bf54411
2020-08-27 00:40:53 +00:00
TreeHugger Robot
c0935683da Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-08-27 00:39:34 +00:00
Bill Yi
32fc7e3b9c Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I279c1ec2e4ee0794e6c0895053a7d341011079e9
2020-08-26 22:33:29 +00:00
TreeHugger Robot
2c6dfc2273 Merge "Replaced calls to UserManager.getUsers(true) to UserManger.getAliveUsers()" 2020-08-26 21:02:06 +00:00
TreeHugger Robot
4aec562b3c Merge "Show just disconnected device on previously connected" am: 3777d883a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12369337

Change-Id: I44b5df624104df3a5bec7e88add764b6a578440e
2020-08-26 15:29:40 +00:00
TreeHugger Robot
3777d883a3 Merge "Show just disconnected device on previously connected" 2020-08-26 14:50:45 +00:00
Hugh Chen
386df49bbc 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
2020-08-26 18:56:30 +08:00
TreeHugger Robot
3a6a757816 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3 -s ours am: bc4f38d322 -s ours am: b96878a81a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I608765f1286196725bd9767821dfd8f50a9025d3
2020-08-26 04:27:14 +00:00
TreeHugger Robot
b96878a81a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3 -s ours am: bc4f38d322 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5beec29a76bb3d19d9c6a2201b264a07f09c49c0
2020-08-26 04:12:39 +00:00
TreeHugger Robot
bc4f38d322 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 9a728641e3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5cc5e7850459c371cbbc2ff65a3d4a13997fdeac
2020-08-26 03:53:39 +00:00
TreeHugger Robot
9a728641e3 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-26 03:02:50 +00:00
TreeHugger Robot
93c6ca914d Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92 am: 98dd4491b7 am: 9aaa4a65f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582

Change-Id: Ib8baa15a2e9a4edbf0b70f0decbea6746e8a0f7b
2020-08-25 19:53:43 +00:00
TreeHugger Robot
9aaa4a65f5 Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92 am: 98dd4491b7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582

Change-Id: I4b732b59e5c4446766bff1069907fccc568f6774
2020-08-25 19:13:44 +00:00
TreeHugger Robot
98dd4491b7 Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev am: 794482fb92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12410582

Change-Id: I84db13dbe58d05cb8639515e302b927c00342662
2020-08-25 18:58:11 +00:00
TreeHugger Robot
794482fb92 Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev 2020-08-25 18:14:50 +00:00
Bill Yi
c451cf2466 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I671b84326cfd203176121627a567768f51f32524
2020-08-25 08:57:10 -07:00
Jeff DeCew
d03970def5 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." am: 9e1d9c40d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12401955

Change-Id: Ida5ea498ef49fd670da4c529ca8bf51faa65d7ce
2020-08-25 15:06:47 +00:00
Jeff DeCew
9e1d9c40d8 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." 2020-08-25 14:00:04 +00:00
TreeHugger Robot
58426af982 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours am: 66f3b09eab -s ours am: 887b09614d -s ours am: 18eabc3c6f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I899997435b75b33797fe44992a68736cb1357632
2020-08-25 02:33:00 +00:00
TreeHugger Robot
f335120e11 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours am: 10dd2553f5 -s ours am: 2a5cdaa51b -s ours am: 0a5fa3f003 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7a7c545cd1ca7df27f333e13375f051845d13ed1
2020-08-25 02:32:50 +00:00
TreeHugger Robot
1ffa4c2ba6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791 -s ours am: 5a3f9c7700 -s ours am: 265aacbd89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0517db6ea8ff7abd600e451de76b228ae450147c
2020-08-25 02:31:54 +00:00
TreeHugger Robot
18eabc3c6f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours am: 66f3b09eab -s ours am: 887b09614d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia463c1e0dc25c629d47a21e293ac90b969862cfc
2020-08-25 02:01:01 +00:00
TreeHugger Robot
0a5fa3f003 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours am: 10dd2553f5 -s ours am: 2a5cdaa51b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I10a44db8348cdce8839ade99d1d6e0b65ec3b586
2020-08-25 02:00:47 +00:00
TreeHugger Robot
265aacbd89 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791 -s ours am: 5a3f9c7700 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0ee9328094adbdec5da5db6378cb8cbee091ed42
2020-08-25 02:00:39 +00:00
TreeHugger Robot
887b09614d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours am: 66f3b09eab -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2ffcf3962bcc223d5ee056f8f2b3e8a47964ba70
2020-08-25 01:58:10 +00:00
TreeHugger Robot
2a5cdaa51b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -s ours am: 10dd2553f5 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If33ef43e82404e5fa5ae2a970d8e21d3b0fec7a3
2020-08-25 00:50:57 +00:00