Commit Graph

14930 Commits

Author SHA1 Message Date
SongFerngWang
28ce6b9057 Move the auto data switch preference into DDS sim
Bug: 253698164
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AutoDataSwitchPreferenceControllerTest
Change-Id: I0aee5454e3a57a373b9eea2108c39335e4277f7b
2022-11-28 15:36:18 +08:00
Bonian Chen
845426e9e5 Merge "[Settings] Code refactor" am: b60b759dac am: 61ed679576 am: e9e7cdf914
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309

Change-Id: I05dcb1af5e6d6e515ebaa81641df57883a88c36e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 05:16:23 +00:00
Bonian Chen
e9e7cdf914 Merge "[Settings] Code refactor" am: b60b759dac am: 61ed679576
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309

Change-Id: I138c4c8108dee8c1c492e6909881c689dc66be63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 04:40:53 +00:00
Bonian Chen
61ed679576 Merge "[Settings] Code refactor" am: b60b759dac
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2311309

Change-Id: I8e0331d1f3fccc71a33a81fbb7d98956bce1be27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-24 04:10:59 +00:00
Bonian Chen
b60b759dac Merge "[Settings] Code refactor" 2022-11-24 03:44:13 +00:00
Bonian Chen
e76bcc5388 [Settings] Code refactor
Wrap reset options into an Object, for better supporting

Bug: 260034791
Test: auto testing
Change-Id: I98cc12440414077b600bba0b5598c887608419cc
2022-11-23 12:52:55 +00:00
TreeHugger Robot
167e9b2a01 Merge "Add FUELGAUGE_BATTERY_SAVER_SCHEDULE for saver schedule page metric" 2022-11-23 04:42:06 +00:00
ykhung
5cfec67572 Add FUELGAUGE_BATTERY_SAVER_SCHEDULE for saver schedule page metric
Bug: 260074438
Test: make test RunSettingsRoboTests
Change-Id: Ib7e55b6638d1b10a47cbf25f5dbbb40b3f4962f2
2022-11-23 10:01:26 +08:00
Steve Elliott
66284b5528 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623 am: 81fc1b0b4d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I510fcf15b561e4f89df2b1b69ad74ca0350c1426
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 23:40:10 +00:00
Steve Elliott
81fc1b0b4d Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev am: fece948623
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20530303

Change-Id: I9cd33ea6d02cf1243034a399162dfffcd0fd8f65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 23:05:49 +00:00
Steve Elliott
fece948623 Merge "Revert^2 "Add configuration for defaulting notification behavior"" into tm-qpr-dev 2022-11-22 22:50:10 +00:00
Bonian Chen
68c294df24 [Settings] Additional route for dismiss activity dialog
Previous design dismiss an activity dialog through Intent would lead to a pair of creating and finishing activity. The task switch during the creating and finishing may introduce some side effect to the other apps.

This change tried to add additional route to avoid from dismiss through Intent
but sending an async close request to that specific dialog (if available).

Bug: 236956105
Test: local, auto testing
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: I88a6c0632c1be906b310a10c154149c319d34759
2022-11-22 16:04:40 +00:00
Bonian Chen
8f936c0bdb Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b am: d33fbde071
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Idc1ee6fcf8fc403ed9592adf34417ebe2b15b7da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:07 +00:00
Bonian Chen
4e1a1e65b9 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852 am: e4fbf9d941
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I1bcbe2f57013ace3641937897ae2d0d8b64e2f76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:05 +00:00
Bonian Chen
52bae42964 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720 am: 2decf2ae45
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I57d2afd3af39506a35ea369ab561d02d039884ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:28:03 +00:00
Bonian Chen
d33fbde071 Merge changes from topic "revert-2299468-settings_without_siminfo-PZBVIDHEPA" am: 5125477d7b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310159

Change-Id: Ic919498fda4172ede68fcd431b8bdd18056fada6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:33 +00:00
Bonian Chen
e4fbf9d941 Revert "[Settings] configuration for hidding SIM settings UI" am: 8e98f5a852
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310157

