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
TreeHugger Robot
732da7a440
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev
2023-01-17 05:59:39 +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
TreeHugger Robot
35eb29742c
Merge "Remove additional and unused action"
2023-01-17 03:25:47 +00:00
TreeHugger Robot
0bebfe26f2
Merge "FingerprintEnrollmentActivity UI test"
2023-01-16 22:18:33 +00:00
Milton Wu
13d681f914
FingerprintEnrollmentActivity UI test
...
Add test cases in FingerprintEnrollmentActivity UI tests for
FindSensor fragments.
Bug: 260957816
Test: atest FingerprintEnrollmentActivityTest
Change-Id: I1a256f09a1a5ebe43d6d563e62397f0dd2a1e4cb
2023-01-17 00:07:31 +08:00
Zaiyue Xue
16dfab6b31
Fix b/265632782: Battery usage app list changed when entering the app details page and back
...
This only happens on the first time the Settings package is installed.
Discussed with Chaohui, the old showSystemApp() logic in Settings->Apps has some issues. This cl updates the logic to the new logic Chaohui provided.
Bug: 265632782
Fix: 265632782
Test: manual
Change-Id: I65ca150cc685409f69b8950b131feb198662f055
2023-01-16 18:48:13 +08:00
Ankita Vyas
96e6398e52
Merge "AppClone: Add animation and description text in Cloned Apps page."
2023-01-16 09:37:40 +00:00
Bonian Chen
81cac6c110
[Settings] Enable some compatibility with Material 3
...
To avoid some Material 3 components from getting crashes.
Bug: 264605869
Change-Id: If41241c939435903a65fe6ab06fd4e1b5ee8c01b
Test: local
2023-01-16 09:25:51 +00:00
Tom Hsu
402e9cc532
Merge "Remove the unit test which has problem."
2023-01-16 09:22:54 +00:00
SongFerng Wang
0ceedc8d04
Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev am: f71b548285
am: 40838101dd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20973543
Change-Id: I573b4835887ef22ed832291d881123690b9d5d5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-16 08:58:31 +00:00
SongFerng Wang
40838101dd
Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev am: f71b548285
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20973543
Change-Id: Iff0e0f03886e414c36d508e5b17541514c1171f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-16 08:21:26 +00:00
tom hsu
00bfd7e299
Remove the unit test which has problem.
...
Bug: b/265613591
Test: atest passed
Change-Id: I0df58e76171fdc49f405cb88d20469b0693f0041
2023-01-16 15:56:18 +08:00
SongFerng Wang
f71b548285
Merge "Revert "[MEP] psim->esim, don't skip carrierConfigChanged with subId -1"" into tm-qpr-dev
2023-01-16 07:44:37 +00:00
Kuan Wang
b427e8f02a
Merge "Not show time information in battery optimization page when opened from Settings -> Apps"
2023-01-16 07:02:38 +00:00
Kuan Wang
1d58de3395
Merge "Add latest battery usage data when exporting battery usage data to EBS and Settings -> Apps"
2023-01-16 07:02:27 +00:00
Kuan Wang
96aee4896b
Not show time information in battery optimization page when opened from
...
Settings -> Apps
Test: make RunSettingsRoboTests + manual
Bug: 265130434
Change-Id: Ie7ae6a97041f490e81adbe8e0c530799e09a7c66
2023-01-16 12:07:07 +08:00
TreeHugger Robot
bf386f73d3
Merge "Fix b/265409044: The battery usage page auto goes up when coming back from app details page."
2023-01-16 03:59:03 +00:00
Kuan Wang
54d7cd8a7a
Add latest battery usage data when exporting battery usage data to EBS
...
and Settings -> Apps
Test: manual
Bug: 265130434
Change-Id: I1c6c1a831416d596b5bd71c6499f4c4672dbcdea
2023-01-16 11:44:53 +08:00
Bill Yi
4cf4ed7c7a
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I3b51a03c3cc8bb0c2d04b325d5108278792228a7
2023-01-15 19:27:58 -08:00
Bill Yi
57d520e0f2
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I981c21d4e5212beb0252f2ea8704015045383fac
2023-01-15 19:23:55 -08:00
Bill Yi
d1b9e868a4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iac185d80c9f92f8f780adee83aabcd5698ff34d1
2023-01-15 19:20:15 -08:00
Angela Wang
a7999098e0
Merge "Hearing Aid Compatibility toggle functionality in Settings"
2023-01-16 02:56:28 +00:00
TreeHugger Robot
5575379610
Merge "Add FingerprintEnrollProgressViewModelTest"
2023-01-14 07:39:11 +00:00
Angela Wang
5640914420
Hearing Aid Compatibility toggle functionality in Settings
...
FCC has clarified that all smart phone must have a feature to enable Hearing Aid Compatibility (HAC) mode in system setting menu.
Currently the HAC settings is located in Dialer app's accessibility settings
page. We move this settings to Settings > Accessibility > Hearing Aids
page to compliance the rule.
Bug: 233976673
Test: make RunSettingsRoboTests ROBOTEST_FILTER=HearingAidCompatibilityPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AccessibilityHearingAidsFragmentTest
Change-Id: Iba773456fd96b40ab3487a335c163079d083d505
2023-01-14 03:42:08 +00:00
Jason Chang
d2b71ce454
Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b1e
am: 2cb8ea9496
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727210
Change-Id: Ia1132d870dfb24900234f4a9ffc0d46b846e8584
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 22:21:09 +00:00
Betty Chang
ee7b709aff
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
am: c985a6d47d
am: fb8a7a3b55
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: I3126d4c3a15ce813abb28c2bf6ce38394f5aa570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 21:59:35 +00:00
Xin Li
4b5a5a4ca5
[automerger skipped] Merge tm-qpr-dev-plus-aosp-without-vendor@9467136 am: 5482fb0301
-s ours am: 8fddc2a74a
-s ours
...
am skip reason: Merged-In Ic8d9f286c53e321a933d98f9c05bbc6bb8bf98f0 with SHA-1 2681d8cc05
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20956124
Change-Id: I9f70e7407641fb71edf08f2b102099c703f4d703
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 21:35:25 +00:00
TreeHugger Robot
1e7401401d
Merge "[Regional Preference] Remove unit tes tof systemproperty"
2023-01-13 14:30:02 +00:00
tom hsu
7b0c8cfb53
[Regional Preference] Remove unit tes tof systemproperty
...
- Unit test of System Property failed due to timing issue. Remove it to avoid to impact formal unit test tracker.
- This system property is feature flag.
Bug: b/265410669
Test: atest passed.
Change-Id: I65b4a34e1a362428ccb18611c90702650a5cdf8f
2023-01-13 13:15:06 +00:00
Jason Chang
2cb8ea9496
Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev am: bfa35a7b1e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/20727210
Change-Id: I0ad6727e5056a11d72714aec5dff289458c1f855
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 13:07:37 +00:00
Zaiyue Xue
7627a0e575
Fix b/265409044: The battery usage page auto goes up when coming back from app details page.
...
screen record after fix: https://drive.google.com/file/d/1a2vvMIYLSalXfM8-004drKBWK2LcK_F9/view?resourcekey=0-A586Sk0yx-OnErHkd5EgjQ
Bug: 265409044
Fix: 265409044
Test: manual
Change-Id: I7a58c9081250936de27a4970d0a9708168138fb9
2023-01-13 20:41:26 +08:00
Betty Chang
fb8a7a3b55
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
am: c985a6d47d
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: Ia5d97a91a9a52b044b7d016b80b67cf094d45acd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 12:32:42 +00:00
Jason Chang
bfa35a7b1e
Merge "(2/2) Fix settings face enrollment UI layout problem" into tm-qpr-dev
2023-01-13 12:31:40 +00:00
Betty Chang
c985a6d47d
Merge "[LE Audio] To add the vibrate when the scan is successful" am: d7e16c22f6
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2385039
Change-Id: I92615d5cc7a8605458d78082b45b339234ea52e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-01-13 11:58:35 +00:00
Jason Chang
8c5bcaa374
(2/2) Fix settings face enrollment UI layout problem
...
To extract face_enroll_education.xml layout dimensions to dimens.xml
1. Fix settings face enrollment UI truncate problem
2. Fix It's hard to tap "setup for limited vision or head motion"
button
Bug: 260653042
Bug: 263065347
Test: manually go to Settings > Security & privacy > Device lock >
Face & Fingerprint Unlock > Face Unlock, then start enroll Face,
In second stage ("How to set up Face Unlock" page ), check the layout
and lottie animation do not truncate.
Test: m -j SettingsGoogleRoboTests RunSettingsGoogleRoboTests
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollEducationTest"
Test: m RunSettingsRoboTests ROBOTEST_FILTER=
"com.android.settings.biometrics.face.FaceEnrollIntroductionTest"
Change-Id: I7d7bad8b91dd505772e8f2b28cb4b872a4750cb4
2023-01-13 10:48:50 +00:00
Betty Chang
d7e16c22f6
Merge "[LE Audio] To add the vibrate when the scan is successful"
2023-01-13 10:34:12 +00:00