PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,617 Commits 1 Branch 0 Tags
f5ffb13dc1f39d042fb9a8bf39d47df69299d331
Commit Graph

110617 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hao Dong
f5ffb13dc1 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev am: 8a0074e909 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20414916

Change-Id: Ibbc4c72d598d16b0bc99c36fb311d90bc1765912
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 16:04:49 +00:00
Hao Dong
8a0074e909 Merge "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." into tm-qpr-dev 2022-11-15 15:40:37 +00:00
Treehugger Robot
486c74f4fa Merge "Update owner for Settings project" am: 20a3f8f9e8 am: 73c0f408a4 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: Id1fe88f9af281f087c1291fa9645fab51ef9295d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 06:53:55 +00:00
Treehugger Robot
73c0f408a4 Merge "Update owner for Settings project" am: 20a3f8f9e8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2291755

Change-Id: I083eb43c64d81ebc75e33e0abf0fe8d063be1425
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 06:22:14 +00:00
Treehugger Robot
20a3f8f9e8 Merge "Update owner for Settings project" 2022-11-15 05:43:00 +00:00
Joshua Mccloskey
945d614158 Merge "Centered fingerprint icon" into tm-qpr-dev am: 0fb3dc390c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20447129

Change-Id: I9c88dcafd1cb73dae5dc1a7137ff78337d4d69bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:51:14 +00:00
Joshua Mccloskey
8bc66cbb9f Merge "Remove sidefps toggle from SUW." into tm-qpr-dev am: 94ddcba809 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20442178

Change-Id: Ib5ddf26067cdd3e07ebc414aa82306fee68e0add
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-15 01:50:46 +00:00
Joshua Mccloskey
0fb3dc390c Merge "Centered fingerprint icon" into tm-qpr-dev 2022-11-15 01:14:07 +00:00
Joshua Mccloskey
94ddcba809 Merge "Remove sidefps toggle from SUW." into tm-qpr-dev 2022-11-15 01:14:01 +00:00
Grace Cheng
aa3465b842 Merge "Update fingerprint enrollment finished string" into tm-qpr-dev am: e4b09e55ca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20452306

Change-Id: I8b9b3ec232d2950b859f66c0ce547ea9ae9e3dda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 19:06:02 +00:00
Grace Cheng
e4b09e55ca Merge "Update fingerprint enrollment finished string" into tm-qpr-dev 2022-11-14 18:35:16 +00:00
Yining Liu
a3bfaed468 Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev am: 3852625699 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20331041

Change-Id: I038807ba1cd80bee01db6f66ef13f16ca97ec604
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 18:20:03 +00:00
Yining Liu
3852625699 Merge "Increase the number of notification items that can be shown in Notification history - Recently dismissed" into tm-qpr-dev 2022-11-14 17:58:28 +00:00
Joshua McCloskey
c10d8ca045 Remove sidefps toggle from SUW. 
Test: Verified manully that the toggle is no longer
present when enrolling sidefps.
Fixes: 258687688

Change-Id: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
Merged-In: I0ea63a61908b45399ba09ff31fd8fe6a4aacfb41
 2022-11-14 17:29:58 +00:00
Hao Dong
3ca9965a96 Fix the flicker of FingerprintSettings before FingerprintEnrollIntro. 
Change to launch FingerprintEnrollIntroductionInternal directly when no fingerprint enrolled and fingerprint is the only biometrics. This avoids the flicker of FingerPrintSettings before showing the enroll introduction.
This partially reverts the change in ag/19732076.

Bug: 256334588

Test: manual test following cases on fp-only devices, and enable don't
      keep activity and test them again.
      1. fp enrollment on SUW
      2. fp add another on SUW
      3. add first fp on Security Settings
      4. add another fp on Security Settings
Test: atest FingerprintStatusUtilsTest BiometricsSafetySourceTest

Change-Id: I057b00fbca6660012887ebedf4d65c2c3d35792b
Merged-In: I057b00fbca6660012887ebedf4d65c2c3d35792b
(cherry picked from commit 6bed01f315)
 2022-11-12 23:41:37 +00:00
Grace Cheng
dd7e488197 Update fingerprint enrollment finished string 
Updates string displayed at completion of fingerprint enrollment

Test: Observe updated string after enrolling a fingerprint
Fixes: 257898484
Change-Id: I40ab1b67030f164c96c8abca0837bacc1560d1b5
 2022-11-12 00:08:10 +00:00
