PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
76,241 Commits 1 Branch 0 Tags
c453b29f37d062c2351f1726bc5978012b2fa60b
Commit Graph

76241 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
c453b29f37 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours am: ca40ee1a3a -s ours am: 8942b451cf -s ours am: ecaded8c56 -s ours am: a0503939be -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If7dbdba07f675a10c3ef602cfbaa92c0699727d2
 2020-09-02 09:11:01 +00:00
Treehugger Robot
a0503939be [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours am: ca40ee1a3a -s ours am: 8942b451cf -s ours am: ecaded8c56 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib43b2ea507d77fed3878f01d00a0ba773bf7cb9b
 2020-09-02 08:49:49 +00:00
Treehugger Robot
ecaded8c56 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours am: ca40ee1a3a -s ours am: 8942b451cf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I051252acfcdfabf7964679838a347263855b5afb
 2020-09-02 08:12:08 +00:00
Treehugger Robot
8942b451cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours am: ca40ee1a3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I086d2a926c9089f19e9bf5a26e04a8e6210afd92
 2020-09-02 07:48:23 +00:00
Treehugger Robot
ca40ee1a3a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours am: f3ae142f67 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7e811f65e77821275c46b300115828a56583611f
 2020-09-02 07:29:37 +00:00
Treehugger Robot
f3ae142f67 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 22a9ba1458 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41cca1a0a56dc19ae68b420aadc78e3cfc3121c9
 2020-09-02 07:11:06 +00:00
Treehugger Robot
22a9ba1458 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-02 06:30:33 +00:00
Bill Yi
7ec0bc9bef Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I43aa317e93b4ee5e484314bf40cdbc2e5e4aa442
 2020-09-02 05:42:17 +00:00
Xin Li
192efe337d [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: e32ed22547 -s ours am: 8d2e3b2009 -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: I6fb3a39905471ff72d56e06b01487e9f09aca052
 2020-09-02 02:27:10 +00:00
Xin Li
8d2e3b2009 [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: e32ed22547 -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: Ia5f0f1a1143e1533eb997d4cf1ba771e11b207a1
 2020-09-02 01:59:32 +00:00
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
TreeHugger Robot
cd8bbc94d2 Merge "Fix cast volume control bar not work" am: 3a64d5898b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12482146

Change-Id: Idfea182fc9342d5ac6f4b3ec5c0ebaf9ca6f981b
 2020-09-01 07:21:52 +00:00
TreeHugger Robot
3a64d5898b Merge "Fix cast volume control bar not work" 2020-09-01 06:53:15 +00:00
TreeHugger Robot
6337da29bd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 30397a0a9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7ed92faad6fc58c056b9e2791cead25acfe55ec
 2020-09-01 06:22:03 +00:00
SongFerng Wang
6b4a551898 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae am: 08e3e22ae0 am: d57b551b8d am: 36c1271234 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: Id2b8fcd48b9950b6abeec4e9e1d4131bf0df2b96
 2020-09-01 06:21:51 +00:00
TreeHugger Robot
30397a0a9c Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-01 06:06:09 +00:00
SongFerng Wang
36c1271234 Merge "Add NR network type to "Global" mode preference" am: 19222f2154 am: 318f6bcc53 am: 4e657741ae am: 08e3e22ae0 am: d57b551b8d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1395568

Change-Id: I516b59a022ab7d6d092191ee225ce99515fecda4
 2020-09-01 06:04:49 +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
22ca726f4a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours am: 2237c26d0a -s ours am: 343820d45c -s ours am: ea6acdd60a -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: I146948ca5157d22fddc0d7a16097d3c9afc4a80d
 2020-08-31 16:51:49 +00:00
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
ea6acdd60a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 09cc09a274 -s ours am: 2237c26d0a -s ours am: 343820d45c -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: I86f1831ec6d6025a43327986976611159ee4d394
 2020-08-31 16:50:46 +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
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
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
6f633fbbb2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f5379392a97ed8640c49a4e6a57fdf264746422
 2020-08-31 15:06:11 +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
Hugh Chen
7f3efd4357 Fix cast volume control bar not work 
Use hashcode as a requestCode id, since the
same requestCode will cause the intent be cached.

Bug: 163095633
Test: make -j42 RunSettingsRoboTests
Change-Id: I2c120f18e24a66aeff5565e952fa4064149ec540
 2020-08-31 15:48:46 +08: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
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