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

84452 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
2180784c46 [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a -s ours am: 74305a655a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9fc84c95f481cbb8dd75d47047dc99cc11b977bd
 2021-09-09 22:11:53 +00:00
Bill Yi
74305a655a [automerger skipped] Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" am: f4e2f69f3a -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic4f2be01ba3bd1251dda73f1852463b5e6b6b5f3
 2021-09-09 21:39:31 +00:00
Bill Yi
f4e2f69f3a Merge "Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE" 2021-09-09 21:27:25 +00:00
Treehugger Robot
8a57649765 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa am: fbf2d0bc55 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: Iaf54828eaec9c24a83aaddec90d775dafab6dd34
 2021-09-09 10:46:10 +00:00
Treehugger Robot
fbf2d0bc55 Merge "Remove the option of resetting Euicc data." am: 604c7a7cfa 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1804237

Change-Id: I74de819b9c6eefb93d9447efe8398ddd27470933
 2021-09-09 10:28:50 +00:00
Treehugger Robot
604c7a7cfa Merge "Remove the option of resetting Euicc data." 2021-09-09 10:09:30 +00:00
TreeHugger Robot
514c49510d Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master am: bb1dd00d0b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723688

Change-Id: I6968521de3a4ac2bccc83d934c2c9c897fb10fce
 2021-09-09 10:00:22 +00:00
TreeHugger Robot
bb1dd00d0b Merge "Fix Text of VoLTE setting cannot be updated when SIM state is changed" into stage-aosp-master 2021-09-09 09:47:14 +00:00
Bill Yi
77c6ea6e80 Merge RQ3A.210905.001 to aosp-master - DO NOT MERGE 
Merged-In: I1f20e829bf513d8166458e1749bcc8c9fade07b2
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Merged-In: I1a723b5c0ca89f4c8d2e6b5fc3d76518099d7117
Change-Id: Icad4036f299d2b082cc617b82f9f900a0f23aa96
 2021-09-08 17:57:10 -07:00
pingzhi wang
860216208f Remove the option of resetting Euicc data. 
Euicc reset option should not be available on devices that do not
support embedded sim cards.

Test: make SettingsUnitTests
Test: Build device without FEATURE_TELEPHONY_EUICC and check in Settings/System/Reset options
Bug: 197280361
Change-Id: I24cc65fbe0f8e3c4f1cf792a7b8c5dbfc49d469b
 2021-09-08 17:34:30 +02:00
Kevin Chyn
49bbd5b893 [DO NOT MERGE] Update enrollment edu asset am: 0b40e09ba6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15783087

Change-Id: Ie1964e499bc6a11499590de5a69f75539939ce3a
 2021-09-08 08:25:40 +00:00
Kevin Chyn
0b40e09ba6 [DO NOT MERGE] Update enrollment edu asset 
Bug: 198858684
Test: Build, enroll
Change-Id: I71dc7b20cd1e2f1805af3214e161feb1f2267ab6
Merged-In: Ic6e589ce738c8b1b82f892452518e4540a73f94b
 2021-09-08 00:09:13 -07:00
Presubmit Automerger Backend
77e02cbb71 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d770312ec1 
Blank merge reason: commit message contains skip directive

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

Change-Id: I82346cae7ca0fe69c3ad76815a9becf036c38ba2
 2021-09-07 23:51:48 +00:00
Bill Yi
d770312ec1 Import translations. DO NOT MERGE ANYWHERE 
BUG:198847997

Auto-generated-cl: translation import
Change-Id: If6593d714c5df86182cf3c7c9d380bc6acd0f296
 2021-09-07 23:51:36 +00:00
Presubmit Automerger Backend
585d501aff [automerge] RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 2p: e7849fb0dc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763850

Bug: 198858684
Change-Id: If065d05e56a573f40969fb780299099a38b548b0
 2021-09-07 01:57:06 +00:00
Curtis Belmonte
e7849fb0dc RESTRICT AUTOMERGE Support UDFPS multi-stage enrollment 
Adds support for showing multiple stages during UDFPS enrollment:
1. Initial touch & center enroll
2. Guided enroll (or continued center enroll for a11y)
3. Fingertip enroll
4. Edge enroll

Test: Manual

Bug: 198858684
Change-Id: I6646db9038d236eca6d6d62e1c7ddf7649e4945e
Merged-In: Ifda20133f1ee90c9e1612e9066c19efbb6ffc9cd
Merged-In: Ic12b85bd6f8f1d4068952eb83bcc8a1df21f2e8e
 2021-09-06 18:56:38 -07:00
Curtis Belmonte
4f2f0ed6d5 [automerge] Update char limits for new UDFPS enroll strings 2p: 4592bf62a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763831

Bug: 198847997
Change-Id: Id730b3ccfada949186db2ab61046ee57ca0b82dc
 2021-09-05 00:11:08 +00:00
Curtis Belmonte
4592bf62a3 Update char limits for new UDFPS enroll strings 
Adds a character limit of 80 for titles and 160 for subtitles to be
shown as part of multi-stage UDFPS enrollment.

Test: Presubmit
Bug: 198847997
Change-Id: Ib85d1dc4f9bb127d641c84411f4dff2736484a5a
 2021-09-04 17:08:01 -07:00
Presubmit Automerger Backend
8d82ccdc24 [automerge] Add new strings for UDFPS 4-stage enrollment 2p: c84e18b253 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15763427

Bug: 198847997
Change-Id: I5ba1c5d10c85b1dec25f4f2438439924585d9c3b
 2021-09-04 20:49:34 +00:00
Curtis Belmonte
c84e18b253 Add new strings for UDFPS 4-stage enrollment 
Adds strings that will be shown during the new tip and edge enrollment
stages of the UDFPS enrollment flow.

Test: Presubmit

Bug: 198847997
Change-Id: I11a9889ec0e5079c3531367bfa397a1910f42af6
 2021-09-04 13:48:28 -07:00
Bill Yi
e183f5a054 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 6178db1a47 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie81fba7f2c1f2de6a35d4e83919474b1c43819fc
 2021-09-03 20:55:47 +00:00
Bill Yi
a4512d2431 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: a8c5a69b8d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idcd291d6f5de8bb470df5b33500429d37352e9de
 2021-09-03 20:55:42 +00:00
TreeHugger Robot
871ba0bacd [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours am: 20a3a9ac3d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I48291282e1ad8e0f48096f582780069ab4107380
 2021-09-03 20:55:29 +00:00
Bill Yi
6178db1a47 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:35:13 +00:00
Bill Yi
46a1f58755 Merge changes from topic "presubmit-am-c450d64797ce40598b6fa0f94b2a20cc" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 20:35:13 +00:00
Bill Yi
a8c5a69b8d Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-09-03 20:34:05 +00:00
Bill Yi
097d024fe5 Merge changes from topic "presubmit-am-ff6018241da04015a5a99109298dc1df" into sc-dev-plus-aosp 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20
  Import translations. DO NOT MERGE ANYWHERE
 2021-09-03 20:34:05 +00:00
TreeHugger Robot
20a3a9ac3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a08ae6df50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I21533a0770fa30d42849b0ed39e6d21c3651a4a0
 2021-09-03 20:22:37 +00:00
Bill Yi
9df033b383 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours am: fcec6efb01 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic31a5b9d69690b2df25a695cfbc30d5a064d5baf
 2021-09-03 20:04:35 +00:00
TreeHugger Robot
a08ae6df50 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-09-03 20:03:25 +00:00
Bill Yi
fcec6efb01 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fd1a0ef0ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I829fa5fbd3cc0525bcf3819e6c499d57c278110d
 2021-09-03 19:55:43 +00:00
TreeHugger Robot
c1074b5f62 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours am: 3a95d44f50 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0dc5b576460cc5b337f77926ca9666ffedf4f96c
 2021-09-03 17:34:02 +00:00
Bill Yi
a8d332257c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours am: de3754f4bf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I7f5e43f26006eeac146ea0d3d4ffa00eca6aaa05
 2021-09-03 17:33:40 +00:00
TreeHugger Robot
3a95d44f50 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: f1780afb1e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4501ee71cd0c08085d6b3738707f1cfc7f351cf8
 2021-09-03 17:17:35 +00:00
Bill Yi
de3754f4bf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c71f1a2fce -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie2d61e3f19685d48ff4679f4b030bd94bb4b86b7
 2021-09-03 17:15:14 +00:00
TreeHugger Robot
f1780afb1e Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-09-03 16:50:43 +00:00
YUKAI HUNG
fab65bcfe5 Merge "Hide Camera background running time in the battery usage screen" into sc-dev am: 3f1d329878 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15723822

Change-Id: I39400598833b3de8ae60b6c9901fdbcc6015a16f
 2021-09-03 02:48:48 +00:00
YUKAI HUNG
3f1d329878 Merge "Hide Camera background running time in the battery usage screen" into sc-dev 2021-09-03 02:33:22 +00:00
Bill Yi
78c0f840f7 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 1336ffec20 
Blank merge reason: commit message contains skip directive

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

Change-Id: I11ad2115f0880746355ebc438586a606c5a0cc7a
 2021-09-02 13:42:07 +00:00
Bill Yi
1336ffec20 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I1f957d47f370a5379c50a87a032f614ffb58ae76
 2021-09-02 13:41:52 +00:00
Bill Yi
fefa801325 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: fb4f0b0820 
Blank merge reason: commit message contains skip directive

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

Change-Id: Id0c33c816383e6f8336bac7c1f4a8a065df86f5d
 2021-09-02 13:31:27 +00:00
Bill Yi
fb4f0b0820 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I00320830b2c3434b32e8db54606c9ec4291c6cf7
 2021-09-02 13:31:17 +00:00
Bill Yi
8382ada407 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ie45277d6008c75304a24f48190cf27e6ed197a88
 2021-09-02 13:26:44 +00:00
Bill Yi
fd1a0ef0ac Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I12d781cb74cf9be4f67fd75b397d5d05ea244818
 2021-09-02 13:23:16 +00:00
Bill Yi
c71f1a2fce Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ib76b04af514d6c2179f8f56a4e1ef47885e595cc
 2021-09-02 13:11:52 +00:00
Bill Yi
4f514d351e Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I964e86741a41b4135f26b107e2ce0cbe713a463d
 2021-09-02 13:06:49 +00:00
Treehugger Robot
fb1bf5f85e Merge "Support multi-users for NFC payments" am: 6eb702ed63 am: 6eb3f3bf90 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I897892c6f9bf29174775917568a9e83714b74af2
 2021-09-02 09:25:52 +00:00
Treehugger Robot
6eb3f3bf90 Merge "Support multi-users for NFC payments" am: 6eb702ed63 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1778405

Change-Id: I1f20e829bf513d8166458e1749bcc8c9fade07b2
 2021-09-02 09:17:20 +00:00
Treehugger Robot
6eb702ed63 Merge "Support multi-users for NFC payments" 2021-09-02 08:56:28 +00:00
Joe Bolinger
46470d911e Merge "Remove sliceable attribute from biometric preference controllers." into sc-dev am: c7a0b63dd9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15546133

Change-Id: I8423ebeee18eb6e9213a2e45bc5f2eed3a19aabd
 2021-09-01 01:25:27 +00:00