Treehugger Robot
cf573d51c6 Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918 am: 0ecb9e76fe 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917

Change-Id: I8047a4e55b534076ac9fb65e99934fe7d3a3e695
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 12:17:57 +00:00
Treehugger Robot
0ecb9e76fe Merge "Fix potential crash in AppAllServicesPreferenceController" am: ccfa7fa918 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2296917

Change-Id: I7477f18dc0e0a0aea9adf8e996171210dc194ed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 11:48:15 +00:00
Treehugger Robot
ccfa7fa918 Merge "Fix potential crash in AppAllServicesPreferenceController" 2022-11-11 11:10:12 +00:00
Bonian Chen
647e3fe4e5 Merge "[Settings] Improve PremiumSMS's auto test" into tm-qpr-dev am: 30ce9a78ee 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20429443

Change-Id: I712b90a9a09ebb2bfe064f4e6a37930d2b977bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 10:24:00 +00:00
Bonian Chen
56e5d50ca7 Merge "[Settings] enhancing data saver config control" into tm-qpr-dev am: 106fd86520 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419511

Change-Id: I5338c24812346b79068b1fee0c5ba98ff07eec33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 10:23:48 +00:00
Bonian Chen
86e2948eb6 Merge "[Settings] Hide data usage when SIM support is turn OFF" into tm-qpr-dev am: a6824c9b34 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20419510

Change-Id: Ie433daffbe56a1a526880c2e254a13ff17aaa3c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 10:23:44 +00:00
Bonian Chen
30ce9a78ee Merge "[Settings] Improve PremiumSMS's auto test" into tm-qpr-dev 2022-11-11 09:35:42 +00:00
Bonian Chen
106fd86520 Merge "[Settings] enhancing data saver config control" into tm-qpr-dev 2022-11-11 09:35:21 +00:00
Bonian Chen
a6824c9b34 Merge "[Settings] Hide data usage when SIM support is turn OFF" into tm-qpr-dev 2022-11-11 09:35:21 +00:00
TreeHugger Robot
19bc5093dd Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev am: 0b0e75d726 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20441365

Change-Id: Ib4ea24d56abf44dc50d94852efc4a6d2cc3e1de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 03:42:13 +00:00
TreeHugger Robot
7578a43c94 Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev am: b0503be6fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20336174

Change-Id: I9a92a7de4f517330604673ce97bb1a626f824626
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-11 03:41:29 +00:00
TreeHugger Robot
0b0e75d726 Merge "Shorten the search box hint for two-pane layout" into tm-qpr-dev 2022-11-11 03:30:50 +00:00
TreeHugger Robot
b0503be6fd Merge "Fix app battery usage list launch incorrect works app" into tm-qpr-dev 2022-11-11 03:10:06 +00:00
Joshua McCloskey
566a7a3031 Centered fingerprint icon 
Test: Verified icon was centered in the fingerprint enrollment finish
page.
Fixes: 258604191

Change-Id: I33f19731921ef39829a6bbbaa1d1b097b95d64d4
 2022-11-11 00:03:34 +00:00
Jason Chiu
13ce1b48d8 Shorten the search box hint for two-pane layout 
Change from "Search settings" to "Search".

Fix: 248006011
Test: visual
Change-Id: I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c
Merged-In: I76a1fa0f8c38e5438f2b01a1b6d83cae3968502c
(cherry picked from commit 3aec52141d)
 2022-11-10 17:52:56 +00:00
Bonian Chen
b4511365cb [Settings] Improve PremiumSMS's auto test 
Fix PremiumSMS's test case when config_show_premium_sms is false.

Bug: 240515161
Test: test cases and local testing
Change-Id: I3f1710bcf2c123553af7646c030bfe87f569324a
 2022-11-10 15:11:36 +00:00
Bonian Chen
2a6792540b [Settings] enhancing data saver config control 
Enhancing the control of R.bool.config_show_data_saver when false, which including:
1. Initial presentation is invisible
2. Leaving UI when triggered
3. Avoid from getting searched
4. Robolectric test case support

Bug: 243877672
Test: test cases and local testing
Merged-In: I909522c0244ebb012a27d6aff34120a4f90128c6
Change-Id: I909522c0244ebb012a27d6aff34120a4f90128c6
 2022-11-10 11:23:20 +00:00
Kuan Wang
28bdf84b5a Remove the timestamps of last day for battery level chart if last day has less than 2 hours data. am: 57cb76428e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20309948

