Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,964 Commits 1 Branch 0 Tags
a538747a6acdce7280b84b005ff085e5cef21515
Commit Graph

44446 Commits

Author SHA1 Message Date
Arc Wang
a538747a6a Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev am: a0e5f09d94 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20615154

Change-Id: I7acafe30f3cccfb2cf1428493f5cee42c5e8e9a7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 02:07:35 +00:00
Arc Wang
a0e5f09d94 Merge "Fix SettingsHomepageActivity crash during configuration change" into tm-qpr-dev 2022-12-13 01:19:06 +00:00
Darrell Shi
ef4fb09916 Merge "Update screensaver preference summary when on." into tm-qpr-dev am: 7bae5625a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20683706

Change-Id: Ie01d33707536f511f144d82fc13b2d02f2825941
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-12 17:01:34 +00:00
Darrell Shi
7bae5625a6 Merge "Update screensaver preference summary when on." into tm-qpr-dev 2022-12-12 16:41:38 +00:00
Weng Su
cd486c06d0 Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d am: ee773103f8 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743

Change-Id: I3538fe496c4a5fd5e34d6cb066a8aaab132c2967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 09:16:22 +00:00
Weng Su
956f288d1d Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" 2022-12-10 08:11:40 +00:00
Darrell Shi
d1f5edfc78 Update screensaver preference summary when on. 
The summary for screensaver preference is updated to, e.g. "On / Art
gallery".

Bug: 261907383
Test: 'make -j64 RunSettingsRoboTests \
ROBOTEST_FILTER="com.android.settings.dream.DreamSettingsTest"'

Change-Id: I40483f266c42a6e49e513208ba513d469d67f85a
Merged-In: I40483f266c42a6e49e513208ba513d469d67f85a
 2022-12-09 17:36:01 +00:00
TreeHugger Robot
2bd5b1c75f Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev am: 47d87cb48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20666966

Change-Id: I745c07401d1130ad320c476928f21d68c388f600
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 05:55:31 +00:00
TreeHugger Robot
47d87cb48d Merge "Check multiple security types for Wi-Fi NetworkRequest" into tm-qpr-dev 2022-12-09 05:26:26 +00:00
xuelin
688e61a4c6 fix WifiUtils:isNetworkLockedDown() null pointer issue 
In the WifiUtils class, the isNetworkLockedDown() method does not
determine whether the context is empty, which will cause a null
pointer exception. This change adds a condition for judging the
input context as empty.

Bug:261812909
Test:make RunSettingsRoboTests
Change-Id: Ie0f17179c25a7e9d4b2f652a5667eef3cc577c7b
Signed-off-by: xuelin <xuelin@xiaomi.corp-partner.google.com>
 2022-12-08 16:02:31 +08:00
Zhenwei Chen
a08c9db9f2 Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev am: 72490ec149 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20640198

Change-Id: Ia70a664a5fecab8090739fb632987965d7eb1161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-08 03:48:16 +00:00
Weng Su
c4d0597373 Check multiple security types for Wi-Fi NetworkRequest 
- The WifiEntry already support multiple security types simultaneously from framework

- For backward compatibility, WifiEntry supports both getSecurity and getSecurityTypes methods

- However, the getSecurity method can only return one type of security, causing NetworkRequest to fail to match another type of security
  - WifiEntry:      getSecurity:WPA2   // getSecurityTypes:{WPA2, WPA3}
  - ReqeustNetwork: getSecurity:WPA3

- Need to use getSecurityTypes to check for matching WifiEntry

Bug: 205943818
Bug: 249713442
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkRequestDialogFragmentTest

Merged-In: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
Change-Id: I8848ccd1cb0589284a48ddaa77591f5bf3b41932
(cherry picked from commit a88c064842)
 2022-12-07 18:15:44 +00:00
