PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,550 Commits 1 Branch 0 Tags
f51eb39d65e8a0fbb1995f95b13a7f867855571c
Commit Graph

84550 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Yomna Nasser
da6c658b99 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 am: 87259ab2af 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I3a5aa2741d2a8bb9495fb5e88b27d1248d60f7ef
 2021-08-17 00:43:26 +00:00
Yomna Nasser
ea343fa5a4 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: Ic40a46ce6d36e5147fc99ed3afb1bb1735164cad
 2021-08-17 00:30:30 +00:00
Yomna Nasser
87259ab2af Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev am: cf77b7a248 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15491273

Change-Id: I04e70b72a0c2cd197ae993139c9fb60b01a07a23
 2021-08-17 00:29:43 +00:00
Joe Bolinger
6e1ecbd617 Update OWNERS. 
Test: N/A
Change-Id: I6646a2b7dda95f458b95c0fed331b1cb213fcae8
 2021-08-16 17:12:53 -07:00
Yomna Nasser
cf77b7a248 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev 2021-08-17 00:12:39 +00:00
Curtis Belmonte
dbef2415d3 [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: Ief92774377376ea11b4e099f7c0cf5764cbf7f31
 2021-08-16 21:44:39 +00:00
Curtis Belmonte
dc9b53c446 Remove/replace old fingerprint icon in SUW/Settings 
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.

Test: Manual

Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
 2021-08-16 14:44:15 -07:00
TreeHugger Robot
f680c9b0b5 Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev am: 7efaff8d0f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15531055

Change-Id: If4c7ffd19e06965e34f5185e63b22d58d3ca08d8
 2021-08-14 07:26:53 +00:00
TreeHugger Robot
7efaff8d0f Merge "Prototyping : Demo Image on color setting" into sc-qpr1-dev 2021-08-14 07:13:12 +00:00
Xin Li
42be0d2f75 Merge sc-dev-plus-aosp-without-vendor@7634622 
Merged-In: Id2a8c43f9bca79200f837759ce9de0a6eba2a37a
Change-Id: I90fe22409ec7832714c8530f54408db747bdf3c4
 2021-08-14 06:30:57 +00:00
TreeHugger Robot
17a08343bf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: 0af8e8e5cd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I8ba4dec8d28bdbe01c84416331040d1c3d67d20b
 2021-08-13 19:45:03 +00:00
Bill Yi
6e95702bd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: 15bb8d9aae -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iebc1f394ba75463a6743808a97bea0ec1655c98b
 2021-08-13 19:44:56 +00:00
TreeHugger Robot
69f2f00362 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours am: e51ac2563b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2df24400a8dd1a3acef085f6b062f09ddb41cf54
 2021-08-13 19:44:16 +00:00
Bill Yi
8e53fa2ae0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours am: c23385ba9c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id29b69cda109093a834dabe7423b7a07f7d5b955
 2021-08-13 19:44:02 +00:00
TreeHugger Robot
0af8e8e5cd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id0f6ec90720888d2fce39b8f7a9f7064aa4c1e57
 2021-08-13 19:32:44 +00:00
Bill Yi
15bb8d9aae [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib46ff621c7f360961004af6281f08e3ced8acc59
 2021-08-13 19:32:41 +00:00
TreeHugger Robot
e51ac2563b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours am: d3a02937ce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I681b191d4353cdbd88bf7da2b01afae2229b366b
 2021-08-13 19:31:54 +00:00
Bill Yi
c23385ba9c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours am: 04c33bbf71 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1743568b80aff5c6d89c328368f808ede831811c
 2021-08-13 19:31:46 +00:00
TreeHugger Robot
32cf5641ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: cc5b59c9a4 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie809525a625dd54ec03c337315c81a4206053989
 2021-08-13 19:19:00 +00:00
TreeHugger Robot
37dde5b3df [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 7508bd0cd2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If494bf48172fe36d789b46b653edcf76f993f261
 2021-08-13 19:18:46 +00:00
TreeHugger Robot
d3a02937ce [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad4634164373b9bdfff5b8a8ad9895c9696bca40
 2021-08-13 19:18:31 +00:00
Bill Yi
04c33bbf71 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
 2021-08-13 19:17:59 +00:00
TreeHugger Robot
dcd45dca23 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 96bd289bf7 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I839612513661798114919779ada40826ca56c22f
 2021-08-13 19:12:49 +00:00
TreeHugger Robot
87a7ebe1d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 19:08:56 +00:00
TreeHugger Robot
d7c6436ea4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours am: bd1e418efc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1e5798698816606874a2a0484483676c0a8a4395
 2021-08-13 18:57:30 +00:00
TreeHugger Robot
edcd71932d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours am: 652c469f3e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic5bf78646bd77133d4be55f6a6f1efb5945fbf48
 2021-08-13 18:57:07 +00:00
TreeHugger Robot
4ea6925fef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours am: 612fb2cb80 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ife677d18adbe03098d2bc79838a43f4160edd214
 2021-08-13 18:56:45 +00:00
TreeHugger Robot
bffa291613 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp am: afa6f208d0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551919

Change-Id: Ib8fe9ef33a165a53b8a6666bfc5168a9aa319910
 2021-08-13 18:56:17 +00:00
Bill Yi
9a2aa2693b [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 am: f13f8b9065 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I930287a57bec566acad4a3689a47f5b873125ea0
 2021-08-13 18:56:16 +00:00
TreeHugger Robot
cc5b59c9a4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I43fffed8c0c65794a17abeaea2a64e76a318000e
 2021-08-13 18:56:01 +00:00
TreeHugger Robot
7508bd0cd2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4fcd4bde39ddac78133671de50de523056314084
 2021-08-13 18:55:57 +00:00
TreeHugger Robot
bd1e418efc [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 737f4d76c9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I793e523c10810844fb64372eb180a0e407781c77
 2021-08-13 18:55:56 +00:00
TreeHugger Robot
3759660383 Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp am: 255f31826f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551913

Change-Id: I9b261d4912dc44f2e51bb93cfbd840cff2ed3103
 2021-08-13 18:55:50 +00:00
Bill Yi
4948e577ec [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c am: f13d3514ec -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1f4451bf15b34bf43549634694a5ef4726739d9
 2021-08-13 18:55:49 +00:00
TreeHugger Robot
652c469f3e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 65d286f6a9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I815717369e7fc642b3180aaee3e88b496998ee9d
 2021-08-13 18:55:20 +00:00
TreeHugger Robot
612fb2cb80 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I38366b1c022b346a321b3f9b1d6206a750a4804a
 2021-08-13 18:55:15 +00:00
TreeHugger Robot
96bd289bf7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: b75551a41c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I947c5595859294f600c17d4d3286769211f2e7a3
 2021-08-13 18:54:45 +00:00
TreeHugger Robot
a755975337 Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp am: 3f6005944c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551901

Change-Id: I82e3a26cc692f9e4ac6f4b290cd98f62b9af17e4
 2021-08-13 18:54:37 +00:00
Bill Yi
329d98ec28 [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8 am: db32ad43da -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ia4d00cbba0360017a08fcb0afbf0dbdf07ed3e06
 2021-08-13 18:54:36 +00:00
TreeHugger Robot
737f4d76c9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:50:16 +00:00
TreeHugger Robot
afa6f208d0 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:45:05 +00:00
TreeHugger Robot
255f31826f Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:45:05 +00:00
TreeHugger Robot
693cecdc4f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: de4d5cb3f9 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If6655610b1bb63b2fccf1ac6a80c0d6546258bc5
 2021-08-13 18:40:01 +00:00
TreeHugger Robot
b75551a41c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:39:35 +00:00
TreeHugger Robot
3f6005944c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d9ba125bb8
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-13 18:39:35 +00:00
Bill Yi
b03c6ba2ca [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: 4a7acc1636 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibf21530c978fe920d3f855aae80f6ab898d4caac
 2021-08-13 18:39:26 +00:00
TreeHugger Robot
e4de411880 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours am: e245bf8e66 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I330cd109eef07b6ad94f221b946ac70c46f6f484
 2021-08-13 18:33:43 +00:00
Bill Yi
4d68983581 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -s ours am: e7eff15e83 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6cc31a337e002d9cddd3e5c42966a0059a0786c3
 2021-08-13 18:32:56 +00:00
TreeHugger Robot
de4d5cb3f9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -s ours am: ede03fcc17 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I31207099de86903024e9d1b4a7e272e312a5cfcf
 2021-08-13 18:22:30 +00:00