PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,914 Commits 1 Branch 0 Tags
a7ccdf821c7de082875fbab92ed967f462a2094d
Commit Graph

113914 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
sayakiitg
9b432d54a6 Revamp SD card UX 
Improve the SD card setup flow so that each formatting option is provided in a separate screen with clear description and illustration.Also make sure that guest users do not have any access to formatting options.

Test: Manual testing on Pixel Device
Screenshot1: https://screenshot.googleplex.com/WJwyxFkBtbSfZmN.png
Screenshot2: https://screenshot.googleplex.com/3oBcrrgRsKTxNPC.png

Bug: 201252175
Change-Id: I77df55c40fd99cabcfc6128084be035bb5b19531

Change-Id: I757abc6076fcc8f467d8faed9f090bcdd5774ff3
 2022-07-29 10:21:49 +00:00
Bonian Chen
244f21d9d7 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I1c79864417df3c542538634621cb0458a892d926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 10:11:11 +00:00
Hugh Chen
add26a28a5 Merge "Refactor the condition order" 2022-07-29 09:18:05 +00:00
Bonian Chen
4ec8323bad resolve merge conflicts of 81d1cd0871 to stage-aosp-master 
Test: Build pass this conflict resolution.
Bug: None
Change-Id: Iaacaeaa579025deee52b29b4b1245fc7c0fa0346
 2022-07-29 07:34:35 +00:00
Chaohui Wang
07fcddaecc Merge "Clean up unused string resources" 2022-07-29 07:10:50 +00:00
menghanli
b9194c4eb8 Minor change for CaptionAppearanceFragment 
1. Move unnecessary public variables into local variables
2. Use %s to update locale preference summary
3. Correct the test case name of CaptionPreviewPreferenceControllerTest

Bug: 197695932
Test: make RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.accessibility
Change-Id: I58d4d590b9b6d46c27d389217f846a780d755891
 2022-07-29 14:33:43 +08:00
Treehugger Robot
81d1cd0871 Merge "Settings: Make NetworkScanHelper max search time customizable" 2022-07-29 05:37:46 +00:00
Omer Osman
b61e129f35 Add support for selection of Opus in Developer Options 
Stub implementation for LC3 is added due to the interfaces being
present. The BT stack does not currently implement LC3 over A2DP.

Bug: 226441860
Test: BluetoothCodecDialogPreferenceControllerTest

Change-Id: I40546c97370872b37c0258d10e67a3871f9d9af5
 2022-07-29 05:23:55 +00:00
Hugh Chen
5cf2b7ff1f Refactor the condition order 
Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: Ic9e8c775b044fffd5dec5047fb53d75209418d85
 2022-07-29 02:45:12 +00:00
Himanshu Rawat
563e0e0a01 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev am: b0a9ebae0a -s ours am: 47f53bd833 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Id5e7647f51fc38fc2ebfa4395707f4fc5dec01f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 01:11:51 +00:00
Himanshu Rawat
3284551c96 [automerger skipped] Don't cancel passkey entry pairing autonomously am: dc7aa0e87f -s ours am: 63b0e4d7c9 -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I1cf6fa568eb8caad6944d909664a155ec18fce04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 01:11:47 +00:00
Himanshu Rawat
47f53bd833 [automerger skipped] Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev am: b0a9ebae0a -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: Ife2e91dc36b658e806fbb8ad93bc59e627350fb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 00:54:09 +00:00
Himanshu Rawat
63b0e4d7c9 [automerger skipped] Don't cancel passkey entry pairing autonomously am: dc7aa0e87f -s ours 
am skip reason: Merged-In Ifdb98c16084dd811eed68469e7df5d1913c6ace8 with SHA-1 aa1950fd80 is already in history

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

Change-Id: I24e358517dfa629de3e2c936410ae6d254bc5e86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 00:54:04 +00:00
Himanshu Rawat
b0a9ebae0a Merge "Don't cancel passkey entry pairing autonomously" into tm-qpr-dev 2022-07-29 00:27:41 +00:00
Eric Biggers
5a94d2ccc2 UserCredentialsSettings: remove unneeded checks for locksettings keys 
Since Android 12 (frameworks/base change
Iac339e64812232875afa9dc6109b848b50b0ef2f), the locksettings keys are in
their own key namespace.  Therefore, they are no longer included when
UserCredentialsSettings enumerates the keys in the app namespace, so
there is no longer any need to explicitly ignore these keys.

This is a cleanup that is a prerequisite for a cleanup in locksettings
where LockPatternUtils.SYNTHETIC_PASSWORD_KEY_PREFIX will be renamed and
have its visibility reduced.  No change in behavior intended.

