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

76790 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
09c4cd7922 Merge "Merge mainline-prod into master" am: d9e691b536 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12562389

Change-Id: I462ade856b927d2efb7de6fca1753f454b8377a0
 2020-09-15 21:26:27 +00:00
Treehugger Robot
00b6953dfe Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9 am: ae268ea40d am: 9b5a2ff761 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I0b77ce3cd5aa6d1e5172037f283ea04f3078dc6e
 2020-09-15 21:26:20 +00:00
Quang Luong
f39e5b1f0c Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev am: db667a8971 am: 8704114f02 am: 77e32049bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12444567

Change-Id: I8b3957122b5b7df2340e1096123fc50c26e98414
 2020-09-15 20:20:16 +00:00
Bill Yi
6cc5cdc8b1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: bf6337ed40 -s ours am: d7b3015b5f -s ours am: 2da441b02f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idf7e59a9b1fe18e6abf5b07c3dfb8e890f20108c
 2020-09-15 20:19:32 +00:00
Bill Yi
2f4f15fa1e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d10db1189 -s ours am: 53286dbe5d -s ours am: 4f859db3d1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie0bd4eed486cfa69b345615747a765d0b97daa7f
 2020-09-15 20:19:20 +00:00
Bill Yi
5b1e422171 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: e02435c0d5 -s ours am: 3cd0a8710e -s ours am: 4c1e13f518 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic36a145b32986ab18f1aa36ef2e15498724e43fd
 2020-09-15 20:19:11 +00:00
