PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
110,974 Commits 1 Branch 0 Tags
c52d4922cce779b4ccf7f03089dde7a76542a7e9
Commit Graph

110974 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Diya Bera
c52d4922cc Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev am: 2d343061d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20523590

Change-Id: I8fdd0725e4c0a1b0d2f7ced3ce058522566528f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 21:37:51 +00:00
Diya Bera
2d343061d3 Merge "Flicker in Fingerprint Enrollment" into tm-qpr-dev 2022-12-13 21:15:08 +00:00
TreeHugger Robot
240835c715 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 47302fda11 -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: I41d2cb5a62ffa6d03e24dfb143a4816881be2494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-13 20:25:39 +00:00
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
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
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
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
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
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
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
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
Zoey Chen
eef6d0cb24 Merge "[Settings] Update the title if launch the fragment from search app" 2022-12-07 08:43:10 +00:00
Zhenwei Chen
47fa893358 Merge "Fix batteryInfo unit test" into tm-qpr-dev 2022-12-07 08:31:44 +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
cfb4ed4b7f Merge "Update log for BluetoothPairingService" 2022-12-06 08:30:23 +00:00
Zhenwei Chen
b41e06a5fb Fix batteryInfo unit test 
Bug:261139453
Test: Unit test passed
Merged-In: I8f94f984dc1bf833653ae49557fdd02f736b365c
Change-Id: I8f94f984dc1bf833653ae49557fdd02f736b365c
Signed-off-by: Zhenwei Chen <zhenwec@google.com>
(cherry picked from commit 54615b3bec)
 2022-12-06 06:22:38 +00:00