Test: Added temporary logging of all key aliases enumerated by
      keyStore.aliases() in getCredentialsForUid().  Set an LSKF, and
      went to the User Credentials page in the Settings app.  Verified
      via logcat that the locksettings keys aren't being enumerated.
Change-Id: If9040b55a5743c9b0e174538f67c669e864f0312
 2022-07-28 17:22:36 +00:00
TreeHugger Robot
1d001d6c1d Merge "Let advanced VPN profile visible immediately before the user consent to use VPN feature" 2022-07-28 11:53:16 +00:00
Milton Wu
6b6d8c0d6d Refactor BiometricEnrollBase::onStop() 
During BiometricEnrollBase::onStop(), it judeges activity result and
determine finishing self or not by a common rule. And it causes some
problems.
1. It may override original setResult() which was set by its child
   activity.
2. If we change the judgmental rule in BiometricEnollBase, we need to
   manully test all override class cases to make sure everything works
   well. It makes us hard to change the criteria here.

Move code in BiometricEnrollBase::onStop() to its extended class to have
more flexiable.

Bug: 197717071
Test: Run ROBOTEST for SetupFingerprintEnrollIntroductionTest
      SetupFingerprintEnrollFinishTest FingerprintEnrollEnrollingTest
      FingerprintEnrollFindSensorTest FingerprintEnrollIntroductionTest
      SetupFingerprintEnrollFindSensorTest
Test: Manully test fingerprint/faceauth flow in settings or SUW

Change-Id: I5d6c63cf537c0146bc03bd2b36ee3e1d68918a19
 2022-07-28 10:29:08 +00:00
Hugh Chen
f03cbcf83b Let advanced VPN profile visible immediately before the user consent to use VPN feature 
- This CL will check whether advanced VPN apk is exist or not,
  and if so then show the preference of advanced VPN in the
  "Settings > Network & internet > VPN".

Bug: 239984274
Test: atest -c VpnSettingsTest
Change-Id: I8c11c7f2079d6ebec6c691b8bf2fb26dfc450663
 2022-07-28 09:48:18 +00:00
Chaohui Wang
5d4488e7f4 Clean up unused string resources 
Bug: 234570979
Test: make Settings app
Change-Id: Ic0166c5dd45fb28f5d53920ed7b5e69384fa1e82
 2022-07-28 15:05:02 +08:00
Simon Wingrove
3f2120f6a4 [automerger skipped] Merge "Bool to note Pending Intent bug fixed" into tm-qpr-dev am: 5d68dd58aa am: 59183b0e32 -s ours 
am skip reason: Merged-In I478dd5fbd53d1dafd049e392a186d9796dd179cb with SHA-1 da96b47ce8 is already in history

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

Change-Id: I04410a2c68dbc63ea0368dc0749e34ebca46fb45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 21:20:24 +00:00
Simon Wingrove
59183b0e32 Merge "Bool to note Pending Intent bug fixed" into tm-qpr-dev am: 5d68dd58aa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19321786

Change-Id: I6c0058301c05a0faf123216c6df558bcacf388a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 20:40:46 +00:00
Simon Wingrove
5d68dd58aa Merge "Bool to note Pending Intent bug fixed" into tm-qpr-dev 2022-07-27 20:19:42 +00:00
Julia Reynolds
bec6d10a80 Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214da am: 197091ca8a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082

Change-Id: Icd88b407b2fbfd0f76f62e32586179fb4ee50559
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 13:33:35 +00:00
Julia Reynolds
197091ca8a Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev am: 45bcb214da 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19416082

Change-Id: Ie0c44628c38787a16cf055bf5a92c60071f7eaae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 13:19:58 +00:00
Julia Reynolds
45bcb214da Merge "Only show the channel toast if users expressly ask for it" into tm-qpr-dev 2022-07-27 13:11:50 +00:00
Arc Wang
03182b5781 Merge "Avoid 2-pane deep link before gone through Setup Wizard" 2022-07-27 06:26:51 +00:00
Weng Su
0553d8fbe5 Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581fe7 am: 17070ee0c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394734

Change-Id: I505207cbd0ea7250583416c7fdfd898de6175948
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 04:53:46 +00:00
Weng Su
17070ee0c4 Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev am: b4ad581fe7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394734

