PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
85,121 Commits 1 Branch 0 Tags
f75d95cc99017f803b9f7366df2f7977de0a84d5
Commit Graph

85121 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
1e988be985 Merge changes from topic "presubmit-am-febb5148f3864699b2afc6cf79966010" into sc-mainline-prod 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb
  Import translations. DO NOT MERGE ANYWHERE
 2021-08-17 22:04:16 +00:00
TreeHugger Robot
fbc5473058 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours am: 9aeb396178 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9791ccc8a20c6497f2a4901dfde213e4394d0c6c
 2021-08-17 20:46:05 +00:00
Bill Yi
d63b6c0428 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours am: 3e49192ffc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib09c9a3cc1329de1014329bd2402134951076d3e
 2021-08-17 20:45:55 +00:00
TreeHugger Robot
9aeb396178 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7b04dbbc9369c89ca837fe2dccb86a3c9445dbdb
 2021-08-17 20:28:48 +00:00
Bill Yi
3e49192ffc [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I983cb558895e64cd0455dbe51eb169e0fe7bd634
 2021-08-17 20:28:41 +00:00
Bill Yi
27b0252afa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours am: fa3505fdd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I60a5373e66911dbf1652d49b385dd78c46ec79ac
 2021-08-17 20:20:53 +00:00
TreeHugger Robot
dd0e1a338c Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-17 20:14:28 +00:00
Bill Yi
fa3505fdd8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
 2021-08-17 20:06:51 +00:00
Bill Yi
8d94de2962 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb 
Blank merge reason: commit message contains skip directive

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

Change-Id: I82e01f7a48919bec7e5d1d97788d7b72e239d831
 2021-08-17 05:49:49 +00:00
Bill Yi
d1e4f888fb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
 2021-08-16 22:49:25 -07:00
Bill Yi
1e656787ee [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 21392f9ffb 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ia8dff8797c03100a053ce9182e4b38b4b65a6ead
 2021-08-17 05:35:19 +00:00
Bill Yi
21392f9ffb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
 2021-08-16 22:35:06 -07:00
Bill Yi
25b3ab76e4 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I4be1756b35504ec9d49bc7b8d6bd7b7e753aae8b
 2021-08-16 22:29:11 -07:00
Bill Yi
f82b80a567 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
 2021-08-16 22:24:38 -07:00
Bill Yi
04d698d1f6 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic2f525f57921de3a484758f4513e98310b41bab3
 2021-08-16 22:14:41 -07:00
Bill Yi
6f047583bc Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I6680983f470525631710e359072fe27a81a322be
 2021-08-16 22:09:54 -07:00
Bill Yi
9b333b2dcb Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: If452267fcdb2a76d571f3526b1da4aa1261dec64
 2021-08-16 22:05:07 -07:00
Bill Yi
a687e17227 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Iaed09e1a4628fec8391ad74d6eb451c8dbb997a0
 2021-08-16 22:02:55 -07:00
Curtis Belmonte
fe7d4e0100 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev am: 7fb2316a21 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15585467

Change-Id: I3be1462474321f1834f44cd193836ec71dd20542
 2021-08-17 01:01:21 +00:00
Curtis Belmonte
7fb2316a21 Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev 2021-08-17 00:47:58 +00:00
Curtis Belmonte
562d29d081 Merge changes from topic "presubmit-am-50cf8052ea594bbfb9d45e820e7b72cd" into sc-mainline-prod 
* changes:
  [automerge] Remove/replace old fingerprint icon in SUW/Settings 2p: dc9b53c446
  Remove/replace old fingerprint icon in SUW/Settings
 2021-08-17 00:47:58 +00:00
Yomna Nasser
862a35d7fb 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: I336dfff8e36549bc33431748f60fa88650a8ea01
 2021-08-17 00:29:40 +00:00
Yomna Nasser
cf77b7a248 Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev 2021-08-17 00:12:39 +00:00
Curtis Belmonte
5cf728d2fc [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: Ib847b70e4bc427d4f3c3b78f67a68b63b71d74c8
 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
1f7d2deea8 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-13 21:05:09 +00:00
TreeHugger Robot
c085a61fd0 [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: I608f72806c1a3d0e185b8601219a974d40b7d86f
 2021-08-13 19:31:55 +00:00
Bill Yi
6201a4e960 [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: Ia6105cd88e33d694007a838a9c0ea16429299e98
 2021-08-13 19:31:51 +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
87a7ebe1d9 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-13 19:08:56 +00:00
TreeHugger Robot
33be7e6138 [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: Ica2a7ed4e2fef26f5759c7d03f5ed9edd7caf002
 2021-08-13 18:56:42 +00:00
TreeHugger Robot
e997850db8 [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: I1547edb01a1d748dc3fa16d4ce0639b259cc6a62
 2021-08-13 18:56:23 +00:00
TreeHugger Robot
b351f3d8b8 [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: Id595e027bc0f7521f75cdab26eb25e4b500bcfeb
 2021-08-13 18:53:56 +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
4ffb6a3802 Merge changes from topic "presubmit-am-721dec71ccbe4d0dbf043884e732f7a9" into sc-mainline-prod 
* 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
0c9c334b1c Merge changes from topic "presubmit-am-3e93273879994225a8d8eeed67c1ef7b" into sc-mainline-prod 
* 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
b75551a41c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-08-13 18:39:35 +00:00
TreeHugger Robot
8fc6977e1c Merge changes from topic "presubmit-am-68e20da25bf941f39d414fc5cb3e17a3" into sc-mainline-prod 
* 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
TreeHugger Robot
dbb7ff17bb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod 2021-08-13 18:31:09 +00:00
TreeHugger Robot
b56e57822e [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: If914be129437f95b93643e6a99d8cc2b85338ae5
 2021-08-13 18:21:42 +00:00
Bill Yi
325b0477ce [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -s ours am: 7eb41e014f -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: Id85c17d8f0f7dbd160a24ab8d9e08b9a8e617a33
 2021-08-13 18:21:27 +00:00
TreeHugger Robot
ede03fcc17 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4 -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: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
 2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3 -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: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
 2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-13 17:59:41 +00:00
Bill Yi
15ab7d0c6c [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d486302dc9 
Blank merge reason: commit message contains skip directive

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

Change-Id: Ic389c7c140da5623b3ace0ee55848a2d155144a1
 2021-08-13 03:49:10 +00:00
Bill Yi
d486302dc9 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
 2021-08-13 03:48:58 +00:00
Bill Yi
9dba803711 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f30152962c 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id2e759302f5447f9c2996cff8c409139e6ec8bcc
 2021-08-13 03:42:40 +00:00
Bill Yi
f30152962c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
 2021-08-13 03:42:27 +00:00