PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
90,564 Commits 1 Branch 0 Tags
f61b03a2012aa7579103d8d1749abeddb51197c4
Commit Graph

90564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jason Chiu
56dde819dc Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev am: 1565bba600 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177442

Change-Id: I6a3448e6e54666b45f6f67288593034a03d50d64
 2021-11-03 06:54:55 +00:00
Wesley Wang
bf9f91f0ad Merge "Move optimization mode backup timing into onPause" into sc-v2-dev 2021-11-03 06:41:42 +00:00
Jason Chiu
1565bba600 Merge "Define a constant Sliceable#NO_RES for no resource cases" into sc-v2-dev 2021-11-03 06:38:46 +00:00
TreeHugger Robot
3be2b733f2 Merge "Adjust optimize page logging timing" into sc-v2-dev am: b4e13a7af0 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170324

Change-Id: I4639aea50ec1cdb528f4f300c59550194f89ca60
 2021-11-03 05:29:56 +00:00
TreeHugger Robot
b4e13a7af0 Merge "Adjust optimize page logging timing" into sc-v2-dev 2021-11-03 05:17:40 +00:00
Wesley.CW Wang
9b6eac28f3 Move optimization mode backup timing into onPause 
- Move to onPause to avoid some corner case (like kill apps from recent
 app won't trigger onDestroy)

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: I89445a7138c30e6c869ce1c5c9a3f818997d99a7
 2021-11-03 12:38:10 +08:00
Jason Chiu
9fc0f18181 Define a constant Sliceable#NO_RES for no resource cases 
Fix: 204733076
Test: build
Change-Id: Ifa3b9db0e915a3ec056ad68a9a1862811594d423
 2021-11-03 12:23:49 +08:00
Bill Yi
5e67298476 Merge SP1A.211105.004 to aosp-master - DO NOT MERGE 
Merged-In: I62be3678022753eaba32209c33f95edf220294f1
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: I63bda2d4f97e2c35d317675624c69d45e6dfbcaa
 2021-11-02 21:07:55 -07:00
Wesley.CW Wang
7fb4cbf005 Adjust optimize page logging timing 
- Log the optimize mode only when leave this page and mode changed
 - Update mOptimizationMode at onResume to make sure the state is sync
 with framework

Bug: 195306545
Test: make SettingsRoboTests
Change-Id: Iab116220cd7d2b1bdb1c170c4b47016c763bf4fe
 2021-11-03 12:05:15 +08:00
The Android Open Source Project
4259d34ac9 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours am: 27067e7dd8 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I59009ecba231ac505949339e4ba3fcd48db9a4a7
 2021-11-03 00:30:55 +00:00
The Android Open Source Project
27067e7dd8 [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours am: 51c0a2cb6e -s ours 
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

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

Change-Id: If522424ffa85db50121cc40410ed12394a5b8af0
 2021-11-03 00:12:29 +00:00
The Android Open Source Project
51c0a2cb6e [automerger skipped] Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE am: e5d3401aa1 -s ours 
am skip reason: Merged-In I1d17526b87d442bc3513a1e7f526fcf5ff11e881 with SHA-1 e6ebfee220 is already in history

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

Change-Id: Iced88b946a227a369a465b018226d38b9fb69c43
 2021-11-02 23:55:40 +00:00
TreeHugger Robot
edc39b86fc Merge "Add intent action to launch face enrollment" into sc-v2-dev am: 2fa408c103 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16177210

Change-Id: Ie4cd9c0a1d93bf325356c7538e891a815c6a2edf
 2021-11-02 22:45:10 +00:00
TreeHugger Robot
2fa408c103 Merge "Add intent action to launch face enrollment" into sc-v2-dev 2021-11-02 22:32:27 +00:00
Curtis Belmonte
3de8abe8ee Add intent action to launch face enrollment 
Test: adb shell am start -a android.settings.FACE_ENROLL

Bug: 204100385
Change-Id: I3ac4395d80f0c36e8cab3b068c51ce03d0ecad7b
 2021-11-02 14:18:11 -07:00
The Android Open Source Project
e5d3401aa1 Merge SP1A.211105.004 to stage-aosp-master - DO NOT MERGE 
Merged-In: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
Change-Id: Ib2e431d8d28a3b0da86ec65cad345d8adda041ec
 2021-11-02 14:11:57 -07:00
ykhung
b85bf67314 Fix NPE issue of usage detailed page learn more button click event am: 8f0291cd1a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16174737

Change-Id: I06e12f5250b7abe8ce5546cf3c91952f6704fe6e
 2021-11-02 18:13:07 +00:00
ykhung
8f0291cd1a Fix NPE issue of usage detailed page learn more button click event 
root cause: some OEMs can not provide valid intent for help & feedback
solution: check the intent is vaild or not before show up the help content

Bug: 204844010
Test: make RunSettingsRoboTests
Change-Id: I4e7a7c926205be1179d55d33ada345024c8a44ab
 2021-11-02 16:34:34 +00:00
tom hsu
e53d70babc [Settings] Avoid crash from rotation screen. 
Bug: b/200822579
Test: Local test

Change-Id: Ie25b2ab4284d47abdd5db23676d05b6d547b2a73
 2021-11-02 12:36:49 +00:00
ykhung
00bc734b6a Avoid intermediate touch hover effect when a11y is enabled am: ae5bddc5e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16170323

Change-Id: Ibcf69b3ff520458b486fdecd0ec92d8983167bac
 2021-11-02 10:30:50 +00:00
ykhung
ae5bddc5e5 Avoid intermediate touch hover effect when a11y is enabled 
Bug: 201501553
Test: make SettingsRoboTests
Change-Id: I08e64a73547f71281fa94dc56ba8fe08312ebed0
 2021-11-02 16:47:31 +08:00
Jason Chiu
026b1b5df6 Merge changes from topic "slice-highlight" into sc-v2-dev am: 6821b6be32 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16151654

Change-Id: Ib03d41631d8bf961fa3ff3957eb5452411da7792
 2021-11-02 02:28:16 +00:00
Jason Chiu
6821b6be32 Merge changes from topic "slice-highlight" into sc-v2-dev 
* changes:
  Add highlight menu keys for all toggle pref controllers and custom slices
  Support slice deep links highlighting menu entries
 2021-11-02 02:14:09 +00:00
TreeHugger Robot
cdf991a7ba Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev am: faf0721f2c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16167410

Change-Id: Iea2d9bad655ee100c9aba65310307e8c988cfa7e
 2021-11-01 21:52:44 +00:00
TreeHugger Robot
faf0721f2c Merge "Revert "Update animation for fingerprint edu page"" into sc-v2-dev 2021-11-01 21:37:29 +00:00
Daniel Chapin
ba0a012b57 Revert "Update animation for fingerprint edu page" 
Revert submission 16091075-update_lottie_fp_edu

Reason for revert: Droidfood Blocking Bug: 204719520
Reverted Changes:
I0c3b1ad93:Update animation for fingerprint edu page
Id07ee17fa:Update animation for fingerprint edu page

Change-Id: I0f301491c2b526443a40b916ac2d98093d80a759
 2021-11-01 19:36:00 +00:00
Bonian Chen
7f94d2ba0e Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev am: 5d1400f8b2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16005289

Change-Id: I2b2c907e8341e1b80cc6145998dccc7a5dfab8cf
 2021-11-01 14:06:24 +00:00
Bonian Chen
5d1400f8b2 Merge "[Crash] finish activity without super#onResume()" into sc-v2-dev 2021-11-01 13:56:03 +00:00
TreeHugger Robot
137f9acac1 Merge "Optimize battery optimize page control flow" into sc-v2-dev am: c6a5bcc933 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16138630

Change-Id: Ic9d497517b6778c413909917d485575a054dc331
 2021-11-01 08:07:13 +00:00
TreeHugger Robot
c6a5bcc933 Merge "Optimize battery optimize page control flow" into sc-v2-dev 2021-11-01 07:53:21 +00:00
Hugh Chen
f8cd68c6e2 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 07:44:18 +00:00
Hugh Chen
d4e0ed2284 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 07:37:33 +00:00
tim peng
ad58b6cd59 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 am: e6ebfee220 am: 63ec94e217 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I93a51e0129d7791e619f2af80d84010daa998d3a
 2021-11-01 07:11:43 +00:00
Hugh Chen
528d40e4d1 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 07:01:34 +00:00
tim peng
63ec94e217 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 am: e6ebfee220 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: Ie0838ac36286b679f0ed5158ce97e0669f1fe2db
 2021-11-01 07:01:31 +00:00
Hugh Chen
249f9e2696 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 07:00:33 +00:00
Jason Chiu
2989c50a23 Add highlight menu keys for all toggle pref controllers and custom slices 
Bug: 204695404
Test: manual, robotest build pass, unit
Change-Id: Iad2e28ada8ddb766ffa7eff2c8dc581250cbd6f8
 2021-11-01 15:00:18 +08:00
Hugh Chen
d7c50f7952 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 06:58:55 +00:00
Hugh Chen
b1adf980a5 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
(cherry picked from commit d3abbb9821)
 2021-11-01 06:57:09 +00:00
Hugh Chen
58d81fbbb4 RESTRICT AUTOMERGE Fix make Bluetooth discoverable without additional permission 
- Only enable device can be discoverable when the user launch
  "Connected Devices settings" through settings and systemui

Bug: 194695497
Test: make -j42 RunSettingsRoboTests and use test apk to manually test
to verify the device is not discoversable when open "Connected settings"
through test apk.

Change-Id: Ia04ab759b737acf30b782f5c5831dd59f25fb257
 2021-11-01 06:56:12 +00:00
Wesley.CW Wang
151b88f76f Optimize battery optimize page control flow 
- Post the setup logic into background and setup once only when leaving
 this page, this can improve the performance since we won't setup
 every time when switching preference

Bug: 195306545
Bug: 199892006
Test: make SettingsRoboTests
Change-Id: I1c3ee4673cf5cdba0abe39f208dfb1412082c579
 2021-11-01 14:52:42 +08:00
tim peng
e6ebfee220 Merge "Phone fails to switch channel mode from stereo to mono" am: 41cfaa9f29 am: a4197a7aa1 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1873736

Change-Id: I1d17526b87d442bc3513a1e7f526fcf5ff11e881
 2021-11-01 06:36:53 +00:00
TreeHugger Robot
5ca439352e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 803a4a84a8 -s ours am: 17d3f20ebf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ic9b134881349b5a3386b602f030247cb72230fea
 2021-11-01 06:32:44 +00:00
TreeHugger Robot
35cc26c1d1 [automerger skipped] Merge "[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d" into sc-qpr1-dev am: 15e9a44b45 -s ours am: c95398214f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6fdb5ce965d62aa9412452867633452776867533
 2021-11-01 06:32:28 +00:00
TreeHugger Robot
14949b4a73 Merge changes from topic "presubmit-am-11a27b06803045468001e263b4b441f0" into sc-qpr1-dev am: 49400133f1 am: 348a01d9fe 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16155720

Change-Id: Id8807d589752d09a0dc1d81ac95b233136f0e898
 2021-11-01 06:32:26 +00:00
Bill Yi
e97ccea80d [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ac425087d am: 88711716d8 -s ours am: c6a1634ddd -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibbb933a4ac6d5a50362e92f8f8b4d7b0a3d223c3
 2021-11-01 06:32:25 +00:00
TreeHugger Robot
eb76baa8f4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 07709bfd9e -s ours am: ba70207c32 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: If9655984778d70ae1c72a6a20b148a2ce5e18d0d
 2021-11-01 06:32:13 +00:00
TreeHugger Robot
320aa7acf2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: b41f6a01a3 -s ours am: 89064bf1a0 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I9a08fe0d12604d164def4873b04e756ddb349815
 2021-11-01 06:31:45 +00:00
TreeHugger Robot
759efbe3d9 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 33b0ddcb9f -s ours am: 3ef8ed0bac -s ours am: 0bf0236ef5 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I030b1631f02cc7cd45ddf5a7b5c351208e917deb
 2021-11-01 06:31:40 +00:00
Automerger Merge Worker
0121404997 Merge "[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: eb45210f6a am: c0eaec8037 -s ours" into sc-qpr1-dev-plus-aosp am: ebb11f1e6e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I241e0febd74f41521b9f39812b6fcb91192ef97e
 2021-11-01 06:30:41 +00:00