PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
112,342 Commits 1 Branch 0 Tags
71814b355c6ab63d6e96d1b5af6b2edd14d4867c
Commit Graph

112342 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
4e80f3b385 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I81ea11753d22cdf529542426f7bb8c1e86fd43c5
 2022-11-30 01:27:48 -08:00
Bill Yi
5b52c4b62c Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I8f7614bcc8efb3cde868b81a72832adbe2a37958
 2022-11-30 01:21:58 -08:00
Arc Wang
7c1b458844 [automerger skipped] Settings 2-pane deep link vulnerabilities am: fef9b97498 -s ours 
am skip reason: skipped by user arcwang

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

Change-Id: I30fbaf04797eb75d3d544870af8613436ea85726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 08:48:47 +00:00
Arc Wang
434c8934c4 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-30 06:09:43 +00:00
Treehugger Robot
a7efff1ddb Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf am: 71a123db03 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227

Change-Id: I5483d044093d711f6f521fc9cdd738dc9638c0fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 00:38:11 +00:00
Joshua Mccloskey
a2133c2b00 Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro." 
This reverts commit 3ca9965a96.

Reason for revert: b/259709482

Change-Id: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
Merged-In: I1fcc8b3ecd42859af591a7b250edfedbbdf204e4
 2022-11-30 00:31:23 +00:00
Treehugger Robot
71a123db03 Merge "Only one channel is reserved for WifiP2pSettings" am: 4444a35bcf 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2309227

Change-Id: Ib9f5b095b2a69139ace91d319e9e649ac8948ed0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 00:09:36 +00:00
Treehugger Robot
4444a35bcf Merge "Only one channel is reserved for WifiP2pSettings" 2022-11-29 23:44:22 +00:00
Alejandro Nijamkin
8eef47d0cc Brings back "Control from locked device" setting. 
In ag/20427460, we made ControlsTrivialPrivacyPreferenceController, which controls this setting, be UNSUPPORTED_ON_DEVICE if customizable lock screen quick affordances are enabled.

This wrongly removes this setting from the Settings app and there is no new UI where the user can control that anymore. What this means is that, once users upgrade to an Android build with our feature, they will forever be stuck with whatever they last chose for "Control from locked device".

This CL brings that back but changes the behaviour a bit such that, if
the quick affordances feature is enabled, this setting is never
disabled.

Fix: 260722836
Test: Unit tests added. Manually verified that the setting is visible
and enabled if the feature is enabled, even if the current selection
does not include the Home quick affordance and that if the feature is
off, the setting is visible but disabled if the main setting is off (old
behaviour unchanged).

Change-Id: I2e53123b3b7a2896699aeaa13b0c7d5a1c8a9c92
 2022-11-29 12:17:13 -08:00
hee.youn
dc862b46d2 [Settings] modify to use LocaleHelper on AppLocaleDetails 
modify to unifying display name of locale because there is difference between summary and AppLanguageList

Bug: 260625719
Test: run Settings > General > App Language and test summary and list

Change-Id: I62b91a33632251e810d200d56d7274e216568c77
 2022-11-29 14:27:55 +00:00
Zhenwei Chen
07d208dfb1 Clean up useless defender dialog code 
Test: Unit test passed
Bug: 260687359
Merged-In: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Change-Id: If3cbe4072c891f1af6b5aa4fb624e4e486c78ad6
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit a725bac68c)
 2022-11-29 10:31:45 +00:00
Zhenwei Chen
1d72ff642c Add dock defender battery tips 
1. Remove the dock defender v1 code
2. Add dock defender battery tips and update
   corresponding list item string

Bug: 260687359
Test: Unit test passed and manual test on device
Merged-In: Ib6c09df056744142f42f5e2a13252b58e54c7534
Change-Id: Ib6c09df056744142f42f5e2a13252b58e54c7534
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 8d11d9ceea)
 2022-11-29 10:31:37 +00:00
Zhenwei Chen
72a892754d Fix LoaderCallback.onLoadFinished uncalled issue 
When two loaders started almost at the same time,
it is possible onLoadFinished is never called.

Bug: 260687359
Test: Unit tests passed and manual test on device
Merged-In: I41a041d5878f9930db44775408380d0d4588faba
Change-Id: I41a041d5878f9930db44775408380d0d4588faba
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 41ce87729e)
 2022-11-29 10:29:59 +00:00
Arc Wang
fef9b97498 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 05:58:43 +00:00
Android Build Coastguard Worker
e803067385 Snap for 9342863 from 80095fa001 to tm-qpr2-release 
Change-Id: I0f2f80bb3b9250e92679f3a5e438ddf61d51706c
 2022-11-29 00:29:55 +00:00
DingFei Song
42ee738f1b Only one channel is reserved for WifiP2pSettings 
Every time we enter WifiP2pSettings, a channel will be created,
but we should keep only one channel if p2p connected.

Bug: 259364357

Change-Id: Ie3c1b1281d74332cd5df720fb13476097f3f5df9
Merged-In: I999b108bc3e3c22519398a55b503078c1069cef1
Signed-off-by: DingFei Song <v-dingfeisong@xiaomi.corp-partner.google.com>
 2022-11-28 18:29:00 +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
80095fa001 Merge "Allow to block/unblock Conversation Notifications from Settings" into tm-qpr-dev 2022-11-28 16:32:00 +00:00
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
Android Build Coastguard Worker
e8cb2185fe Snap for 9335089 from 3bde8a502e to tm-qpr2-release 
Change-Id: I48841770674c590a5c533a501153fb00723a99dd
 2022-11-26 06:35:50 +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
Android Build Coastguard Worker
a18d93aa54 Snap for 9330113 from dc4b54c168 to tm-qpr2-release 
Change-Id: I438024ac2220a9a198e235befec53192c541a587
 2022-11-25 00:26:04 +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
Android Build Coastguard Worker
a5b2147fd0 Snap for 9325773 from 691196e900 to tm-qpr2-release 
Change-Id: I780eed3143d6b8c612c6013442a1ef02c7fe0998
 2022-11-24 00:26:57 +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