PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
111,630 Commits 1 Branch 0 Tags
65bb5a09f4c8ff8fb70133eb641fe7d7ff744d2c
Commit Graph

111630 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Arc Wang
23412ad94a Settings 2-pane deep link vulnerabilities 
Settings app must not start an deep link Activity if
1. The deep link Activity is not exported.
or
2. Calling package does not have the permission to
   start the deep link Activity.

Bug: 250589026
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SettingsHomepageActivityTest
Change-Id: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
Merged-In: I9a3bddfa5d9d1d2e924dd6f3e5e07dca6c11664f
 2022-11-29 00:05:09 +08:00
Ben Murdoch
f526772dcd Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554 am: 48dc0133ce 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I4edb11e2c2c71cc7ec4ff7b82ad18a3d6d5471d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 12:50:29 +00:00
Ben Murdoch
48dc0133ce Merge "Revert "[Settings] configuration for hidding SIM settings UI"" am: 39d6e92554 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2319949

Change-Id: I7647c859fe8196e0af0e5c2871918f0940a9fe0e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-28 12:25:02 +00:00
Ben Murdoch
39d6e92554 Merge "Revert "[Settings] configuration for hidding SIM settings UI"" 2022-11-28 11:54:46 +00:00
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
697f570fad Merge "[Settings] configuration for hidding SIM settings UI" 2022-11-28 08:02:29 +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
Treehugger Robot
b6c140e7f2 [automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435 -s ours am: b02050cbe1 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: Ib15bf621b3d56568377641574cf42bb6dee6bffe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:43:51 +00:00
Bonian Chen
63cfa3a674 [automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256 -s ours am: f10535cf6c -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I62dd0bbfe49f8add5ca1c5234f31890efef190a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:43:49 +00:00
Treehugger Robot
b02050cbe1 [automerger skipped] Merge "[Settings][port] configuration for hidding SIM related UI" am: 6685055435 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I6c76e1df48a75f49d99beb22eaff8109de6cc676
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:15:31 +00:00
Bonian Chen
f10535cf6c [automerger skipped] [Settings][port] configuration for hidding SIM related UI am: b644c54256 -s ours 
am skip reason: Merged-In Ie61557590cdc15e2d03b1e71bbc78def2c60046a with SHA-1 de01ab40a5 is already in history

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

Change-Id: I4cdcaa6ec1485f6f592a5633d317d3329d1cd632
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-25 15:15:29 +00:00
Treehugger Robot
6685055435 Merge "[Settings][port] configuration for hidding SIM related UI" 2022-11-25 14:42:14 +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
TreeHugger Robot
00e2fe73cf [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 691196e900 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I36084e6cb3425afdf774b5e2e2dc0cca945c0c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:47 +00:00
Bill Yi
ebb7230ac0 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c9a4f35a74 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iff72643cc11108efead021f3de564dc3a4121f4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:30 +00:00
TreeHugger Robot
8dab2de988 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 43e8a4480b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I74a45513f5c9392c3faf45e1c474e74c6b7f6767
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:14:14 +00:00
Bill Yi
573755927f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ebc354ab68 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I10c725ab05a8ae996cfc11d24b241e5dc8ae99aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 20:13:55 +00:00
TreeHugger Robot
691196e900 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-23 19:38:40 +00:00
TreeHugger Robot
43e8a4480b Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2022-11-23 19:38:40 +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
Bonian Chen
190b9ae3fa Merge "[Settings] Add some log" 2022-11-23 15:15:47 +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
743baac904 [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours am: d38d75bc0c -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I27cc4bb4ae1175a400e7943759411793c2584b4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:57:33 +00:00
Bonian Chen
4218f2defd [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours am: 32884e3e97 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I329962649039fed9936a353b52f24eed0bd6d538
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:57:31 +00:00
Bonian Chen
d38d75bc0c [automerger skipped] Merge "[Settings] Additional route for dismiss activity dialog" am: ea537afa54 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I9b43b0167ce54a8d41dc34850535708eaa60f859
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:29:09 +00:00
Bonian Chen
32884e3e97 [automerger skipped] [Settings] Additional route for dismiss activity dialog am: 68c294df24 -s ours 
am skip reason: Merged-In I0a7e0e9826a301f2aa0ca34f40b5570f0e384b4f with SHA-1 188ccde75b is already in history

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

Change-Id: I2286c88e39b0111bf804fb64d658ba6ea064224a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 07:29:07 +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
7336fbfcc8 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours am: ab48f9ba47 -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: I0b3a6d8f77a24cc8536503e1f1bedbb35ad54130
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 03:00:26 +00:00
Cole Faust
a5572aff15 [automerger skipped] Fix errorprone warnings that should be errors am: 37cfdc7536 -s ours am: a0dd446e61 -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: Ie609432ec4075f105f4a89b0702d03d78ef9db17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 03:00:18 +00:00
YK Hung
ab48f9ba47 [automerger skipped] Merge "Fix errorprone warnings that should be errors" am: 3836a8a8de -s ours 
am skip reason: Merged-In I21aa58ebc02327849ed2161dbbafcdc806c007f2 with SHA-1 ac7318419a is already in history

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

Change-Id: I1c3342037844ada6a10e6b822940d0541ec4ce19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-23 02:32:00 +00:00