PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
92,872 Commits 1 Branch 0 Tags
6a636a8f47a2a0b52cd057af8cd6bb9d5ef034b4
Commit Graph

92872 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
6a636a8f47 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Id2ab60cd236e61e466e12f2fd42526d6edf624c0
 2021-08-05 02:54:46 +00:00
Treehugger Robot
dc958f27e8 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 am: 93a418718f -s ours am: 8f0658f24d -s ours am: 4fa35e41b9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id083ac4906df682d8774a9f0f21d5aa7bb5c74d2
 2021-08-04 02:28:35 +00:00
Xin Li
db19ea7e4b [automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours am: 1d2519ade1 -s ours am: 0924dc7b5c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1b10f69c8bb44c3f5bedc5f3f5effbf0d76b199b
 2021-08-04 02:28:30 +00:00
Treehugger Robot
4fa35e41b9 [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 am: 93a418718f -s ours am: 8f0658f24d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I70994758c7410f4cd98e61a64e22cdf496962436
 2021-08-04 02:15:04 +00:00
Xin Li
0924dc7b5c [automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours am: 1d2519ade1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4ad6a89859c1c8db0dff384dd876eab1486bc8a1
 2021-08-04 02:15:00 +00:00
Treehugger Robot
8f0658f24d [automerger skipped] Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 am: 93a418718f -s ours 
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: I1ba07ac8c0a20cf6f1422d2be60c00a10e304ba7
 2021-08-04 01:59:51 +00:00
Xin Li
1d2519ade1 [automerger skipped] DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b am: 4785355302 -s ours 
am skip reason: Merged-In Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e with SHA-1 3b8c6118c1 is already in history

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

Change-Id: Ic475987a1d6f0435fb4c4c77e28ada1b687878ff
 2021-08-04 01:59:46 +00:00
Treehugger Robot
93a418718f Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." am: a529d8c717 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293

Change-Id: I86a2d120881f268b479b8a0e1bda3832fcb867bc
 2021-08-04 01:28:25 +00:00
Xin Li
4785355302 DO NOT MERGE - Merge RQ3A.210805.001.A1. am: 27ade80e6b 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1785293

Change-Id: I1cc9538054669c2c71105d44c8601fb1bf6e8579
 2021-08-04 01:28:22 +00:00
Treehugger Robot
a529d8c717 Merge "DO NOT MERGE - Merge RQ3A.210805.001.A1." 2021-08-04 01:05:56 +00:00
Yifan Hong
045354fa8c Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 am: bbd851fea7 am: e3aecc8290 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: Ib469a94982990b0cb98a9146a7a4da474f0bbe20
 2021-08-04 00:37:59 +00:00
Yifan Hong
e3aecc8290 Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 am: bbd851fea7 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: I2c334127de069f834cf4d955ac18cf0df4ed5f83
 2021-08-04 00:22:13 +00:00
Yifan Hong
bbd851fea7 Merge "PairDevice to structured Parcelable." am: f7ff663887 am: eddbc8a356 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: Ife1bbb4e839ee6115b2809113c715068cdb94e59
 2021-08-04 00:07:38 +00:00
Yifan Hong
eddbc8a356 Merge "PairDevice to structured Parcelable." am: f7ff663887 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1780667

Change-Id: I6dcf1c7dab645aae4461a1100b580b5c8b2781ad
 2021-08-03 23:46:26 +00:00
Yifan Hong
f7ff663887 Merge "PairDevice to structured Parcelable." 2021-08-03 23:32:27 +00:00
Xin Li
27ade80e6b DO NOT MERGE - Merge RQ3A.210805.001.A1. 
Bug: 192585466
Merged-In: Ic9d4e1138113e3c90abb27ba0a72d2ed07528c1e
Change-Id: I2bf4a9589a121a8bc2d2c4680a1fa081784a2e8a
 2021-08-03 16:07:50 -07:00
Yifan Hong
d61750990d PairDevice to structured Parcelable. 
Bug: 194829333
Test: pass
Change-Id: I202ae5aa16d4323afa2a48cc3070f8e13c701efd
 2021-08-03 14:05:31 -07:00
Bonian Chen
e421a7265d Merge "[Settings] eSIM existance detection rule change" 2021-08-03 13:12:20 +00:00
Bonian Chen
848d097b94 [Settings] eSIM existance detection rule change 
1. eSIM retrieved from SubscriptionManager#getAvailableSubscriptionInfoList()
should be considered as existed all the time.

2. When SIM are both inactive(or active), sorted the ordering based on ordering provided by telephony framework.

Bug: 195090132
Bug: 195091953
Test: local
Change-Id: I2fe43a35e5b7965bde3b579e2297e9cdd89ec228
 2021-08-03 11:04:27 +00:00
Joy Babafemi
130a7228d6 Merge "UWB: Re-enable UWB toggle" 2021-08-03 04:14:34 +00:00
Joe Bolinger
765b7f4073 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 8a8f607218 am: 7f94e57003 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I508b81f7a56ce0362309528dea91d62a4aa7aa01
 2021-08-02 21:54:50 +00:00
Joe Bolinger
903e7151ef Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 7324d75b4f am: b67ebf0c5c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: Iac6e4041aaa84d327d5760ce04ace8c767dc323f
 2021-08-02 21:54:29 +00:00
Joe Bolinger
7f94e57003 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 8a8f607218 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I78054fc148d39cd7728a976c1406ddf38a5d0a32
 2021-08-02 21:44:35 +00:00
Joe Bolinger
b67ebf0c5c Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: 7324d75b4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: Ifc1a660def75b1b781b40dae6da9e3e608e0ef7a
 2021-08-02 21:44:10 +00:00
Joe Bolinger
7864beaafd Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 am: c76d3e5af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I15f97e1dee53c996e294b70b924e5949cfbd0f61
 2021-08-02 21:43:53 +00:00
Joe Bolinger
7324d75b4f Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I0fda8c0922e45b45a4fb2b10431289724ea26851
 2021-08-02 21:28:29 +00:00
Joe Bolinger
c76d3e5af7 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I9d2c3c9daf090f26244f42b730507ba64a279500
 2021-08-02 21:27:44 +00:00
Joe Bolinger
8a8f607218 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev am: fdb80de825 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15433652

Change-Id: I7912e8ac26ee4c5cd611a8d7e535fb3f4f93d018
 2021-08-02 21:26:51 +00:00
Joe Bolinger
fdb80de825 Merge "Skip enrollment when unicorn account is launched by setup wizard." into sc-dev 2021-08-02 21:15:40 +00:00
TreeHugger Robot
32ef854a8d Merge "Alarm Manager policy TARE page implementation" 2021-08-02 19:37:17 +00:00
alinasuarez
aef6ac2889 Alarm Manager policy TARE page implementation 
An alarm manager policy page is needed in the TARE developer option
settings to allow developers to both view and edit the current values of
all the factors under the alarm manager policy. The page uses a dropdown
so that the user can easily switch between the different policies. For
the factors with subfactors, the user simply clicks on the factor and
the subfactors will pop up under it.

Bug: 191876714
Bug: 191876567

Test: Manual (open Settings > System > Developer Options > TARE > Alarm
Manger and verify all factors are there)

Change-Id: Ie036e26df80947d23041bedfd5b1385e48069b6b
 2021-08-02 17:39:36 +00:00
Wu Ahan
bad7c0c89d Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev am: 661d1d1a1b am: 9eff6c3d77 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258554

Change-Id: Ia943585cd70be1d027f9e91ffb20d610c5572a3e
 2021-08-02 10:33:28 +00:00
Wu Ahan
9eff6c3d77 Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev am: 661d1d1a1b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15258554

Change-Id: I30dc96c202caf1895bcd3099ddd460d8c834a825
 2021-08-02 10:23:59 +00:00
Wu Ahan
661d1d1a1b Merge "Use new api to create InteractionJankMonitor.Configuration.Builder" into sc-v2-dev 2021-08-02 10:06:03 +00:00
Jason Hsu
05c7ed1d05 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: f38931fd98 am: 02990f7470 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15401732

Change-Id: I777d6dbba30b3da7308ce998e3aeefbbbd298bba
 2021-08-02 06:34:11 +00:00
Jason Hsu
02990f7470 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev am: f38931fd98 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15401732

Change-Id: I8e2444b9cb74262298dd290adeaf783198901cb1
 2021-08-02 06:30:11 +00:00
Jason Hsu
f38931fd98 Merge "Update the preview image in 'Accessibility button & gesture' page." into sc-v2-dev 2021-08-02 06:25:41 +00:00
Joe Bolinger
d5ea0ffe67 Skip enrollment when unicorn account is launched by setup wizard. 
Bug: 194244555
Test: manual
Change-Id: Id310c5e4dec1b1c5262c9703259223ce21b1da61
 2021-07-30 12:51:02 -07:00
Bill Yi
2cad599ca6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 9c72a8c5f6 -s ours am: ab7e329391 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8c930de4c457420fdf8cbe42df46035ebd03e2bb
 2021-07-30 15:20:40 +00:00
Bill Yi
26d92d0e0e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 34aff9aaca -s ours am: 2b1eaf9ff7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I579cd031ceaa0b7e48118ff5b4be3df9be779153
 2021-07-30 15:20:25 +00:00
Bill Yi
ab7e329391 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 9c72a8c5f6 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9d1f2715938b804ce9b5ee2834a3e454f245aabb
 2021-07-30 15:08:46 +00:00
Bill Yi
2b1eaf9ff7 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 34aff9aaca -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4dda9cf94fd6d75f1cc7449faa9915883e74b0e5
 2021-07-30 15:08:25 +00:00
Bill Yi
576d35ca87 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours am: 295b1bb97b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I41d66fd7e328cc1dda83f253179ab7943baa355d
 2021-07-30 15:07:57 +00:00
TreeHugger Robot
637f826dcf Merge "TARE string clarification" 2021-07-30 14:55:51 +00:00
Bill Yi
34aff9aaca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic7bfa1ad32cabb5028a907affcaac8ea9bb7224c
 2021-07-30 14:53:52 +00:00
Bill Yi
295b1bb97b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iec3a965e95f539c618044b241380e9af19dc20a6
 2021-07-30 14:53:05 +00:00
Bill Yi
9c72a8c5f6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e5d2e077c7 -s ours am: 6deca0cd6b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73033d1b8888120b77e48edd8ce23eb1beca3b7e
 2021-07-30 14:52:58 +00:00
Bill Yi
b2b32da651 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 2487eee891 -s ours am: 96e13f3748 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1381596c0736d37f24e40ff977af702e9fb4f942
 2021-07-30 14:48:33 +00:00
Automerger Merge Worker
b7daeb661d Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 7399e2deaa -s ours am: b90e48ad64 -s ours" into sc-v2-dev-plus-aosp am: c73177f8d2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I79cea14d1339a9ace856c3de36c348bddbc87697
 2021-07-30 14:48:16 +00:00
Bill Yi
748c6716d9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 296d41309e -s ours am: 16693aaca0 -s ours am: 96d40908e0 -s ours am: efb958f5e1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I08ffaa64bd4002d3b4e714d26c51e82b8ab5f482
 2021-07-30 14:48:08 +00:00