Zoey Chen
45c646d6cb Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 am: 8b0070a509 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Iffed6efb8542259ae3f1ca22c198cc768a4ad126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 10:13:35 +00:00
Zoey Chen
8b0070a509 Merge "[Settings] Update the title if launch the fragment from search app" am: eef6d0cb24 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2331882

Change-Id: Ic4f9bb2f9fb07e9243dbb327f2ce0a41eeb9da0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-07 09:29:48 +00:00
Zoey Chen
a3c97876bb [Settings] Update the title if launch the fragment from search app 
Bug: 245613972
Change-Id: I937a4acf0917a16660ff237d0511a5883864a1b9
Test: manual
Merged-In: I07bf9a8f59ea14fc8133e2473746a59a5c187d47
 2022-12-07 07:18:42 +00:00
Zhenwei Chen
36c1e7dc20 Fix incorrect dock defender banner icon. 
Screenshots:
https://screenshot.googleplex.com/32YV7V6A6wxBPxc.png
https://screenshot.googleplex.com/77iMZ8CeuE5W8wE.png

Bug: 261156455
Test: Unit tests passed and manual test on the device
Merged-In: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Change-Id: I084c9cd52a408efa3b9aeee96a0af0cae481ec79
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 52323128dc)
 2022-12-07 05:46:57 +00:00
William Escande
0adc966d8c Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f am: cf36286d05 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I48c191048a87cf6dd4e3433d412836c25aae5bac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 09:51:34 +00:00
William Escande
cf36286d05 Merge "Update log for BluetoothPairingService" am: cfb4ed4b7f 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2328877

Change-Id: I1ce055ca532311ad813fdf5be80ee78e84c48d54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-06 09:13:43 +00:00
William Escande
cd231dc047 Update log for BluetoothPairingService 
ACTION_PAIRING_CANCEL does not contain an EXTRA_BOND_STATE

Test: Log change is no-op
Bug: 253775131
Change-Id: Ida67374e9369991d7e016b38df9c17a8fa5418cc
 2022-12-05 15:30:51 -08:00
Ale Nijamkin
092de727b9 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev am: 674bb29538 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20623875

Change-Id: Ib2cfda862a53c9093db4b21de3c4ebbf32d33a17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 20:00:02 +00:00
Ale Nijamkin
674bb29538 Merge "Specifies nav destination when opening shortcuts." into tm-qpr-dev 2022-12-05 19:38:16 +00:00
Edgar Wang
f39285a722 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev am: cb27771fd5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20608287

Change-Id: I541d2fd5f50812fbd675e7ba9466a15558bb6ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-05 03:47:35 +00:00
Arc Wang
da847e7f00 Fix SettingsHomepageActivity crash during configuration change 
Attempt to remove the animator to avoid a RecyclerView crash.

Bug: 260208703
Test: compile
Change-Id: I568cf964107f832fde4d82306fc84772bb208e20
 2022-12-05 11:35:15 +08:00
Edgar Wang
cb27771fd5 Merge "Avoid media transcode can be bypass guard of developer options" into tm-qpr-dev 2022-12-05 03:02:59 +00:00
Grace Cheng
ebda524556 Removes duplicate SFPS string and updates references am: 0d74f4b755 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20521647

Change-Id: Ifb08c7bdaf0871228620d731c72943ea91272430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-03 06:10:47 +00:00
Grace Cheng
af2896195e Merge "Removes duplicate SFPS string and updates references" into tm-qpr-dev 2022-12-03 05:37:34 +00:00
Alejandro Nijamkin
f31108f11a Specifies nav destination when opening shortcuts. 
Doing this will open the correct screen when clicking on "Shortcuts"
under Settings > Display > Lock screen.

Fix: 258471384
Test: manually verified that clicking on it opens the wallpaper picker
experience with the correct page showing.

Change-Id: I627bcb9c9fac7a834f1c9d9cb36b73a6c8817af5
 2022-12-02 16:08:32 -08:00
Grace Cheng
0d74f4b755 Removes duplicate SFPS string and updates references 
Removes duplicate security_settings_fingerprint_v2_home_screen_text string and replaces references with security_settings_fingerprint_enroll_finish_v2_message