Change-Id: I76eae77bcd825e7fa5fbc12b46eb72a7f9ddfd02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:31 +00:00
Bonian Chen
2decf2ae45 Revert "[Settings] configuration for hidding SIM lock UI" am: ead8a35720
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2310156

Change-Id: I91a72f38cc22583202c9c707463735d3f436aac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 14:08:29 +00:00
Bonian Chen
a1c1bd0f81 Revert "[Settings] configuration for hidding SIM provider UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: If1951dde860bb49e3ea4cd5603ed92ef18bd1f0d
2022-11-22 11:59:26 +00:00
Bonian Chen
3b7d0d2e17 Revert "[Settings] configuration for hidding SIM remove UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I5c52b841955f5be41ce861aca740147061fc7d3f
2022-11-22 11:59:15 +00:00
Bonian Chen
8e98f5a852 Revert "[Settings] configuration for hidding SIM settings UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I646d664b83d3db12cca81f53f7f5cd82a38e34d0
2022-11-22 11:59:02 +00:00
Bonian Chen
ead8a35720 Revert "[Settings] configuration for hidding SIM lock UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: Ie157c9d85b5cea9ded8c4b7928a10e7ae401ab09
2022-11-22 11:58:48 +00:00
Bonian Chen
26aa2414a0 Revert "[Settings] configuration for hidding SIM notification UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I07d9ddeb96ca590decf28126ce97fba4c1783304
Merged-In: I7a912a3393694155d29614d325796e08598985bf
Merged-In: I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f
Change-Id: Ib366c3fca7433e58d1925f27af11a794afb3ca00
2022-11-22 11:57:34 +00:00
Bonian Chen
0a4295d688 Revert "[Settings] configuration for hidding SIM related UI"
Revert submission 2299468-settings_without_siminfo

Reason for revert: Fix build breakage
Reverted Changes:
I3d6ecec14:[Settings] configuration for hidding SIM settings ...
I8f0c1d53c:[Settings] configuration for hidding SIM remove UI...
I1b88f0f70:[Settings] configuration for hidding SIM notificat...
Ibe22c3ba3:[Settings] configuration for hidding SIM provider ...
Id5ea14ca8:[Settings] configuration for hidding SIM related U...
I70be07dbc:[Settings] configuration for hidding SIM lock UI

Log of breakage:
https://android-build.googleplex.com/builds/submitted/9318826/full-eng/latest/view/logs/build_error.log

Bug: 260055628
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Idb765be594a55e9f26bf378656d6b18c8f3e37c0
2022-11-22 11:52:05 +00:00
Bonian Chen
0a733a9ed9 Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468

Change-Id: I4950a96f8637c06eadcf9f1248dc56b129dfca36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:19:15 +00:00
Bonian Chen
68a039754a Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467

Change-Id: I1b3e4fc3208e4476e81030319cec4b5705190c52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:19:14 +00:00
Bonian Chen
f901e617c1 Merge "[Settings] configuration for hidding SIM provider UI" am: f7ec7e66c4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299465

Change-Id: Ibd2bc810f356beb375870fecafd73116ed0b5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:19:09 +00:00
Bonian Chen
2a98e2a4fe Merge "[Settings] configuration for hidding SIM lock UI" am: 1ab73b934b
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299463

Change-Id: If39c1f00449571d803eeeff89bb69ff2a789382c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 09:18:59 +00:00
Bonian Chen
769d773997 Merge "[Settings] configuration for hidding SIM settings UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
889c81f77a Merge "[Settings] configuration for hidding SIM remove UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
f7ec7e66c4 Merge "[Settings] configuration for hidding SIM provider UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
1ab73b934b Merge "[Settings] configuration for hidding SIM lock UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
56ff3fd99a Merge "[Settings] configuration for hidding SIM notification UI" 2022-11-22 08:51:53 +00:00
Bonian Chen
d40fd7c597 Merge "[Settings] configuration for hidding SIM related UI" 2022-11-22 08:51:53 +00:00
Zhenwei Chen
a725bac68c Clean up useless defender dialog code
Test: Unit test passed
Bug: 256523123
Change-Id: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
2022-11-22 12:22:08 +08:00
TreeHugger Robot
f4b81c8207 Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f am: 6c7910557e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460

