Ling Ma
928b9904d3
Merge "Add dialog for enable auto data switch"
2023-01-18 03:29:05 +00:00
Joshua Mccloskey
1b1a394b36
Merge "Set default value for performant auth."
2023-01-18 01:00:42 +00:00
Bill Yi
4516d397e7
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-17 23:53:48 +00:00
Bill Yi
4598ec06a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 127306a6a7
-s ours am: d0f59453d8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005863
Change-Id: I1780f2634a883b8339480348b2de1ca5f9c6b742
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 23:11:53 +00:00
Bill Yi
aaa0aec033
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9079430596
-s ours am: dc55fe3918
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005863
Change-Id: I22212feffc45d4e7433319cfc6dba9c2c31a46fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 23:10:56 +00:00
Bill Yi
d0f59453d8
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 127306a6a7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005863
Change-Id: I42abb744d4560b2c6865cb07162f6c847eb2e407
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 22:36:07 +00:00
Bill Yi
dc55fe3918
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 9079430596
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005863
Change-Id: I7000ea8758566f2584099cf0b7cb9c00c191b716
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 22:35:51 +00:00
Julia Reynolds
50af5c44ab
Make strings generic for multiple form factors am: 7a77d31771
am: b33e126865
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022064
Change-Id: Id100771f11f086c3ba71d35847f1e1a0ec740783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 22:33:10 +00:00
Bill Yi
127306a6a7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-17 21:47:45 +00:00
Julia Reynolds
b33e126865
Make strings generic for multiple form factors am: 7a77d31771
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21022064
Change-Id: If98d3636ed7bebe10ddfae68f958fdd381710e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 21:31:28 +00:00
Joshua Mccloskey
5c1e565470
Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev am: 0dd635f28f
am: 6f9ddeb66f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20950039
Change-Id: Ia0224ca7f2ae208b4e28555470941a6f7c91c753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 21:14:32 +00:00
Guojing Yuan
c8445a03d4
Merge "Add contextSyncEnabled to AssociationInfo"
2023-01-17 21:12:56 +00:00
Joshua Mccloskey
6f9ddeb66f
Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev am: 0dd635f28f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20950039
Change-Id: Ia48a9d9e4214f18ac8e053e1137603bc84807f85
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 20:01:36 +00:00
TreeHugger Robot
47489fc41d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 8d4cf2b2c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20993922
Change-Id: I60978ce7a03d6375734bf0bc93d5b39911892eb8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 19:45:52 +00:00
Bill Yi
7408686158
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c14829ec35
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20993922
Change-Id: I03dc6a98d2785fdc87e6c6971e3f85112960fdd7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 19:45:47 +00:00
Bill Yi
dc67748760
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c536718dce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20986441
Change-Id: Ib7ddd05804433d08fd66d80a36ac905aea2dc931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 19:44:56 +00:00
Julia Reynolds
7a77d31771
Make strings generic for multiple form factors
...
Test: view string in Settings
Fixes: 244123498
Change-Id: I8cf4eebf1400dd9faecb1a96023c6f48bd4157ed
2023-01-17 19:38:43 +00:00
Joshua Mccloskey
0dd635f28f
Merge "Fixed additional lottie flicker in fp settings." into tm-qpr-dev
2023-01-17 19:35:31 +00:00
Piotr Wilczyński
d445e30a98
Merge "Set display size to all displays"
2023-01-17 17:27:18 +00:00
Behnam Heydarshahi
5bf3d0a06e
Merge "Always index RingerModeAffected slices" into tm-qpr-dev am: 673e191e98
am: fd4ecf54b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20960954
Change-Id: I9889c6508f653f2f94b77b6450b86f888909e1f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 15:33:28 +00:00
TreeHugger Robot
69b8706b9d
Merge "Move bimetrics v2 tests to unit/"
2023-01-17 15:26:46 +00:00
Behnam Heydarshahi
fd4ecf54b1
Merge "Always index RingerModeAffected slices" into tm-qpr-dev am: 673e191e98
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20960954
Change-Id: Ib413d02f2fea5f9b379cd0425df4fd17b25660a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 14:57:00 +00:00
Behnam Heydarshahi
673e191e98
Merge "Always index RingerModeAffected slices" into tm-qpr-dev
2023-01-17 14:30:49 +00:00
Gil Cukierman
36517a0bcd
Merge "Change Toggle UX to "Require encryption""
2023-01-17 14:13:07 +00:00
Cynthia Wasonga
9a1247e58f
Merge "Hide clone profile Settings app from launcher"
2023-01-17 12:47:26 +00:00
Zoey Chen
673393810e
Merge "[Settings] Set the height as WRAP_CONTENT"
2023-01-17 12:12:43 +00:00
TreeHugger Robot
b077db1b48
Merge "Support accessibility for battery usage in U (2)"
2023-01-17 11:58:38 +00:00
TreeHugger Robot
023dc91342
Merge "Support accessibility for battery usage in U (1)"
2023-01-17 11:13:40 +00:00
Milton Wu
546c507aec
Move bimetrics v2 tests to unit/
...
Move biometrics enrollment v2 tests from robotests/ back to unit/
Bug: 265723532
Test: atest FingerprintRepositoryTest CredentialModelTest
AutoCredentialViewModelTest FingerprintEnrollIntroViewModelTest
FingerprintEnrollProgressViewModelTest
FingerprintEnrollmentViewModelTest
Change-Id: Id35e52a97df757f8c4473c5bf7f46ba051816d42
2023-01-17 18:13:21 +08:00
Zaiyue Xue
ce336ae7f4
Support accessibility for battery usage in U (2)
...
Fix b/248406644 TalkBack announce the incorrect day of the week for the Battery usage chart.
Request accessibility focus in mHandler.post() to avoid UI timing unsync.
Bug: 248406644
Fix: 248406644
Test: manual
Change-Id: I866cbba670e1bc4735088663241b1aad4d2f9c86
2023-01-17 17:42:31 +08:00
Zaiyue Xue
a52da7b599
Support accessibility for battery usage in U (1)
...
Fix b/265746746: TalkBack doesn't have any feedback after the actual double-tap of day bar and bi-hourly bar.
When users double clicked a time slot in battery usage chart with TalkBack on, jump the accessibility focus to the app list category title to let users know what happened after click.
screen record: https://drive.google.com/file/d/1ZuKQDBiTA2F8hHZDFvNx5nJEP-rMA0eZ/view?usp=sharing&resourcekey=0-2Q552VNxN4QwI2b5sdnvqg
Bug: 265746746
Fix: 265746746
Test: manual
Change-Id: I5485e714149014a96318fd88e8f8c854dde6cb67
2023-01-17 17:36:19 +08:00
TreeHugger Robot
452d69e6e8
Merge "Relocate biometrics enrollment v2 tests"
2023-01-17 07:27:05 +00:00
TreeHugger Robot
adca3e7662
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 732da7a440
-s ours am: e4c447eb02
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005884
Change-Id: I88d50351374e0f66298475442d8e5b8b9f701b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 07:12:22 +00:00
Bill Yi
456a71fa70
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57d520e0f2
-s ours am: 56e7ec7646
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005884
Change-Id: Ic883900b8301863645f73af61b2f4580fac839b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 07:12:11 +00:00
TreeHugger Robot
e4c447eb02
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 732da7a440
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005884
Change-Id: I3be509cbcafb130c43e1057b1aaa67cf6746fc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 06:35:40 +00:00
Bill Yi
56e7ec7646
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 57d520e0f2
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21005884
Change-Id: Ib3dc39b5e25f7f3301fac437c345c21ab4741ee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 06:35:18 +00:00
Zoey Chen
9ce459ef5d
[Settings] Set the height as WRAP_CONTENT
...
Screenshot: https://hsv.googleplex.com/5975564079857664
Bug: 262337876
Test: manual
Change-Id: I1d40d71e39da9ce9096ea813df4ce5862dbc9f9b
2023-01-17 06:29:30 +00:00
TreeHugger Robot
732da7a440
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-17 05:59:39 +00:00
TreeHugger Robot
8d4cf2b2c8
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod
2023-01-17 05:57:34 +00:00
TreeHugger Robot
d9674b2a9d
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-17 05:57:01 +00:00
TreeHugger Robot
57ef58e068
Merge "Import translations. DO NOT MERGE ANYWHERE"
2023-01-17 05:57:01 +00:00
TreeHugger Robot
009601eca0
Merge "Ignore unit test to avoid timing issue"
2023-01-17 05:46:47 +00:00
TreeHugger Robot
f7c187f8df
Merge "Force Settings to align locales of embedded activities"
2023-01-17 05:40:53 +00:00
TreeHugger Robot
818d07ab76
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb89c
am: daa9003533
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20877556
Change-Id: Icd977f0dad0dc81750a97bf189432bf14a48d889
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 05:08:12 +00:00
TreeHugger Robot
daa9003533
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev am: 66e23eb89c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20877556
Change-Id: I1c14caa62062f58fa43ed0861d8f527ddcade3d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-17 04:29:04 +00:00
Calvin Pan
f03d4106fa
Force Settings to align locales of embedded activities
...
Android 13 introduces the feature of per-app language that allows
users to set a preferred language for each app. However, Settings
embeds many activities from different apps, which may cause
multiple languages to be displayed on one Settings page.
Enable TaskLocaleOverride to align the locales of activities
launched in the same task.
Bug: 199277729
Test: Verified on Cuttlefish
Change-Id: I9ee2b8c481f9c0cb5f17eb1cea037317df35e9d9
2023-01-17 04:27:39 +00:00
tom hsu
5baac40801
Ignore unit test to avoid timing issue
...
- This is a race condition. Ignore it first and improve it later
Bug: b/265733270
Test: atest passed
Change-Id: I6c206483dd588c04a8ab2433915862909c526906
2023-01-17 12:24:05 +08:00
TreeHugger Robot
66e23eb89c
Merge "5/ Refine SetupChooseLockPattern layout by design" into tm-qpr-dev
2023-01-17 03:56:35 +00:00
Bonian Chen
54d34de25f
Merge "[Settings] Enable some compatibility with Material 3"
2023-01-17 03:51:04 +00:00
TreeHugger Robot
b823e208aa
Merge "Fix b/265632782: Battery usage app list changed when entering the app details page and back"
2023-01-17 03:44:51 +00:00