Test: Open fingerprint settings on SFPS device where fingerprints are enrolled, observe correct string
Fixes: 259316600
Change-Id: I259669a09f5535f3a776793659e5bc6bdb90a44c
Merged-In: I259669a09f5535f3a776793659e5bc6bdb90a44c
DO NOT MERGE
 2022-12-02 23:50:37 +00:00
Dmitry Dementyev
96999068e9 Merge "Show account name as a single line string." into tm-qpr-dev am: 71dd4b23e8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20556506

Change-Id: Ifcc84304cf3d8a69069792a9d1ace64187f125ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 20:05:16 +00:00
Dmitry Dementyev
71dd4b23e8 Merge "Show account name as a single line string." into tm-qpr-dev 2022-12-02 19:30:59 +00:00
Tom Hsu
9ad53e4e89 Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9 am: 916110007d 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599

Change-Id: I2d1c10ec2cac55485987ac2f5daf38c001800b75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 08:12:47 +00:00
Tom Hsu
916110007d Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" am: 3b9cb9a7d9 
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2316599

Change-Id: I4864b0cecaae1daebfd05a7b4f8d21adb23c31b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-02 07:42:10 +00:00
Tom Hsu
3b9cb9a7d9 Merge "[Settings] modify to use LocaleHelper on AppLocaleDetails" 2022-12-02 07:16:28 +00:00
Edgar Wang
49cd8d88d1 Avoid media transcode can be bypass guard of developer options 
When developer options switch is off, a user including guest user
can still configure media transcoding settings via slices.

Bug: 244569778
Test: manual
Change-Id: I3d70045c2498e683bf615cbe521e2f98d50b7eec
(cherry picked from commit a94e8d0bc7)
 2022-12-01 12:25:31 +00:00
Wesley Wang
ada410afbe Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev am: 1f139628b3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516821

Change-Id: I97e0f4e61b4208ede2e138c55a5747be9008ef04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 07:04:13 +00:00
Wesley Wang
1f139628b3 Merge "Fix LoaderCallback.onLoadFinished uncalled issue" into tm-qpr-dev 2022-12-01 06:30:10 +00:00
Arc Wang
252bf820ee Merge "Settings 2-pane deep link vulnerabilities" into tm-qpr-dev 2022-12-01 01:45:56 +00:00
Joshua Mccloskey
88c9b00bac Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev am: 1dd3fefa93 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20592595

Change-Id: Ic81bafc8063bba1e65eef7729001556e8a330247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 01:27:36 +00:00
Ale Nijamkin
2a557b75fe Merge "Brings back "Control from locked device" setting." into tm-qpr-dev am: d81ae0a645 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20590947

Change-Id: I0c201a2a1fd594d81162c9e84fe5c775e602e5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-01 01:26:37 +00:00
Joshua Mccloskey
1dd3fefa93 Merge "Revert "Fix the flicker of FingerprintSettings before FingerprintEnrollIntro."" into tm-qpr-dev 2022-12-01 01:02:40 +00:00
Ale Nijamkin
d81ae0a645 Merge "Brings back "Control from locked device" setting." into tm-qpr-dev 2022-12-01 00:50:42 +00:00
Wesley Wang
0c5e243f35 Merge "Clean up useless defender dialog code" into tm-qpr-dev am: 2d30eaa3bd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20516820

Change-Id: Icd0d4853960504be5e6c358ab76af84bae752df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 17:21:44 +00:00
Wesley Wang
eb565adf5d Merge "Add dock defender battery tips" into tm-qpr-dev am: f218f350c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20489769

Change-Id: I5944ee42fe0e6da8a3e3a815ec3cebbabb79b155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-30 17:21:36 +00:00
Wesley Wang
2d30eaa3bd Merge "Clean up useless defender dialog code" into tm-qpr-dev 2022-11-30 11:57:01 +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