Bonian Chen
590abcbbf2
Revert "[Settings] configuration for hidding SIM settings UI"
...
This reverts commit 6477275296
.
Reason for revert: Build breakage
Log: https://android-build.googleplex.com/builds/branches/aosp-main-16k-throttled/grid?head=9340544&tail=9338589
Bug: 240515161
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: Ife727bc8b8bddafb58eed0d13d5d19fd1bf0a43e
2022-11-28 11:08:25 +00:00
Bonian Chen
011cdf6ef0
Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad
am: f7090ebbee
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109
Change-Id: I739f417c3d19b22bc102c9a1e0253692008bd370
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-28 08:50:08 +00:00
Bonian Chen
f7090ebbee
Merge "[Settings] configuration for hidding SIM settings UI" am: 697f570fad
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319109
Change-Id: Iecaa9d4101864eaaeab0d5fc14277d39a9647682
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-28 08:24:30 +00:00
Bonian Chen
6477275296
[Settings] configuration for hidding SIM settings UI
...
Hide SIM settings UI based on configuraion.
Bug: 240515161
Test: test cases and local testing
Merged-In: If1df99a79e51125d03f534cdfc9408b01c61024f
Change-Id: I13ae0909d0120039cdfe8298a6892195de2fb122
2022-11-25 22:57:50 +00:00
Bonian Chen
b644c54256
[Settings][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: Ie00bdce2fad429f2ed343e1d7aea4967bcaddf5a
Merged-In: Ie61557590cdc15e2d03b1e71bbc78def2c60046a
Change-Id: I67166b0db08635ee2bc01a8208f96126b64fd0a7
2022-11-25 13:54:35 +00:00
Pasty Chang
0b61859b64
Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev am: 3bde8a502e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20486990
Change-Id: I9c5eacac486ea9e9a19660876490c1e74adc3da0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-25 02:42:04 +00:00
Pasty Chang
3bde8a502e
Merge "Migrate ambiguous getId method into getLink" into tm-qpr-dev
2022-11-25 02:15:17 +00:00
Bonian Chen
5d2afa168a
Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44
am: a0baef444d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406
Change-Id: I5f54b27ea703417acc13421fb4810df5b79a5cf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 15:10:40 +00:00
Bonian Chen
a0baef444d
Merge "[Settings] Enable ActivityResultLauncher for keyguard" am: d1e0b46a44
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313406
Change-Id: I2f18c417aeae58959902c61946ebc44391445411
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 14:42:02 +00:00
Bonian Chen
d1e0b46a44
Merge "[Settings] Enable ActivityResultLauncher for keyguard"
2022-11-24 14:25:17 +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
TreeHugger Robot
1793a5a322
Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev am: dc4b54c168
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20519152
Change-Id: I979fff8af4a4da75a0fd0d173a6561032a78895e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-24 00:30:00 +00:00
TreeHugger Robot
dc4b54c168
Merge "Keep "Resetting your internet" when screen rotates" into tm-qpr-dev
2022-11-24 00:01:22 +00:00
Dmitry Dementyev
a52ba15823
Show account name as a single line string.
...
Bug: 213905884
Test: manual
Change-Id: I608dad01cb6bfd94a5b4318169cc50f9790a3fb2
2022-11-23 21:54:10 +00:00
Bonian Chen
724dfbda22
Merge "[Settings] Add some log" am: 190b9ae3fa
am: cd59cb983e
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405
Change-Id: Ieb35b981079c558937f73ec3779018a1deaa56b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 16:27:42 +00:00
Bonian Chen
cd59cb983e
Merge "[Settings] Add some log" am: 190b9ae3fa
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2313405
Change-Id: I79999bda10e0be0df44fc73d8023e7f35d9f2730
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 15:59:17 +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
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
Bonian Chen
b5921fade9
[Settings] Enable ActivityResultLauncher for keyguard
...
Enable the support of ActivityResultLauncher for keyguard.
Bug: 260034791
Test: local
Change-Id: I0643241d7b79ba0ac4cd2314a126f33eb6557cc0
2022-11-23 12:48:34 +00:00
Bonian Chen
c2776e0e67
[Settings] Add some log
...
Add log to support debugging.
Bug: 259611847
Test: auto test
Change-Id: Ic7ea410604794e3b9caa8ab955e1406578a25425
2022-11-23 12:36:17 +00:00
TreeHugger Robot
2d6e3bb5a7
Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev am: fa6f92aa74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20549489
Change-Id: I8cc3a1d353b86fbf84e40f1d4932955c9a72aa42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-23 09:58:15 +00:00
TreeHugger Robot
fa6f92aa74
Merge "Remove isSticky true for SplitPlaceholderRule" into tm-qpr-dev
2022-11-23 09:19:27 +00:00
Bonian Chen
ea537afa54
Merge "[Settings] Additional route for dismiss activity dialog"
2022-11-23 07:02:20 +00:00
Arc Wang
f6d712c7b7
Remove isSticky true for SplitPlaceholderRule
...
SplitPlaceholderRule#isSticky determines whether the placeholder
will show on top in a smaller window size after it first appeared
in a split with sufficient minimum width.
This change will show Settings homepage while users rotate
device to portrait mode and show Settings 1-pane UI.
Bug: 256115335
Test: manual visual
1. Set font size and display size to large.
2. Launch Setting app in landscape and rotate to portrait.
Change-Id: Ie955f8b8db3bbe42dba6300608774582ef150590
2022-11-23 14:44:53 +08:00
YK Hung
3836a8a8de
Merge "Fix errorprone warnings that should be errors"
2022-11-23 02:07: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
Hao Dong
a538195c3c
Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev am: a01a1857ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20518779
Change-Id: Id63f4f017a8e2af8ceb03dfbb2f662026839b9eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 17:46:29 +00:00
Hao Dong
a01a1857ec
Merge "Use the internal max faces number to check enrolled." into tm-qpr-dev
2022-11-22 17:10:49 +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
135392ec6d
Merge "[Settings] configuration for hidding SIM settings UI" am: 769d773997
am: 0a733a9ed9
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299468
Change-Id: I0ed0a83df84bdc76991778f8d37f69ee49872b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:39 +00:00
Bonian Chen
e71a029160
Merge "[Settings] configuration for hidding SIM remove UI" am: 889c81f77a
am: 68a039754a
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2299467
Change-Id: Ie6a0f43399c016fadc058e2d161f1046b8721058
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-11-22 09:43:37 +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