Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,651 Commits 1 Branch 0 Tags
79042f2d285723118b406b00f3bcba33d17fb1cd
Commit Graph

44461 Commits

Author SHA1 Message Date
Arc Wang
79042f2d28 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd am: 85768c5916 am: ee4c9b6a11 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Icfbb8218dcba3ad95d6d0ba8f9995c4cceb53f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 04:49:01 +00:00
Arc Wang
ee4c9b6a11 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd am: 85768c5916 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I2ca9ead163513a72e73d10af44df5112c05b61b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 04:30:17 +00:00
Arc Wang
85768c5916 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 am: c80890c7dd 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I615d41ee10fd988b6e91685b7ac3f32a9ddf5f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 04:04:26 +00:00
Arc Wang
c80890c7dd Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 am: 6945e70c02 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: Ib4fcff818a81a38c08f31d552706fc567ec00daa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:45:28 +00:00
Arc Wang
6945e70c02 Merge "Crash happens if back button is pressed during "Format as Portable"" am: 671fa153e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2147940

Change-Id: I70b0ae924d8a4410cc29e7f494e85a9b8a7d3abc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-08-02 03:26:39 +00:00
Arc Wang
671fa153e8 Merge "Crash happens if back button is pressed during "Format as Portable"" 2022-08-02 03:11:13 +00:00
TreeHugger Robot
71800b3f69 Merge "Refactor BiometricEnrollBase::onStop()" 2022-08-01 17:13:55 +00: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
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
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
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
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
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
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
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
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
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
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
TreeHugger Robot
047d58ebdb Merge "Add battery chart view model." 2022-07-26 08:50:26 +00:00
Chaohui Wang
0c55354039 Merge "Clean up unused bluetooth resources" 2022-07-26 08:10:05 +00:00