Bill Yi
2c7ca303ea
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4453455aae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20715276
Change-Id: I44b33cf33b581726795713834e56a6cf15ca5415
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 20:25:07 +00:00
TreeHugger Robot
47302fda11
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-13 19:49:15 +00:00
Diya Bera
6b468377c1
Flicker in Fingerprint Enrollment
...
Fixes: 259707991
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER=MessageDisplayControllerTest
Change-Id: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
Merged-in: I2581dfcc7054c5df1368d5d912dbbc4c8ea01f23
2022-12-13 18:17:23 +00:00
Yi Jiang
7075fd453d
Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev am: 410c1d28bf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20696311
Change-Id: I8fb334d8ac3783286c3cce1df3bd5d2c83a92c5c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-13 17:06:07 +00:00
Yi Jiang
410c1d28bf
Merge "Creates a flag for auto-rotate with face detection" into tm-qpr-dev
2022-12-13 16:27:35 +00:00
Ankit Agrawal
5bff5f3868
Adb is disconnecting during Monkey Test Run.
...
When running the monkey test, its going in tethering page
inside Settings app and enabling ethernet tethering.
Due to get adb connection is getting lost.
Guarding ethernet tethering option when monkey test is running,
it will not display ethernet tethering option during monkey test.
Bug:
Test: start monkey test run using below command
adb shell monkey -v 1000000
Change-Id: I4040cb088404e663b032179ff52b1bc564ecf76b
Signed-off-by: Ankit Agrawal <ankit.agarwal@intel.com >
2022-12-13 21:24:11 +05:30
Arc Wang
f964b68fee
Allow 2-pane deep link to access unexported Activity
...
If an Activity is not exported, the Activity still can be
launched by components of the same application, applications
with the same user ID, or privileged system components.
Bug: 261678674
Bug: 250589026
Test: manual visual
Launcher -> context menu -> Wallpaper & style
Change-Id: I662df6cb287361b135e2c596abe946ddeb03bda4
Merged-In: I662df6cb287361b135e2c596abe946ddeb03bda4
2022-12-13 15:41:36 +08:00
Android Build Coastguard Worker
2bf9df8d1f
Snap for 9397138 from 7bae5625a6
to tm-qpr2-release
...
Change-Id: I9a4717ac1a88b5305f914fa90dabb7cb47a0a866
2022-12-13 04:09:38 +00:00
William Xiao
ea655e9695
Default to timing out to dock user in 1 minute
...
Previous default was to disable the feature.
Bug: 260123067
Test: verified locally on device that the default is 1 minute for a new
user
Change-Id: I8f577d62b729eb1c1a0579a7b4eb6b50f7f7f0d8
2022-12-12 18:36:30 -08:00
Jason Chiu
55b17eb3fb
Fix IllegalArgumentException from RecyclerView in PanelFragment
...
The crash happens while RecyclerView is doing animation stuff. However,
The panel doesn't use any animation in the list, so the simplest
solution is to disable the ItemAnimator completely.
Fix: 260923012
Test: build
Change-Id: I9c5159366aca448a1075bee32ce940fbf902a450
2022-12-13 10:35:40 +08:00
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
Bill Yi
4453455aae
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I351b7072bcfca6b3bc3808c49290cdd9ef120670
2022-12-12 16:59:11 -08:00
Yi Jiang
1145b26ac7
Creates a flag for auto-rotate with face detection
...
The flag is enabled by default. And will be disabled on foldable
devices.
Test: locally
Bug: 236249360
Change-Id: I8c90533f6011531a4f00af5f2514579638604067
2022-12-12 19:49:16 +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
Shen Lin
f677ee600a
Align SETTINGS_PACKAGE_NAME reference to a single place
...
This CL migrated some fragmented declarations of Settings packageName.
When we want to referece package name of Settings, we prefer using
Utils#SETTINGS_PACKAGE_NAME.
Bug: 262123382
Test: make Settings -j64
Change-Id: Ice6afd993d5991bb3c50f676c637b9a5487261f7
2022-12-12 04:56:28 +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
ee773103f8
Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue" am: 956f288d1d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2334743
Change-Id: I6b1d18248dc3026bda0e02e1d43fc350f1e9a680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 08:44:09 +00:00
Weng Su
956f288d1d
Merge "fix WifiUtils:isNetworkLockedDown() null pointer issue"
2022-12-10 08:11:40 +00:00
Android Build Coastguard Worker
bddac0b93f
Snap for 9390188 from d4d011a97b
to tm-qpr2-release
...
Change-Id: Id0a68242da046e199ac37bbdf881cc8ea2db6959
2022-12-10 02:25:40 +00:00
Automerger Merge Worker
99c0b8baf6
Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master am: b54c768b90
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I8a220494d03397eab1e2076c27ee15ab8a96c99f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 01:59:33 +00:00
Xin Li
bd7e05c797
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours am: 06b6887d64
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I3d36ea91eb5b79ce1a62d2a4b7ca0d8c2ec6b293
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 01:57:13 +00:00
Xin Li
f63f3c682d
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours am: ef13057b38
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: Ic3dcfca9dfd8b0507f02b46c0396fd7134c76875
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 00:26:58 +00:00
Xin Li
862a28bbfe
[automerger skipped] Merge Android 13 QPR1 am: ea401a8bba
-s ours am: 61084112c8
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I8b47aa9d46c1f9abe02ac9df009921564231c6be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-10 00:24:34 +00:00
TreeHugger Robot
e33c25fdfb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: d4d011a97b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20678239
Change-Id: I2cd665e51597b3175ca4f463234c60d547c0fdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:44:43 +00:00
Bill Yi
e7a29cb4de
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: afd2a8e009
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20678239
Change-Id: I32f4f86b3c67f0f70090a60988493305b65565e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:44:07 +00:00
Automerger Merge Worker
b54c768b90
Merge changes from topic "am-c3479d1074da4f49a5c817b8ee7f386a" into stage-aosp-master
...
* changes:
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours
[automerger skipped] Merge Android 13 QPR1 am: ea401a8bba
-s ours
2022-12-09 23:29:46 +00:00
Xin Li
06b6887d64
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I56c03228186562c1b182f5b3469c41258049a90c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:21:33 +00:00
Xin Li
48787cbef6
[automerger skipped] Merge Android 13 QPR1 am: ea401a8bba
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I806f6b7b5dc3924cc7bde0cf069564f16c93d6fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:19:11 +00:00
TreeHugger Robot
d4d011a97b
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-12-09 23:17:52 +00:00
Xin Li
ef13057b38
[automerger skipped] Merge "Merge Android 13 QPR1" am: b6df569c32
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I75ef121f1fa751c5b8c5dac57fb170c6549a4645
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:16:54 +00:00
Xin Li
61084112c8
[automerger skipped] Merge Android 13 QPR1 am: ea401a8bba
-s ours
...
am skip reason: Merged-In I937a4acf0917a16660ff237d0511a5883864a1b9 with SHA-1 a3c97876bb
is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2338195
Change-Id: I13c20e6b2f1928b1883496a3a50d799773f00bdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-09 23:14:27 +00:00
Xin Li
b6df569c32
Merge "Merge Android 13 QPR1"
2022-12-09 21:51:11 +00:00
Xin Li
ea401a8bba
Merge Android 13 QPR1
...
Bug: 261731544
Merged-In: I937a4acf0917a16660ff237d0511a5883864a1b9
Change-Id: Iec2afb26733df72a2a8bf46566ffc8a7730069eb
2022-12-09 10:30:19 -08: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
Shen Lin
d0daff5a6d
Override onTrimMemory to apply trimMemory in AppIconCacheManager
...
This CL adapts new trimMemory mechanism when device running moderately
low on memory.
Bug: 259630755
Test: manual
Change-Id: I6501b834ce3327f47e911600ac6fe2f09a80e54e
2022-12-09 09:45:30 +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
Android Build Coastguard Worker
9c284b3e4c
Snap for 9385690 from 72490ec149
to tm-qpr2-release
...
Change-Id: I443c2abe2c7108b9ea5099c28e0ac06a76cdc3f4
2022-12-09 00:26:16 +00:00
Bill Yi
afd2a8e009
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb23f9583f98c120733cc0ba1ca621d39855d960
2022-12-08 01:19:59 -08: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
Zhenwei Chen
72490ec149
Merge "Fix incorrect dock defender banner icon." into tm-qpr-dev
2022-12-08 03:33:57 +00:00
Android Build Coastguard Worker
04c63ccf74
Snap for 9381392 from 47fa893358
to tm-qpr2-release
...
Change-Id: Iadd07af161c99ef5d04d39e781f085814238fce1
2022-12-08 00:26:36 +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
Yasin Kilicdere
ee476cab18
Remove the fallback AddSupervisedUserActivity.
...
Rollback the changes done in ag/16388725 and ag/16709333
Bug: 209659998
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: I75b85df50a3caff55375ad261a97225377644a38
(cherry picked from commit 86f3500439
)
Fixes: 249057848
2022-12-07 15:23:37 +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
Zhenwei Chen
89ad53e3cb
Merge "Fix batteryInfo unit test" into tm-qpr-dev am: 47fa893358
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20638347
Change-Id: I8d1993dea1435d4f6679e682be99025a9a0daa30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-12-07 09:29:07 +00:00