Bonian Chen
92b3dce865 [automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d am: 07536baadf -s ours am: 8b498d237b -s ours am: 4774e8107a -s ours 
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3 is in history

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

Change-Id: Ib5cfec3cae5ad44a71ac3966666193ea9962b04e
 2020-09-15 20:19:00 +00:00
Bonian Chen
532a243a42 [automerger skipped] Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 am: 0f2bc3bad9 am: e68a8c4953 -s ours am: 0a3a51bdea -s ours 
am skip reason: Change-Id I2854147c956faa633a9682eee0028db6cd2d3912 with SHA-1 95b129c87d is in history

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

Change-Id: Ic15eda37db69814a0b6924e13813d613cbc46eb7
 2020-09-15 20:18:41 +00:00
TreeHugger Robot
d9e691b536 Merge "Merge mainline-prod into master" 2020-09-12 09:33:34 +00:00
Treehugger Robot
9b5a2ff761 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9 am: ae268ea40d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Ibae9c6fea5214fcd6f39be338ca31a5bb3725e48
 2020-09-12 03:24:57 +00:00
Treehugger Robot
ae268ea40d Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 am: 368ae3f9b9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I30981eb4d451fc77ba7ee08b9ad734a392c27fca
 2020-09-12 03:02:52 +00:00
Treehugger Robot
368ae3f9b9 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 am: 91286c4ec9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Idd7fbf0b35260a8146d029337cb3de7d29a14ed8
 2020-09-12 02:21:21 +00:00
Treehugger Robot
91286c4ec9 Merge "Add goldmanj to settings owners files." am: 56349f714d am: 26f8b54e38 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: I5c0fe4b0b3be7191d42db14195791d8a8bee503c
 2020-09-12 01:36:43 +00:00
Treehugger Robot
26f8b54e38 Merge "Add goldmanj to settings owners files." am: 56349f714d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425948

Change-Id: Ic5d53fe6e4a19519b572afb5814f3ff3a3b6cc5b
 2020-09-12 01:09:51 +00:00
Treehugger Robot
56349f714d Merge "Add goldmanj to settings owners files." 2020-09-12 00:24:02 +00:00
Quang Luong
77e32049bd Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev am: db667a8971 am: 8704114f02 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12444567

Change-Id: I95ac03dcb6a45fbc8c71aae0d7c9fcae20f36ff2
 2020-09-11 23:50:57 +00:00
Bill Yi
2da441b02f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: bf6337ed40 -s ours am: d7b3015b5f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If4fd31548a4f7398906f9590478089d0778ec948
 2020-09-11 23:49:01 +00:00
Bill Yi
4f859db3d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d10db1189 -s ours am: 53286dbe5d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I493e304109fa570ea679a50bce9991cbbbc29e4f
 2020-09-11 23:48:56 +00:00
Bill Yi
4c1e13f518 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: e02435c0d5 -s ours am: 3cd0a8710e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1d43cdd6b3b3e8d1531db8e1d720673f1e9f3e55
 2020-09-11 23:48:50 +00:00
Bonian Chen
4774e8107a [automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d am: 07536baadf -s ours am: 8b498d237b -s ours 
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3 is in history

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

Change-Id: If8a740ff1190738501a6cfccf307edb19952d4b1
 2020-09-11 23:48:45 +00:00
Bonian Chen
0a3a51bdea [automerger skipped] Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 am: 0f2bc3bad9 am: e68a8c4953 -s ours 
am skip reason: Change-Id I2854147c956faa633a9682eee0028db6cd2d3912 with SHA-1 95b129c87d is in history

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

Change-Id: I4e9b95fd36178898037f191c71e1fa8ebae5e163
 2020-09-11 23:48:36 +00:00
Xin Li
1672efb2be [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours am: a486aae1f4 -s ours am: 53be426ddf -s ours am: df5b0a4c2d -s ours am: cd24de93d8 -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: I4198eac7be30d7713e8efaaf646a94b037b59742
 2020-09-11 22:41:37 +00:00
Xin Li
cd24de93d8 [automerger skipped] Merge "Merge Android R" am: 36cfa7db8e -s ours am: 3fd1488575 -s ours am: a486aae1f4 -s ours am: 53be426ddf -s ours am: df5b0a4c2d -s ours 
am skip reason: Change-Id I7972af3db5cb995b4a7c4deb982eeef6c3dddaad with SHA-1 ada75ad54d is in history

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

Change-Id: I7eff9e027cc44c0496570be3d25765dfda1ee9d6
 2020-09-11 21:27:38 +00:00
TreeHugger Robot
cf400a6459 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 0492944509 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1040a87b9c1b80857fc93674eff989cde18fd3e1
 2020-09-11 20:10:24 +00:00
TreeHugger Robot
0492944509 Merge "Import translations. DO NOT MERGE ANYWHERE" 2020-09-11 18:59:25 +00:00
Quang Luong
8704114f02 Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev am: db667a8971 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12444567

Change-Id: I655406b69ef689a1b604ed6fc6c9e4d2bbf8bf82
 2020-09-11 18:57:42 +00:00
Jeremy Goldman
9e1e47fef7 Add goldmanj to settings owners files. 
Test: N/A, code not edited.
Change-Id: I23a64e52d01ebeda1509d1e207200d868444d955
 2020-09-11 18:55:46 +00:00
Quang Luong
db667a8971 Merge "[Wi-Fi] Show Pie+x Wi-Fi icon when a connected Wi-Fi is not default route" into rvc-qpr-dev 2020-09-11 18:30:32 +00:00
Jeremy Goldman
21b6c0a489 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" am: 1f718138e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559422

Change-Id: I494885635c00445c2597dea7b126f4d376465213
 2020-09-11 18:18:14 +00:00
Jeremy Goldman
cb0056d159 Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" am: 9b8efdbe4c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12549082

Change-Id: Id1c2f18fcc604539253c01c55c988839002d3436
 2020-09-11 18:18:05 +00:00
Jeremy Goldman
1f718138e5 Merge "[Testing] use AndroidJUnit4 in new MultiNetworkHeaderControllerTest" 2020-09-11 17:38:52 +00:00
Jeremy Goldman
9b8efdbe4c Merge "[Testing] use AndroidJUnit4 in new MobileDataPreferenceControllerTest" 2020-09-11 17:38:18 +00:00
Bill Yi
d7b3015b5f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: bf6337ed40 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib3a00d19a3dfdf48d504f02e413a4b5168dd4b3b
 2020-09-11 17:26:41 +00:00
Bill Yi
53286dbe5d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6d10db1189 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I19bf6756d238cc2eac1e0ef4bb8634532793ffe0
 2020-09-11 17:26:22 +00:00
Bill Yi
3cd0a8710e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours am: e02435c0d5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iae4c4b746419b71471e09da20c13a8301060ba7d
 2020-09-11 17:25:50 +00:00
Bill Yi
bf6337ed40 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0f3a1ce32ce46d006902ee3108ff7db8022297ba
 2020-09-11 16:48:48 +00:00
Bill Yi
e02435c0d5 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0770b54a6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I49e9c3a2001f1132248274c6aa9c6b6e7644b8da
 2020-09-11 16:46:19 +00:00
Bill Yi
4b281f9631 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I30d13ccd5d64c3379cf6470730f1bda6b2da5e1f
 2020-09-11 15:51:34 +00:00
Bill Yi
6d10db1189 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e7a6b9b829341cbcdf6bace5cb813c6a182f12d
 2020-09-11 14:36:20 +00:00
Bill Yi
0770b54a6b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I713058fc16146fcb8c3ec66cfccaf7c736981a4e
 2020-09-11 13:56:47 +00:00
Betty Chang
98172e82e2 Merge "[Testing] Use AndroidJUnit4 instead in MmsMessagePreferenceControllerTest" am: b5cc1860f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559487

Change-Id: Ic8f73d50cee796de9dcaf6abbb992ef0602f8e0f
 2020-09-11 10:14:18 +00:00
Betty Chang
b5cc1860f3 Merge "[Testing] Use AndroidJUnit4 instead in MmsMessagePreferenceControllerTest" 2020-09-11 09:50:06 +00:00
Bonian Chen
8b498d237b [automerger skipped] Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d am: 07536baadf -s ours 
am skip reason: Change-Id I61e59f7ba9d6c64019d620d6cb80099ded41473f with SHA-1 a12327b5f3 is in history

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

Change-Id: I14c1d9f0d2ad15fc9355ff505a362b6b09b88a4f
 2020-09-11 09:28:50 +00:00
Bonian Chen
e68a8c4953 Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 am: 0f2bc3bad9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I2828a05151f0d5dc0a1ba314b15d0ec89710772f
 2020-09-11 09:28:28 +00:00
Betty Chang
7ed8132b28 Merge "[Testing] Use AndroidJUnit4 instead in AppPrefLoaderTest" am: 4c8756704c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533600

Change-Id: I633f6df5ea53fd69c5319f080dccf203bc263822
 2020-09-11 08:55:24 +00:00
Mariia Sandrikova
309ad973f5 Merge "Vertically center notification priority labels." am: 17757a96d5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12548098

Change-Id: Ic3387ad5836dd0a0cf4a7dc1c8683a9e8f8c3d49
 2020-09-11 08:55:17 +00:00
TreeHugger Robot
80fb884eea Merge "Add permission to protect data when sending broadcast" am: 168f468c92 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12559486

Change-Id: Id45b5abe2cae1035edeb91d09a15faabf4b2822b
 2020-09-11 08:55:05 +00:00
Bonian Chen
07536baadf Merge "Fix NullPointerException, TelephonyManager.getServiceState is null" am: 11db11d236 am: e73b25e37b am: 42710f069d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425489

Change-Id: Ic862e8fded74ab13e528874abd690e55d5fb2bfd
 2020-09-11 08:42:31 +00:00
Bonian Chen
0f2bc3bad9 Merge "[Settings] subscription UI should be closed when SIM is removed" am: b3efa585f2 am: 5dba10a956 am: 5975853b18 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425488

Change-Id: I74e8fe4508bcafff0bc08a8d88eff771a1158ec3
 2020-09-11 08:42:22 +00:00
Betty Chang
4c8756704c Merge "[Testing] Use AndroidJUnit4 instead in AppPrefLoaderTest" 2020-09-11 08:38:59 +00:00