Change-Id: I734695139164190b049052af8456dfb8127202d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 03:52:37 +00:00
TreeHugger Robot
6c7910557e Merge "Adds settings item for quick affordances." into tm-qpr-dev am: 6f908bae6f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20427460

Change-Id: Idb43b7a13130da5c2aa84df780d42aeca0771b2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-22 03:17:16 +00:00
TreeHugger Robot
6f908bae6f Merge "Adds settings item for quick affordances." into tm-qpr-dev 2022-11-22 02:59:15 +00:00
Alejandro Nijamkin
01df2b4ee2 Adds settings item for quick affordances.
This is in Display > Lock screen. It reads "Buttons" and the summary
text below it is a comma delimited list of the names of the
currently-selected quick affordances.

Fix: 256662519
Test: Manual verification that the lock screen and wallet
items are gone and the new item is visible and clicking it opens the
Wallpaper & style settings screen

Change-Id: If3746b5d0eb8c61edb9378cdb217ca248b999944
2022-11-21 16:42:45 -08:00
Florian Mayer
2a1f7cb453 [MTE] fix broken test
Bug: 245624194
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MemtagHelperTest
Change-Id: I71ad79270a5f538bf7a447345aa610c514683fec
2022-11-21 11:19:06 -08:00
Florian Mayer
dbc8874386 Merge "[MTE] disable dev option if security setting is on" 2022-11-21 18:57:49 +00:00
Steve Elliott
30ccc43ae1 Revert^2 "Add configuration for defaulting notification behavior"
Test: go through SUW on affected device, view notification screen
Bug: 240472040
Change-Id: I34dbe28226d830bc5ba633e72cd529d97021de85
2022-11-21 15:16:40 +00:00
Bonian Chen
eb196b64a9 Merge "[Settings] Code Refactor" am: 8ae657bd80 am: f6d9536922 am: f01cea0236
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I48f913265c1403b9a33ac271a1f36cf3c5a74a8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 11:09:48 +00:00
Bonian Chen
f01cea0236 Merge "[Settings] Code Refactor" am: 8ae657bd80 am: f6d9536922
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I5b90defe3741e720280fe026ab45f57b013fa640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 10:36:53 +00:00
Bonian Chen
f6d9536922 Merge "[Settings] Code Refactor" am: 8ae657bd80
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2308620

Change-Id: I4efad57d509e79938a5558f09b6154d898504b31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-21 10:11:28 +00:00
TreeHugger Robot
cd8f6a2b78 Merge "Remove schedule by routine relative tests" 2022-11-21 08:34:04 +00:00
TreeHugger Robot
a822d13638 Merge "b/259865144 Fix the failed unit test BatteryChartPreferenceControllerTest" 2022-11-21 08:07:19 +00:00
ykhung
b2f363e5d4 Remove schedule by routine relative tests
Fix: 259866871
Test: make test DEBUG_ROBOLECTRIC=1 ROBOTEST_FILTER="com.android.settings.fuelgauge.batterysaver" RunSettingsRoboTests -j40
Change-Id: Icc402c678c4c4b365047c01c499b17f6d5ec3ada
2022-11-21 14:19:03 +08:00
Zaiyue Xue
52f9272cb9 b/259865144 Fix the failed unit test BatteryChartPreferenceControllerTest
Bug: 259865144
Fix: 259865144
Test: presubmit
Change-Id: Ie23fef16f4e21bba25f02bc2aa28986a5904188e
2022-11-21 14:05:26 +08:00
Yi-Ling Chuang
2dd4058e37 Remove BatteryFixSlice as it's not used am: 2f80e073d0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20514509

Change-Id: I536b1e852ddcf5154c8aeb64ae755156330aa9ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-11-19 19:16:34 +00:00