Xin Li
5482fb0301
Merge tm-qpr-dev-plus-aosp-without-vendor@9467136
...
Bug: 264720040
Merged-In: Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0
Change-Id: I2f32b289ee96a205816ed48e8f4490d081a0d315
2023-01-11 22:47:24 -08:00
Shen Lin
1721d0f276
Amend "Reset notification importance" list item style
...
Using LayoutPreference here makes list look like abrupt, we would like
to switch to normal Preference to align listitem style.
Bug: 265062898
Test: atest ImportanceResetPreferenceControllerTest -c
Change-Id: I93961de148915699d2cba46bdba71e667e8ea10a
2023-01-11 05:21:59 +00:00
Darrell Shi
2287f6e2e9
Merge changes from topic "hub-mode-settings" into tm-qpr-dev am: e722587923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736115
Change-Id: I17bc2f1b210dd0262299cfe10c6c12f2c94cca4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:55 +00:00
Darrell Shi
955a2f2ac3
Change screensaver ctrlr to base pref ctrlr. am: 542644e83f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20736682
Change-Id: Ic6f282087660ede4a0b1fd38378c0c5adc58bc3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-21 08:23:48 +00:00
Darrell Shi
e722587923
Merge changes from topic "hub-mode-settings" into tm-qpr-dev
...
* changes:
Add top-level Communal settings.
Change screensaver ctrlr to base pref ctrlr.
2022-12-21 08:03:49 +00:00
Darrell Shi
65836b1e3d
Add top-level Communal settings.
...
This change adds a new top-level setting, of which the availability is
controlled by a build time config value. It also registers the new
communal category so that prebuilt packages can inject preferences into
it.
Bug: 261641080
Test: verified on device that communal settings show up on top level
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: Idf79ae5b89ecc3498373de56a677b4876fb121c3
2022-12-21 04:10:56 +00:00
Zoey Chen
c76250cd50
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev am: e99f20df58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20747651
Change-Id: I2ea8ed881d1bcd91427f44b0fb866195fa289b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-19 07:04:37 +00:00
Zoey Chen
e99f20df58
Merge "[Settings] Add search keywords for APN controller" into tm-qpr-dev
2022-12-19 06:20:37 +00:00
Darrell Shi
542644e83f
Change screensaver ctrlr to base pref ctrlr.
...
This change makes it that the ScreenSaverPreferenceController extends
BasePreferenceController so that it can be readily used and pointed to
from an xml file.
Bug: 261627295
Test: atest ScreenSaverPreferenceControllerTest
Change-Id: I95487f2f49a23422fff46f30b0cfa287582a547b
2022-12-16 16:49:54 +00:00
Zoey Chen
e45ab97777
[Settings] Add search keywords for APN controller
...
Screenshot: https://hsv.googleplex.com/4816766300585984
Bug: 254024521
Test: atest ApnPreferenceController
Change-Id: I219256efff8d5859d029b190bf2cc73b8e83a746
2022-12-16 11:36:16 +00:00
András Kurucz
e06c0d905e
Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev am: 80095fa001
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20551986
Change-Id: I1437a24ea8da6e36be62a2dab42307a24dc5e167
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-28 16:57:05 +00:00
András Kurucz
0fa99226e1
Allow to block/unblock Conversation Notifications from Settings
...
The user can end up in a state where the Channel of a Conversation is
blocked (has an importance of 0).
Currently there was no way to unblock it, because we didn't allow it from
the Settings. Therefore now the option to block/unblock is added to the
Conversation Settings page.
Fixes: 255062535
Test: Block/Unblock a Conversation from Settings
Test: Mark a notification blocked and conversation by clicking the “Show
notifications” toggle and the “This is a conversation” button at once.
Now unblock it from the Settings.
Change-Id: I06778d259155d87d6af4bdb7013cd3b6c9a2e5ee
2022-11-23 13:24:36 +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
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
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
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
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
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
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
d40fd7c597
Merge "[Settings] configuration for hidding SIM related UI"
2022-11-22 08:51:53 +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
Bonian Chen
7dc161dcc8
[Settings] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Merged-In: I03d17beac0fb85a3d17acd7d0d581feb35e9582b
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Merged-In: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Change-Id: Id5ea14ca888f0cfc6ed5a7df3f77a8176232ef4f
2022-11-17 09:01:09 +00:00
Adam Bookatz
632754a466
Merge "Introduce concept of DockUser" into tm-qpr-dev am: 9703f6a154
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20406629
Change-Id: I1048ec3d84b6acce75102f449d1fdbd4fde54abf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-16 01:23:04 +00:00
Adam Bookatz
e5e232428d
Introduce concept of DockUser
...
Dreams and docking often refers to "user zero" or "system user".
But more generally, the special user for dreams or switching-to-on-docking
need not be user 0, and in fact won't be in certain modes. So this needs updating.
Test: the files mentioned in the topic
Bug: 257333623
Change-Id: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
Merged-In: If068aa79a770bed4abf3f7ca1859a95cd1eb4ecd
2022-11-14 19:19:21 +00:00
Bonian Chen
f2838421df
[Settings] configuration for hidding SIM lock UI
...
Hide SIM lock UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: I870c0b53112db56b7bc80bfd585f6f7b3cf82737
Change-Id: I70be07dbc1decb5cb8eff384d4cb8bea355ab99d
2022-11-14 12:00:06 +00:00
Bonian Chen
e1a0637c3a
[Settings] configuration for hidding SIM remove UI
...
Hide SIM remove UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: Iea40b89733cc75a41f960fecb2ac24177a4cbd3d
Change-Id: I8f0c1d53c4fe6e30280f2b7ae8f694cd27056e36
2022-11-14 10:19:27 +00:00
Bonian Chen
0e03586dda
[Settings] configuration for hidding SIM provider UI
...
Hide SIM provider UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: I1cb83787dc1ac1d61bb6bed6aa9c5e7a3ad6e69b
Change-Id: Ibe22c3ba377a15f770622d235ebddc63b4bf3ed6
2022-11-14 10:06:48 +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
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
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
Bonian Chen
af96b1ea7a
Merge "[Settings][Back port] configuration for hidding SIM lock UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
15f0cd6428
Merge "[Settings][Back port] configuration for hidding SIM remove UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
ab2e7bf6a5
Merge "[Settings][Back port] configuration for hidding SIM provider UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
0b80576a34
Merge "[Settings][Back port] configuration for hidding SIM related UI" into tm-qpr-dev
2022-11-07 02:05:50 +00:00
Bonian Chen
bf55048799
[Settings][Back port] configuration for hidding SIM related UI
...
Add overriable configuration for hidding SIM related UI.
Bug: 240515161
Test: test cases and local testing
Merged-In: I8d7ddd18861a696830da39f040dfb14b9ed46726
Merged-In: I45b7898da440c36045aec64a0a86fb804116cd9d
Change-Id: I709a8007362b09dbb1ec1bd5d32c68d23ed0cfa9
(cherry picked from commit 2b048b22f0
)
2022-11-04 07:06:23 +00:00
Joshua Mccloskey
4033cc7d0e
Merge "Implement SFPS “require screen on to auth”" into tm-qpr-dev am: db266ca6b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20215190
Change-Id: I7f485c93b429fc2d2f75b1fc3e46d82a47e31c25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-03 02:39:08 +00:00
Grace Cheng
13d3bdc4c0
Implement SFPS “require screen on to auth”
...
Creates new setting on SFPS to require screen on before unlocking a
device. Also sets up toggles for this setting at the end of fingerprint
enrollment and on the fingerprint settings page, and adds tests to
verify expected behavior.
Test: make RunSettingsRoboTests ROBOTEST_FILTER=FingerprintSettingsRequireScreenOnToAuthPreferenceControllerTest
Fixes: 249169615
Fixes: 245343077
Fixes: 248530806
Change-Id: Id588796426d071860b3cc2af9ec5798c0027c202
Merged-In: Ia44604b059c4847c40608419b2e16219976ced3e
2022-11-02 14:34:59 +00:00