PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
74,151 Commits 1 Branch 0 Tags
a0503939be17ab8e9eb5f7966fb39a5f66e41ced
Commit Graph

74151 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
3a64d5898b Merge "Fix cast volume control bar not work" 2020-09-01 06:53:15 +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
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
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
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
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
Avinash Nalluri
e4956322e8 Add NR network type to "Global" mode preference 
Change-Id: I3b9ce75eb37a5002f7a77561c987c6758baf139b
Bug: 163382085
 2020-08-27 15:56:13 -07: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
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
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