Change-Id: Ifd9c932a870117e278c59af45c6a57132831de5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 11:14:37 +00:00
Zaiyue Xue
240ff56875 Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev am: aee2d55bfa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20410009

Change-Id: I89a8e622134524f701e440a9bd3e2cf0c84fae8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-10 09:33:08 +00:00
Kuan Wang
57cb76428e Remove the timestamps of last day for battery level chart if last day has less than 2 hours data. 
Test: make RunSettingsRoboTests
Bug: 256525782
Change-Id: I3f735f8f3ec10b2952b93111f0243e44117ff58a
 2022-11-10 08:56:39 +00:00
Zaiyue Xue
aee2d55bfa Merge "Fix b/257404630 Inconsistent strings in battery chart" into tm-qpr-dev 2022-11-10 08:52:42 +00:00
Shen Lin
e8a0ba688b Fix potential crash in AppAllServicesPreferenceController 
This CL contains two fixes:

- Fix potentialcrash when calling getAvailabilityStatus, we should use
  the latest packageName to decide.

- Add test class

Bug: 258270151
Test: atest
Change-Id: I3e6aa7e0773a73d2e3dfa996e42087f3ec80627b
 2022-11-10 10:18:14 +08:00
Diya Bera
0eaab46d92 Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev am: 9cb05bc57b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20356992

Change-Id: I9166287d83b501b5510ce451ba584f940d8809bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 17:50:16 +00:00
Diya Bera
9cb05bc57b Merge "Fixes crash in face enrollment during set up in work mode" into tm-qpr-dev 2022-11-09 17:25:35 +00:00
Bonian Chen
d3b35f24f0 [Settings] Hide data usage when SIM support is turn OFF 
Enable the UI control through configuration.

Bug: 240515161
Test: local, auto test
Merged-In: I5e49a2b0f2b563b426354f4d2e6e650dcc02c98b
Merged-In: I4e0db5688dc1b074d43f9d77dd2f6d4cc53a353c
Change-Id: I4e0db5688dc1b074d43f9d77dd2f6d4cc53a353c
 2022-11-09 10:52:35 +00:00
Tsung-Mao Fang
41ced13ca4 Update owner for Settings project 
Test: N/A
Change-Id: I34245a8cb17f5d2dff635d6c8a7c089330f1a8a5
 2022-11-09 10:24:52 +00:00
Treehugger Robot
f97d2d6f1d Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c am: 170a632a66 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: Ibae90d867f896f4d4c611f5b2390dc0d5362a9d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 06:08:04 +00:00
Treehugger Robot
170a632a66 Merge "Align main thread checking by calling ThreadUtils" am: 48c386e54c 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2276131

Change-Id: Iaa6e62832270441010d07fcc23f01149229f6e7c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-09 05:39:03 +00:00
Treehugger Robot
48c386e54c Merge "Align main thread checking by calling ThreadUtils" 2022-11-09 05:13:53 +00:00
Shen Lin
ce0e8b9a4b Align main thread checking by calling ThreadUtils 
Since ThreadUtils encapsules method to ensure main thread, it is
suggested to call this method rather than maintaining our copy.

Bug: 258270052
Test: atest and manual.
Change-Id: I4c5fcdd6e5bcc7d1d08f526eedb3aa123926d8a1
 2022-11-09 11:43:03 +08:00
Zaiyue Xue
866203a3b8 Fix b/257404630 Inconsistent strings in battery chart 
Change all the "from last full charge" to "since last full charge".

Bug: 257404630
Fix: 257404630
Test: presubmit
Change-Id: Ib316e9fecac60f388e2b1810de9a65c540c52358
Merged-In: Ib316e9fecac60f388e2b1810de9a65c540c52358
 2022-11-09 02:39:22 +00:00
Diya Bera
a26c2d6b37 Fixes crash in face enrollment during set up in work mode 
Copying extras in face intent to avoid incorrect information later in the lifecycle.

Fixes: 247049655
Test: Manual
Change-Id: I4c394a2f7b9e80d6ddc6ef385c3ab11ecf56387b
 2022-11-08 23:35:05 +00:00
TreeHugger Robot
4f30faa91c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: b93416b26d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iad18fe9860c68c39e3590c3e33b7dbd2b13bd60f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 10:10:13 +00:00
Bill Yi
9e26f13061 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ef39119269 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6edfc370be502fd83a20e6f8a5be5b024f81d85d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-08 10:09:52 +00:00