Bill Yi
49c2652453
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Id472fd8a72cf62a383942953901c18e13570dc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:27 +00:00
Bill Yi
8f600b3932
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I43d982ef1c633b0fb592a81b3cd49c55cc20862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:11 +00:00
TreeHugger Robot
488d3adb81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: Id7f81ddfe5f308de358950a5eba75a2852f29f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:37 +00:00
Bill Yi
934826d8d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I4c800f6e4828b492ee35ba09492fac1f388f3fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:33 +00:00
TreeHugger Robot
62a6197006
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ib76fbcdf3c4c9a282bcb659941d0ea465d1ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:29 +00:00
Bill Yi
47d7d69611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ib27e69a8c83f8a538a387a3b95d137d68841d739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:17 +00:00
Bill Yi
5d6536ce44
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I8aea0e66f39df752b06ba85adc5201a8bd1ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:05:41 +00:00
TreeHugger Robot
8e002f962e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
Chris Li
1092486873
Update EmbeddingAspectRatio to the latest
...
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.
Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248
)
2023-02-27 21:44:43 +00:00
William Leshner
31d834320c
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
am: f5364571a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: I76751b25e8f24fa288822e7d942075318a1a2a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 21:34:47 +00:00
Julia Reynolds
57a42d2a93
Fix settings crash
...
Test: post notification with an action with a null title, view
notification widget
Fixes: 250836823
Change-Id: I56707c628b3fcc7d6823e4b3736dd26e3d98dfa7
2023-02-27 16:24:21 -05:00
William Leshner
ef5b93d05d
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
am: c60c7e70a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: Ia3ba4a7764b2f2a3f1a4320a4db9d13afd9d4df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 18:33:51 +00:00
Will Leshner
3358e2a0a1
Restrict screen saver settings searches to enabled users.
...
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.
Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.
Merged-In: If2f465b2acb548455f0868507cf47217ea1a626f
Change-Id: I96fb8f9c6c4960f203b51bb43994f7bafdcefdf5
2023-02-27 10:20:05 -08:00
William Leshner
f5364571a3
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: I5e938be27d0995589fd25f565b103c31ac6f2268
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 17:57:33 +00:00
William Leshner
c60c7e70a1
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: I42bc75b052b758d20e598fd3d0da9aa00a5403e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 17:57:14 +00:00
William Leshner
01dfbcc297
Merge "Restrict screen saver settings searches to enabled users." into udc-dev
2023-02-27 17:30:48 +00:00
Steve Elliott
caf6347d11
Merge "Update unseen notif filtering settings string" into tm-qpr-dev
2023-02-27 17:01:42 +00:00
Bill Yi
e722779e34
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I79fd097ef9e144fd9a7afa07b098e7f2142dfb5b
2023-02-27 04:28:22 -08:00
Bill Yi
a2cbc7ea7c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I15d98108201d7c114ffd7e30f3141af4e8fc0497
2023-02-26 20:37:26 -08:00
Bill Yi
c253ffe61a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic10f43fb3b99fbf09a56366b4d0e0fd864741d05
2023-02-26 20:36:20 -08:00
Bill Yi
99b4d024d1
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I48f351db5e5fb38e3ea5f197f7648c805d21c487
2023-02-26 20:34:24 -08:00
Milton Wu
94b421b253
Refine FingerprintEnrollmentActivity
...
1. Fix backstacks after enrolling finish
2. Support skipFindSensor and skipIntro
Bug: 260957939
Test: Manually test it on different sensor devices
Change-Id: I4061e29999a47bf4859d6562ad82330fb0f6f620
2023-02-25 08:08:31 +00:00
Weng Su
f3e249b813
Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a
am: 07618e1cec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044
Change-Id: Icc59e931b725a8a2408c5ebeb6e461f4308eee62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 03:53:05 +00:00
Weng Su
7d642541b7
Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a
am: b0e3972f8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044
Change-Id: Ib6373f7aea55af0861daed22e1c210f6ab34f85e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 03:12:32 +00:00
TreeHugger Robot
350a37e46b
[automerger skipped] Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb
am: 4f191d9588
-s ours
...
am skip reason: Merged-In I1e89e99ef11cd1fb64750709e331e1f059d2eeaf with SHA-1 b52fb4ce0b
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175
Change-Id: Ic394563bd09cace41ad3c5a8f36fd76b2ddcec48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:59:48 +00:00
Weng Su
b0e3972f8c
Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044
Change-Id: I6fa29502a440a88303b17cbeb09dfbe653ede340
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:59:03 +00:00
Weng Su
07618e1cec
Merge "Refer to the last Hotspot password when generating the password" into udc-dev am: d078d1f00a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21534044
Change-Id: Ie8f4eaeeab908a913b85d0d1a0b97c848248d89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:58:57 +00:00
Henri Chataing
f23819840e
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
am: c2c408f3b4
am: 8a77c25623
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I229194b895d508d25274950dadb1cc00d0d49471
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:56:53 +00:00
Weng Su
d078d1f00a
Merge "Refer to the last Hotspot password when generating the password" into udc-dev
2023-02-25 02:33:55 +00:00
TreeHugger Robot
4f191d9588
Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175
Change-Id: I55e21038d89b5322e8c04f3c4729b25070b967c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:28:38 +00:00
TreeHugger Robot
8e2045213c
[automerger skipped] Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb
am: 76a930705b
-s ours
...
am skip reason: Merged-In I1e89e99ef11cd1fb64750709e331e1f059d2eeaf with SHA-1 0172ff6942
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175
Change-Id: Ia05e37c76a3049447452b075d36648ba10be19a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:25:09 +00:00
Henri Chataing
a55ba21457
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
am: c2c408f3b4
am: 2f83720dab
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I4e35d6e2bbe846ace37acca34860632a6fb13b6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:24:45 +00:00
Henri Chataing
8a77c25623
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
am: c2c408f3b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I00eabf4a0f6278d5ef6a241f3d7b27ec9a8cb5a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 02:19:11 +00:00
TreeHugger Robot
76a930705b
Merge "Update strings based on UX/product feedback" into udc-dev am: 887a733ebb
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21579175
Change-Id: I09e1f7cbc722ef59e5cacf3c354f3a7de289d1ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 01:50:40 +00:00
Henri Chataing
2f83720dab
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
am: c2c408f3b4
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I7ac6eadaf67b235c67f9b1c4b037e7f725ef8644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 01:47:40 +00:00
TreeHugger Robot
887a733ebb
Merge "Update strings based on UX/product feedback" into udc-dev
2023-02-25 01:05:32 +00:00
Henri Chataing
c2c408f3b4
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
am: 5bb48d9250
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: I4edc194d398c13b80df97c682c7494fb1962a64b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-25 01:02:19 +00:00
Henri Chataing
5bb48d9250
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
am: 1325de7875
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: Ia03c857e442f801d7fb042dda4c186aeb1dce1e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 23:54:34 +00:00
Will Leshner
ca1379f0b3
Restrict screen saver settings searches to enabled users.
...
If a user can't enable screen saver, they shouldn't be able to
accidentally find screen saver related settings in Settings.
Bug: 260276394
Test: atest ScreenSaverPreferenceControllerTest
Test: manually by settings up a second user on a device that supports
screen saver, switching to that user, and making sure that searches for
"screen saver" don't accidentally reveal settings that can't be
accessed.
Change-Id: If2f465b2acb548455f0868507cf47217ea1a626f
2023-02-24 15:36:48 -08:00
Henri Chataing
1325de7875
Merge "Nfc: Rename system properties in Nfc settings" am: fa88ad84be
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2452247
Change-Id: Ibbe1f8ed19c421b32f24675734eeb233b61e5468
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 23:02:43 +00:00
TreeHugger Robot
a6ea56f774
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1
am: ade18c1ffe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373
Change-Id: I79215a2118df5ebb87af54718c18b9eb1a803e16
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 20:42:24 +00:00
TreeHugger Robot
92efcd50c9
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1
am: d9d0d1bb7a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373
Change-Id: Id3e0bc1edbe1827d79d935a085926bba51c06070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 20:26:02 +00:00
TreeHugger Robot
ade18c1ffe
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373
Change-Id: I639c4bab90359dd33d557b05acd1d43556c7a184
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 19:55:37 +00:00
Becca Hughes
b52fb4ce0b
Update strings based on UX/product feedback
...
Update settings strings for cred man based
on feedback.
Test: make
Bug: 264939770
Change-Id: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
(cherry picked from commit 0172ff6942
)
Merged-In: I1e89e99ef11cd1fb64750709e331e1f059d2eeaf
2023-02-24 19:50:50 +00:00
TreeHugger Robot
d9d0d1bb7a
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev am: 3a445a3ea1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21489373
Change-Id: I3cb57e455477a21b130862be572b421663d16dfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 19:46:05 +00:00
Becca Hughes
d9ce857fd5
Merge "Update strings based on UX/product feedback"
2023-02-24 19:45:33 +00:00
Henri Chataing
fa88ad84be
Merge "Nfc: Rename system properties in Nfc settings"
2023-02-24 18:57:25 +00:00
TreeHugger Robot
3a445a3ea1
Merge "Allow Magnification Settings launch from outside of AccessibilitySettings" into udc-dev
2023-02-24 18:54:44 +00:00
TreeHugger Robot
9713d1ce2d
Merge "Fix b/270656372 unit test failure." into udc-dev am: f9ef8e39f5
am: f52774ec73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21578803
Change-Id: I3fc4b391adece41faa7fe8157854d62a30f77e57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-24 18:53:29 +00:00