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

113677 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
62fe245c46 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4a547374df -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I0e3092590b7dc1d052a5d6bb4a695dcb7b661cda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-01 16:58:13 +00:00
Jason Chang
88c49e3257 Fix RTL issue on fingerprint setup screens in landscape mode 
1. Add an RTL layout dimension for enrolling page.
2. Handling device rotation landscape 270/90 degrees with
layout dimension in LTR or RTL language.

Bug: 237104754

Test: manually verified on Settings > Security > Face & Fingerprint
Unlock > Fingerprint Unlock > Touch & Hold fingerprint sensor page

Test: make RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.fingerprint
.FingerprintEnrollEnrollingTest"

Change-Id: If4770d885d97c6bf4cfebefdf9cfa0b4ee0b995b
 2022-08-01 19:02:50 +08:00
Kuan Wang
0dc8d58de5 Add the async task to compute diff usage data and load labels and icons. 
Bug: 236101687
Test: make RunSettingsRoboTests
Change-Id: Ie24ea89fa6cfd351c73e64de40e2c9315867af9a
 2022-08-01 18:45:00 +08:00
YK Hung
a0d8b1fbc6 Merge "Improve X axis labels in battery chart (2)" 2022-07-31 16:07:05 +00:00
TreeHugger Robot
ebb5a056d2 Merge "Improve X axis labels in battery chart (1)" 2022-07-31 02:52:19 +00:00
Menghan Li
0494c4540c Merge "Minor change for CaptionAppearanceFragment" 2022-07-30 22:45:28 +00:00
Zaiyue Xue
a14c9dfc4f Improve X axis labels in battery chart (2) 
Support showing different numbers of labels for different count of
trapezoids.

screen_record: https://drive.google.com/file/d/1CIgppQllHlKC3BGG7hBvOjGDGVOs6OYC/view?usp=sharing&resourcekey=0-mbofu5KOO2dqCwL7K0zakg

Test: manual
Bug: 239491373
Bug: 236101166
Change-Id: I865dae760b491bdd7c93bbd29fd7dbc33204a60a
 2022-07-30 15:24:06 +00:00
Zaiyue Xue
e9ab2f5365 Improve X axis labels in battery chart (1) 
Support showing labels under the trapezoids instead of between the
trapezoids. For daily chart, the labels are under the trapezoids, for
hourly chart, the labels are between the trapezoids.

Test: manual
Bug: 239491373
Bug: 236101166
Change-Id: I2efb5192d4baafc7745ce269224639511848293e
 2022-07-30 15:23:28 +00:00
Sayak Dutta
9e6c889abe Merge "Revamp SD card UX" 2022-07-30 13:04:25 +00:00
TreeHugger Robot
eb1f39499b Merge "Support daily and hourly battery chartview." 2022-07-30 09:00:29 +00:00
Zaiyue Xue
eaf4d1bb50 Support daily and hourly battery chartview. 
https://drive.google.com/file/d/1vjt6FPFAiFakb158t1IBku1IQNzVPW46/view?usp=sharing&resourcekey=0-f5m2eUKWbth6gdEFh5lOIQ

Test: manual
Bug: 236101166
Change-Id: I47d899b936742514801cd4fa7a82ddaea5d21c31
 2022-07-30 14:44:41 +08:00
Bill Yi
4a547374df Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ic8c471db2d76a88f53565f86acf582afa5fa302f
 2022-07-29 15:21:32 -07:00
Bonian Chen
db4a6cf215 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46 am: 1e744b4e66 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I056de36c838732748f0cf445075ae87f4269a2e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 11:09:22 +00:00
Bonian Chen
1e744b4e66 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 am: 8097546f46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: I0ed7b6a1178d1827079723b7d3283cbb91981b2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 10:43:54 +00:00
Robert Luo
061a87fe1f Allow advanced VPN to manage connection status via its UI 
Bug: 238641532
Test: atest -c VpnSettingsTest
Change-Id: Ia6f1d84bba38bab7f13f46dc8a4fdb4eb0505f8f
 2022-07-29 18:31:13 +08:00
Bonian Chen
8097546f46 resolve merge conflicts of 81d1cd0871 to stage-aosp-master am: 4ec8323bad am: 244f21d9d7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19465627

Change-Id: Ifabb14e5aadcbaf55095c5fccea5adabc0da5b40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-07-29 10:27:37 +00:00
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
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