Change-Id: If5fbf81277d74626b246338d0e9f3d010805262f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 04:42:53 +00:00
Weng Su
b4ad581fe7 Merge "Restrict WifiScanModeActivity for guest user" into tm-qpr-dev 2022-07-27 04:31:05 +00:00
TreeHugger Robot
99de6b6693 Merge "Update trapezoid validation in battery chart view." 2022-07-27 04:17:17 +00:00
Tsung-Mao Fang
1ad5aa87c2 Set an action name for wallpaer index am: 0f7b80f47f am: 68fa74625c am: ec0e4b41f4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: I29c73c7bae6e84b2ebc644be62d5dabecdcfe7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:44:08 +00:00
Tsung-Mao Fang
994d27d9df Set an action name for wallpaer index am: 0f7b80f47f am: b0f9134441 am: fefafaabf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: I9543c8cc2c92ddfcfae4554d081f1b16a0e53479
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:43:45 +00:00
Jason Chiu
633971775b Merge "Enable ignored slice provider tests" 2022-07-27 03:31:32 +00:00
Arc Wang
be2ea9eb39 Avoid 2-pane deep link before gone through Setup Wizard 
To improve security.

Fix: 238391432
Test: manual
      Flash ROM and check 2-pane bebavior
Change-Id: If96c645319d9df45930644fd438cf479462685b0
 2022-07-27 11:27:33 +08:00
Tsung-Mao Fang
ec0e4b41f4 Set an action name for wallpaer index am: 0f7b80f47f am: 68fa74625c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: Ica13f797d30a9a5c8c68e93b107b62f89c032f3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:22:41 +00:00
Tsung-Mao Fang
fefafaabf1 Set an action name for wallpaer index am: 0f7b80f47f am: b0f9134441 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: Idfbf2786117d7e264b1da6f1101da99db23b76c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:22:00 +00:00
Tsung-Mao Fang
68fa74625c Set an action name for wallpaer index am: 0f7b80f47f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: Id464e7cb46590b003ecb2fab9d73b69fc14fda9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:02:38 +00:00
Tsung-Mao Fang
b0f9134441 Set an action name for wallpaer index am: 0f7b80f47f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19394202

Change-Id: Ibcfaa3afcbe2fde0a00c717883c3007bdecb0ac9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-27 03:02:35 +00:00
Menghan Li
6544dee983 Merge "Refactor CaptionAppearanceFragment to improve maintainability (5/n)" 2022-07-26 22:18:44 +00:00
TreeHugger Robot
47a609fae5 Merge "Grant CONTROL_UI_TRACING permission to Settings app (2nd try)" 2022-07-26 20:51:19 +00:00
TreeHugger Robot
6c39e471b7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 96bc6ca196 -s ours am: 058c5b262d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I73439d95d030377adaea2e450894497aa5f9d15a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 17:07:01 +00:00
Bill Yi
ec9d6133d6 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: babd7f1cc6 -s ours am: 58514f6237 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iba5b5ab88b45798684f7f348f9a782b59548c6e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 17:06:38 +00:00
Bill Yi
451bfb195e [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2d0fd7f558 am: 011d462ac4 -s ours am: f49b1b5f37 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Id1557370bbae0fb8613d22d95cfc7843fcb851c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 16:56:31 +00:00
TreeHugger Robot
acf051b632 Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev am: bcfe28d0a9 am: b4e676f341 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749

Change-Id: Ia31d866c84efc068c9de21e9f8c87fc1fc757922
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 16:53:27 +00:00
TreeHugger Robot
b4e676f341 Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev am: bcfe28d0a9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19114749

Change-Id: I6608b83db79c615c66915f9b4bec0e670758fcb6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 16:37:10 +00:00
TreeHugger Robot
bcfe28d0a9 Merge "Add dock charging state into stay awake feature (1/2)" into tm-qpr-dev 2022-07-26 15:42:37 +00:00
Julia Reynolds
d9da74762e Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91f8 am: 397c885c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19419547

Change-Id: I63bd0eb21941240d8b36348fa6b9a0f8d3bb9119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 15:32:06 +00:00
Julia Reynolds
397c885c46 Merge "Revert "Improve App notification loading"" into tm-qpr-dev am: 6a110b91f8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19419547

Change-Id: Ib22e2fc711b81772e7ddbafd786181bf694b46d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-26 15:13:06 +00:00
Julia Reynolds
6a110b91f8 Merge "Revert "Improve App notification loading"" into tm-qpr-dev 2022-07-26 14:56:20 +00:00
Zaiyue Xue
532defdc85 Update trapezoid validation in battery chart view. 
If the battery level data cannot be gotten for an hour, ag/19358207 changes the level indication from 0 to null. This cl updates the battery chart view trapezoid validation logic from checking the level not zero to not null.

Test: manual
Bug: 236101166
Change-Id: I240f2b02b94ba1a3d99022c7c72a7a5adb21f9a5
 2022-07-26 18:04:00 +08:00