Bill Yi
d0d6aeb5a3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d1da0de9ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086807
Change-Id: If80dc476597c454d7c2587dfe779968ea2ae9cb0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-02 07:01:48 +00:00
Bill Yi
f770454d82
Merge "Import translations. DO NOT MERGE ANYWHERE"
2022-10-02 06:20:56 +00:00
Bill Yi
a050a847bc
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2022-10-02 06:20:38 +00:00
Bill Lin
e4bf1025d1
Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c
am: 6b763d1999
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179
Change-Id: I6ead342e386b2a208515997686e9a341075cdce2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-01 00:55:08 +00:00
Bill Lin
6b763d1999
Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev am: e5a4e38c8c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20080179
Change-Id: I5a16ac472b0a08273d2410b39741675a6f998f51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-10-01 00:22:29 +00:00
Bill Lin
e5a4e38c8c
Merge "Do not override SUW Glif theme when onApplyThemeResource() callback" into tm-qpr-dev
2022-09-30 23:54:31 +00:00
Bill Yi
471ccfc1be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours am: 148f0a8591
-s ours am: ba331be678
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I7d1c1c6d3a3a4e3c4a72c47c952c98bf78760ceb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 22:03:22 +00:00
Bill Yi
f152695c97
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 6cf6175ec3
-s ours am: 3a2a9c27a2
-s ours am: 6c8ff68ac2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: If5f2905bf0ac5ec8ad1a24047627b83863d4779e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:51:01 +00:00
Bill Yi
6ff7c58054
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours am: e7722ef90c
-s ours am: e6d49db2fc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I8b983f467efc7978862c7a7a565c1ceca1294ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:48:33 +00:00
Bill Yi
ba331be678
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours am: 148f0a8591
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I59052a6cddf76148650c3def3f875a3c7f3650ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:40:34 +00:00
Bill Yi
6c8ff68ac2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 6cf6175ec3
-s ours am: 3a2a9c27a2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I6b48eeedb2292e93045ca38617113ee3ccb62e91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:17:07 +00:00
Bill Yi
e6d49db2fc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours am: e7722ef90c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ib5f00df6d8bf3d9543a1d41c96af4f8a1ee7b911
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:08:39 +00:00
Bill Yi
e090646f5d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 42a2389e6a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I8ce6f82dffdcfd3fa042d88e450ebf470de0bd12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 21:02:27 +00:00
Bill Yi
148f0a8591
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I07f8debb98eeee861b53234a5e1ea81d22e24a31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:57:39 +00:00
Bill Yi
e7722ef90c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 4bf99a1f0f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ice33ed5798d03b887d2d0feb637ddeb37223c7d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:56:21 +00:00
Bill Yi
3a2a9c27a2
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours am: 6cf6175ec3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Iaa63d8f87752e9f593cc5f79a4d87116a86f6239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:48:01 +00:00
Bill Yi
4bf99a1f0f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: I494de493df292a1ae0cb827d75b1a3458f4c65b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:46:53 +00:00
Bill Yi
42a2389e6a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ib797a3b4169abb6faea3b5bc868e8e785c51adec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:45:49 +00:00
Bill Yi
6cf6175ec3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e289b0f368
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20086809
Change-Id: Ib3d599dccb4076c42bc05cfbdec0036e72ec9177
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 20:44:09 +00:00
TreeHugger Robot
13bc08e29a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 12a1ed5662
-s ours am: 2525056f1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20087004
Change-Id: Id9675032c22173e4e390b34d10ddc24724a1451d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 19:17:56 +00:00
Bill Yi
a76fb7af27
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf54fdb73b
-s ours am: 6ba4170976
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20087004
Change-Id: I18234da68c32ee9eb2a4e592975de95dc6cc0a71
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 19:17:45 +00:00
TreeHugger Robot
2525056f1d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 12a1ed5662
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20087004
Change-Id: Iea8b7d3d8ac230245faf4d58b3692ed99702dcef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 18:44:32 +00:00
Bill Yi
6ba4170976
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cf54fdb73b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20087004
Change-Id: I4d9fc13a34443adb3241eab58c2e8f9d2c770169
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 18:44:20 +00:00
TreeHugger Robot
12a1ed5662
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2022-09-30 18:14:33 +00:00
Grace Cheng
5772172b62
Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev am: c6d9164dd4
am: b20a0ed55f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083885
Change-Id: I4ff2962c01ecc070194d26942aa635c95a8be3fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 18:09:22 +00:00
Jake Weinstein
bfa7606ee6
Change Peak Refresh Rate string from 90 Hz to config_defaultPeakRefreshRate
...
This should not be static, devices can launch with various
max refresh rates. Without this commit, you would need
to manually change the string for the summary
to be accurate.
Test: mm
Change-Id: I6f06fd5ebd57d7069a3d76e555950558a3edc48e
2022-09-30 17:47:31 +00:00
Grace Cheng
b20a0ed55f
Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev am: c6d9164dd4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083885
Change-Id: Iea3e8fd7e16fdd4af2b9a2bde3ea5991e3fabffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 17:34:25 +00:00
Grace Cheng
c6d9164dd4
Merge "Show lottie on non-default display density on SFPS" into tm-qpr-dev
2022-09-30 17:05:30 +00:00
Milton Wu
9f070ee9c1
overridePendingTransition in FingerprintSettings
...
When FingerprintSettings got correct activity result from ConifrmLock or
ChooseLock, and ready to add first fingerprint automatically, it shall
set sud_slide_next_in and sud_slide_next_in in
overridePendingTransition.
Bug: 249981049
Test: Manually credential in FingerprintSettings
Change-Id: If63441cf1a72c30d558e9f50a0aada36a08b211d
2022-09-30 13:43:35 +00:00
Tsung-Mao Fang
f5062c2df8
Guard FallbackHome activity behind permission
...
An attacker can launch FallbackHome of the Settings app
to reset unlock time. This would prevent the device from
sleeping because it runs the following code:
PowerManager#userActivity().
However, running PowerManager.userActivity() requires
android.permission.DEVICE_POWER or android.permission.USER_ACTIVITY.
So, let's add a permission to guard this activity.
Test: Rebuilt a rom and see no side effect.
Bug: 246543238
Change-Id: I23a1e352f76cbec3e8c07a1b58b94615f2779121
2022-09-30 15:31:47 +08:00
Tsung-Mao Fang
05412c37c7
Make preference unselectable
...
Because Encrypt phone is not an entry which can launch to next page,
let's make it unselectable now.
Change-Id: I860c76c501fccc488b2e120a4702c652f1bee134
Test: Manual test
Fix: 249193859
2022-09-30 15:15:50 +08:00
Joonhun Shin
23f15f80e1
Merge "changed return value METRICS_CATEGORY_UNKNOWN to SETTINGS_CONTACT_DISCOVERY"
2022-09-30 05:14:41 +00:00
lbill
39175b2f87
Do not override SUW Glif theme when onApplyThemeResource() callback
...
1. Accodring to settings & setupdesign lib theme architecture
Only force apply sytle SetupWizardPartnerResource for current
activity/contextThemeWrapper is sufficient, override GlifV3Theme
again will cause incorrect resource mapping of private attributes.
2. Set Theme_AlertDialog style for AlertDialog in for Material design
- FingerprintEnrollEnrolling
- FingerprintEnrollFindSensor
3. Add test for AlertDialog theme, and fix broken test cases
Fixes: 245684949
Bug: 249789759
Bug: 248994476
Test: manual in SUW `adb shell cmd uimode night yes` and check visual
Test: manual in SUW enrolling check timeout dialog apply theme
Test: manual in SUW enroll UDFPS tips lottie view showing expectedly
Test: manual in SUW enroll UDFPS landscape showing correct layout
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
SetupFingerprintEnrollFindSensorTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollEnrollingTest
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
FingerprintEnrollFindSensorTest
Change-Id: I17cbf26e38318e6681ba124d23bf86317a0f1e1d
2022-09-30 04:58:28 +00:00
Bill Yi
3ce9e908f9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ibb582089c3601dcd3dc8e5c47d36da97b0be9c0d
2022-09-29 18:57:44 -07:00
Bill Yi
cf54fdb73b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I095695f0dfaf97b6944010e51b3b1463c3b7fbb0
2022-09-29 18:54:45 -07:00
Bill Yi
e289b0f368
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9a1027d900d021590709e82299a9dee0533e380d
2022-09-29 18:51:56 -07:00
Bill Yi
bd23528a6e
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0acd1bf9cb484251df0a025179c001f527aad09a
2022-09-29 18:48:37 -07:00
Bill Yi
d1da0de9ee
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I9d068e8112bd285385013841c3bd05df2abe4a79
2022-09-29 18:40:46 -07:00
PETER LIANG
0039fb35cd
Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev am: 937821f30f
am: a3e3790a73
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20067817
Change-Id: I9deea489564aea71955570ea6f125f13c60f61ff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 01:02:44 +00:00
PETER LIANG
a3e3790a73
Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev am: 937821f30f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20067817
Change-Id: I13053b63fe2ee106b558fdc40488140d200acd9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 00:30:49 +00:00
Grace Cheng
27a52f5055
Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev am: 6b27a8bb70
am: 3ebab337b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083884
Change-Id: Ib76f9b2f4196b5de281285639dc29b07a99b0356
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-30 00:19:06 +00:00
PETER LIANG
937821f30f
Merge "Fix that when I go to display size in the settings, the largest size shows the smallest icons." into tm-qpr-dev
2022-09-30 00:00:14 +00:00
Grace Cheng
3ebab337b9
Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev am: 6b27a8bb70
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20083884
Change-Id: Ib445daafd58314954ea095e4adb8e351a454b30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 23:49:09 +00:00
Grace Cheng
6b27a8bb70
Merge "Fixes DT enrollment asset showing in light mode" into tm-qpr-dev
2022-09-29 23:29:30 +00:00
Grace Cheng
6c72ef89b2
Show lottie on non-default display density on SFPS
...
Continue showing lottie when text size/display size is changed on SFPS, because unlike C10/P10, lottie will not overlap text on SFPS
Test: (manual) Change display size and text size to max, verify lottie is visible and does not overlap text
Fixes: 245029066
Change-Id: I041415abc21722052a9adbdc927847c42cd7619f
2022-09-29 19:42:59 +00:00
Grace Cheng
990af9ea7a
Fixes DT enrollment asset showing in light mode
...
Moves DT->LT dynamic color mapping call to after animation asset is set
Test: (manual) In light mode, advance past fingerprint enrollment edu screen and hit back button, observe correct LT asset
Fixes: 246233066
Change-Id: I5425f57b151a6f586338497ee0e5bf247af55f6e
2022-09-29 17:47:33 +00:00
Tom Hsu
95d0ec1b00
[automerger skipped] Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee
am: f0635482c7
-s ours
...
am skip reason: Merged-In I3bc5088784ed97f69ffadb0ea69078bfcf7dc39d with SHA-1 2f753c7ba7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133
Change-Id: I34aeba0eaf9fcad70fb57b09a85bcb1c86d0b487
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 16:59:42 +00:00
Tom Hsu
f0635482c7
Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev am: 43ceaa85ee
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20064133
Change-Id: Ie4a6ec648a8a524d25f44dca22cbc145884c664b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-09-29 16:27:06 +00:00
Tom Hsu
43ceaa85ee
Merge "Revert "[Languages] Add new information to system language page."" into tm-qpr-dev
2022-09-29 15:52:32 +00:00
Viesturs Zarins
972cb57846
Merge "Fix fragment class for WIFI_SAVED_NETWORK_SETTINGS. Has been broken since the old access points implementation was deleted."
2022-09-29 12:37:45 +00:00