PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
70,558 Commits 1 Branch 0 Tags
e32ed22547dd9ab339b881eee224b01aebb26e3f
Commit Graph

70558 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xin Li
e32ed22547 [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours am: d92daf10ef -s ours am: 744507f78b -s ours 
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

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

Change-Id: I880a3e8ae1c028d809e951de0eeaa59cf8fa3723
 2020-09-01 22:10:06 +00:00
Xin Li
744507f78b [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours am: d92daf10ef -s ours 
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

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

Change-Id: I96cb62de1d30aed204295f417deab1d806bda62e
 2020-09-01 21:46:50 +00:00
Xin Li
d92daf10ef [automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: d57e13f558 -s ours 
am skip reason: Change-Id Ie9d2c4d6d4618a167af1c5627d5d7918a404f398 with SHA-1 733eed05c8 is in history

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

Change-Id: I0d548c1b5c061e4ee753808040af883dd59cb3ee
 2020-09-01 20:37:15 +00:00
Xin Li
d57e13f558 Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master 2020-09-01 20:04:34 +00:00
SongFerng Wang
d57b551b8d Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae am: 08e3e22ae0 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I4d22338c155adcb13a916d9a689685eb3caad04b
 2020-09-01 05:46:53 +00:00
SongFerng Wang
08e3e22ae0 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I2852e9c06cedb61338e6ccaaed078fc07e241a61
 2020-09-01 05:00:04 +00:00
SongFerng Wang
4e657741ae Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I4729b601cd161f6506149ebb2d04429b8b8dbd63
 2020-09-01 04:40:24 +00:00
SongFerng Wang
318f6bcc53 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I1714b765690ac43e77233752d31ef921219584f0
 2020-09-01 04:27:11 +00:00
SongFerng Wang
19222f2154 Merge "Add NR network type to "Global" mode preference" 2020-09-01 04:09:35 +00:00
Bill Yi
343820d45c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours am: 2237c26d0a -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: I2f9763daa31f92ad9f5b44b70add6d104dfe8bef
 2020-08-31 16:41:47 +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
2237c26d0a [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: Id7673649ab84ae3507e9d55acdfff4d84661d901
 2020-08-31 15:47:23 +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
Xin Li
748efff856 Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) 
Bug: 166295507
Merged-In: Ie9d2c4d6d4618a167af1c5627d5d7918a404f398
Change-Id: I2ae428e37fd96226ce4e06032e2c0beaacbd0301
 2020-08-28 23:35:54 -07: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
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
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference 
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
 2020-08-27 15:56:13 -07: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
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
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
TreeHugger Robot
66f3b09eab [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -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: Ib5a7bb2bed92ff6a85e04007ed1ca44dfd87ef2a
 2020-08-25 00:50:50 +00:00
TreeHugger Robot
5a3f9c7700 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c134678791 -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: Ifab410adba669f1f5be3858cad4fb63c2245fa36
 2020-08-25 00:50:46 +00:00
TreeHugger Robot
10dd2553f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 7784b632f0 -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: Ie8e590ce674ad98870db8b7ec424e79aed1e5646
 2020-08-25 00:50:44 +00:00
TreeHugger Robot
c134678791 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2020-08-24 23:59:52 +00:00
TreeHugger Robot
7784b632f0 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 23:47:22 +00:00
Bill Yi
74ebd8d67e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie8de2117f17686fd3502158cac1256d604085650
 2020-08-24 22:32:35 +00:00
Bill Yi
333af71c67 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I189c4535205aeb90f4804f8ce03125d2d0b57afc
 2020-08-24 21:56:39 +00:00
TreeHugger Robot
3426a65abb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6 -s ours am: 12325057d4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6d0d5fe4997843bed781a49ed49acb17e54be9f8
 2020-08-24 18:27:45 +00:00
TreeHugger Robot
9c24ebe715 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6 -s ours am: ee6f51cc9e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id452ad22af18dbdecac8599b6b56b4806e64eab7
 2020-08-24 18:19:02 +00:00
TreeHugger Robot
ee6f51cc9e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie86707775f05944896f263c67f109faf4fba6dc4
 2020-08-24 17:31:13 +00:00
TreeHugger Robot
12325057d4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: fcfa016fc6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30ace31758787b69746ce157fcea87836da0f8c0
 2020-08-24 17:30:47 +00:00
TreeHugger Robot
fcfa016fc6 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-24 16:39:30 +00:00
TreeHugger Robot
6a23ee5d37 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev am: b75d2f6009 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12391062

Change-Id: Ib275c7ce10f274d815a155cf9d95af03757e1a7c
 2020-08-24 16:05:10 +00:00
Julia Reynolds
aee17d0f0b Merge "Fix pending intent links" into rvc-qpr-dev am: 3e29b54e5a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12416202

Change-Id: Ia5b32ae76df267b8d08dd8947c02180ead620a78
 2020-08-24 16:04:05 +00:00
TreeHugger Robot
b75d2f6009 Merge "Add 'Adaptive connectivity' UI" into rvc-qpr-dev 2020-08-24 15:47:38 +00:00
Julia Reynolds
3e29b54e5a Merge "Fix pending intent links" into rvc-qpr-dev 2020-08-24 15:07:13 +00:00
Bill Yi
6de20ba7d3 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I7c05495dd402909c7be8dff05bf3dcfa989046b0
 2020-08-24 07:55:38 -07:00
TreeHugger Robot
77cca92a65 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: b3cbdbdffc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I30c5a364efcdf4f329e3859456d56cff07129c54
 2020-08-23 03:26:24 +00:00
TreeHugger Robot
a50b560a44 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours am: a8bd2b7a82 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9cca8660402368915a6e92f547a549291b85b269
 2020-08-23 03:26:10 +00:00
TreeHugger Robot
b3cbdbdffc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I588be9bdc7fc5a367d0de98dd17dfac9c01c3a3a
 2020-08-23 03:10:45 +00:00
TreeHugger Robot
a8bd2b7a82 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 66239bfaa1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7505c1bd6a8af76501f6c89738d02973d2a9f13e
 2020-08-23 02:58:59 +00:00
TreeHugger Robot
66239bfaa1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev 2020-08-23 02:35:15 +00:00
Bill Yi
ad6b207d87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 493440b39d -s ours am: 7f0716a65e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idec8ca804446bb6ecc5884d37e6221d0264a25ca
 2020-08-22 15:47:24 +00:00