Graciela Putri
3893f2f04f
Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev am: 16f8639404
am: dcb788bded
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24224466
Change-Id: I45121c984d646ca49eb0469bcd2b33d6331d9677
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 20:40:59 +00:00
Anvesh Renikindi
3f872832fe
Merge "Change nullability of inheriting function of PinPrivacyPreferenceController" into main
2023-08-10 16:57:53 +00:00
Achim Thesmann
2185ec13bb
Merge "Allow BAL from PrintServiceSettingsFragment" into main
2023-08-10 15:48:08 +00:00
mxyyiyi
d734825145
Update battery tips cards test.
...
Test: manual
Bug: 291689623
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:71c4b617ccbf15200816b59d037991bcb1f4adcd )
Change-Id: Ifd429e10b09fb2e740b644131c6fdedce574aaa5
2023-08-10 13:49:20 +00:00
Chaohui Wang
d4074dabb3
Merge "Clean up unused unit testutils" into main
2023-08-10 10:58:15 +00:00
Elliot Sisteron
ef487255b9
Merge "Respond with null data when no biometrics." into main
2023-08-10 09:19:04 +00:00
Xinyi Mao
c249528474
Merge "Updated PowerAnomalyEvent Proto." into main
2023-08-10 09:16:29 +00:00
Graciela Putri
dcb788bded
Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev am: 16f8639404
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24224466
Change-Id: I2608156bcda676d325136beda37c2d04863a31ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 08:13:31 +00:00
Graciela Putri
16f8639404
Merge "[5/n] Add graphics to app aspect ratio options" into udc-qpr-dev
2023-08-10 07:58:03 +00:00
mxyyiyi
66530d67bf
Updated PowerAnomalyEvent Proto.
...
Test: manual
Bug: 291689623
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a8f21d75be551f062c43490b08ebc5b0aa23a220 )
Change-Id: Id9fa88d6df0db50472732e4a50aa00a7a02db284
2023-08-10 07:44:43 +00:00
mxyyiyi
14d0a1c102
Improve battery tips cards.
...
Test: manual
Change-Id: I356648d0fcec5dd1ea724297187ecafb5be55fd8
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:13fec0dbdb2c809f20a1e3b711e2491745f6d506 )
Bug: 291689623
2023-08-10 07:44:07 +00:00
Chaohui Wang
a411f3e686
Clean up unused unit testutils
...
Bug: 285231003
Test: presubmit
Change-Id: Ibb228dc371c0f52a02a404d3c0c0f2a02e5806f0
2023-08-10 15:39:25 +08:00
Chelsea Hao
0fcc479625
Merge "Created a new activity in settings App." into main
2023-08-10 06:33:56 +00:00
SongFerng Wang
4f32231cda
Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am: 9265db6557
am: e527493354
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342218
Change-Id: Ie234d3200f8adf08ed3022a7c08644f019a7bd60
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 06:30:37 +00:00
SongFerng Wang
e527493354
Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev am: 9265db6557
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342218
Change-Id: I34d588990a5357a05f636a583361a608b4b28976
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-10 05:43:51 +00:00
Chaohui Wang
db45ed7370
Merge "Clean up @OptIn(ExperimentalCoroutinesApi::class)" into main
2023-08-10 05:39:03 +00:00
chelseahao
3ecc87b345
Created a new activity in settings App.
...
This activity displays a WifiDppQrCodeGeneratorFragment after unlocking. This will be used by the new "Share Wi-Fi" button in quick settings InternetDialog.
Bug: 294487249
Test: atest com.android.settings.wifi.dpp.WifiDppConfiguratorAuthActivityTest
Change-Id: I58b61f597db67082f23a1acb4fae5a4556238584
2023-08-10 05:35:47 +00:00
SongFerng Wang
9265db6557
Merge "The 2G enable's summary shows the sim card name" into udc-qpr-dev
2023-08-10 04:53:18 +00:00
Allen Su
be642020cc
Merge "Keep the dialog when touching outside the window" into main
2023-08-10 03:21:50 +00:00
Haijie Hong
9186f375df
Merge "Improve Bluetooth pairing dialog & contact sharing toggle" into main
2023-08-10 02:53:29 +00:00
Treehugger Robot
a0d2828730
Merge "Fix R.drawable.ic_search_24dp" into main
2023-08-10 02:52:47 +00:00
Treehugger Robot
4e1b10e9eb
Merge "[BiometricsV2] Fix end-to-end enroll test fail" into main
2023-08-10 02:32:25 +00:00
Chaohui Wang
295a46f3e0
Fix R.drawable.ic_search_24dp
...
It's belong to namespace com.android.settingslib.search instead of
com.android.settingslib.widget
Fix: 295106566
Test: m Settings
Test: installmod Settings
Test: manual - on Developer Option page
Change-Id: I69839d422230815b17327f7f937854c4c72890fb
2023-08-10 10:00:24 +08:00
Angela Wang
f6c3736352
Merge "Show binaural ASHA hearing aids addresses" into main
2023-08-10 00:50:16 +00:00
Justin McClain
b7f9d72560
Merge "Remote authenticator enrollment introduction layout." into main
2023-08-09 22:48:51 +00:00
Automerger Merge Worker
12cbdec991
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours" into udc-qpr-dev-plus-aosp am: 511c72a858
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I35f115ff2987ac37c24aae013b29ed345830a439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 21:13:48 +00:00
Bill Yi
628a1d3bc0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours am: 7cf9c48bae
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I2511c047c775e413085d427d3d2ca94caf3847c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 21:13:45 +00:00
Bill Yi
ddff4a7ecf
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 9652e9c719
-s ours am: a504e18149
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I54fc6d8791ec71284495ae4a862fe7f5c085c069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 21:12:45 +00:00
Bill Yi
7e4efad0d8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 6672750bc5
-s ours am: a21b81f077
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Ic854c7799c82d2acb8aaea4e7c16fb97ec9e7908
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 21:11:30 +00:00
Justin McClain
f71909220b
Remote authenticator enrollment introduction layout.
...
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.
Bug: b/293908278
Test: atest RemoteAuthEnrollIntroductionTest
Change-Id: Ia20662e897f925d82547550e25b79a2e61d2dc34
2023-08-09 20:53:05 +00:00
Automerger Merge Worker
511c72a858
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours" into udc-qpr-dev-plus-aosp
2023-08-09 20:23:54 +00:00
Bill Yi
7cf9c48bae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours am: 38a0dbf56e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Idaf3e9b4651f4a084b2b485fd4473b334a39fd9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:48 +00:00
Bill Yi
a504e18149
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 9652e9c719
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I647a12e7e1346238ea666d6e1c573cb8490f1c43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:39 +00:00
Bill Yi
a21b81f077
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours am: 6672750bc5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I66fe9ee2e5c45c39272ca441336a9d3754a6704c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 20:23:25 +00:00
Bill Yi
38a0dbf56e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 6cb3c567da
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I35f0cefb18df5b77e3b80df34237c6aef76e2570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:54 +00:00
Bill Yi
9652e9c719
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I40d2c7cccabc1cf17c329ae6ab56c3a47ba0dfd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:53 +00:00
Bill Yi
c16fbeba8f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: e386a40c7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I008bfa308aafa971e99f2bb5ad5f135b64683b64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:40 +00:00
Bill Yi
6672750bc5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours am: 5ba6d8c939
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I1dff64c0aa9aba357dc489d82ffce984d7e861b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 19:43:02 +00:00
Bill Yi
e386a40c7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I561989da97fbb01dab1526f1a155d4fe8f19f6bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:57:12 +00:00
Bill Yi
6cb3c567da
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: Id21824686a3e59ad6ee5bb57b5ff33f30b5e5593
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:56:54 +00:00
Bill Yi
5ba6d8c939
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 735a75da63
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24371713
Change-Id: I359371221dc01d908c2acae69c2665acdf6d060c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 18:52:49 +00:00
Achim Thesmann
afbc3a4929
Allow BAL from PrintServiceSettingsFragment
...
This fixes the info button on the printer in the printer list (the call
is from the system (uid=1000) and needs to allow BAL to start the
activity).
This only opts in sending a single pending intent to the previous (pre U) behavior which allows BAL. Therefore the risk of the change is minimal. This was reported by an external partner.
Bug: 277761614
Test: manual test & presubmit
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:fdb87fe235887460081ed396cf6ab902f1971b5d )
Merged-In: I35715e948b9166c42372b7d40a30a7102018a148
Change-Id: I35715e948b9166c42372b7d40a30a7102018a148
2023-08-09 18:15:04 +00:00
Treehugger Robot
8634789d95
Merge "Split the string resource id for non-generic accessibility preference." into main
2023-08-09 17:58:35 +00:00
Evan Chen
e10fbc9af9
Merge "Add tag for associationInfo" into main
2023-08-09 17:25:37 +00:00
Bill Yi
735a75da63
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
BUG:291030186
Change-Id: Ibf93c473acbb5f6060ec039a8a1b5ec824d638f6
2023-08-09 17:24:49 +00:00
Chun-Ku Lin
364178428a
Merge "Remove unused variable" into main
2023-08-09 17:08:17 +00:00
Andreas Miko
a7d7eb9a16
Change nullability of inheriting function of PinPrivacyPreferenceController
...
Test: None
Bug: b/292569343
Change-Id: Idbfa244921957be2bba3cd02e5e873e81e8807d8
2023-08-09 16:35:09 +00:00
Milton Wu
b1ad3fa01b
[BiometricsV2] Fix end-to-end enroll test fail
...
Fix end-to-end enrollment test fail because of using incorrect observer
type to observe finish page data
Bug: 295140687
Test: atest biometrics-enrollment-test
Change-Id: I9ca8d1c6383c2ecf3f94dc1e5cbb878e4328a900
2023-08-09 23:27:57 +08:00
Vania Januar
7dd94771bc
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
am: 2afb275e09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I943ad68a44de16de1899ad4a613c2c221c698f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 15:13:35 +00:00
Vania Januar
2afb275e09
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I1969dedbd9327fc6ab4dfa0715192b3f882a4e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 14:32:18 +00:00