Zaiyue Xue
fb3ebf8dc7
Fix b/243746796 Crash when mouse hangs over an empty battery chart
...
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
Merged-In: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
2022-08-26 12:32:05 +08:00
TreeHugger Robot
9c39783771
Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev
2022-08-26 04:19:51 +00:00
Bill Lin
b154b58576
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev am: 37dfb4c46d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19742513
Change-Id: I95c27570429ac01d467545543627ef0854194113
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 01:50:30 +00:00
Bill Lin
37dfb4c46d
Merge "Refine face enroll & remove button layout padding" into tm-qpr-dev
2022-08-26 01:19:04 +00:00
Menghan Li
f481637370
Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev am: b5ee432b4b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732075
Change-Id: Ib412dc1639942389c417ec2516a1f99b52a951f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 23:49:57 +00:00
Menghan Li
b5ee432b4b
Merge "Fix tapping magnification crash in vision settings setup screen" into tm-qpr-dev
2022-08-25 23:37:50 +00:00
Joshua Mccloskey
f74ddd65b8
Merge "Replaced fingerprint finish strings." into tm-qpr-dev am: 128746648e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19736606
Change-Id: Iab77f3cf874f4271f603a9575afeff0ffd8732af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 22:35:13 +00:00
Joshua Mccloskey
128746648e
Merge "Replaced fingerprint finish strings." into tm-qpr-dev
2022-08-25 22:20:32 +00:00
Bill Yi
4e5669b82f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie7ff28b6cf65231bab7757ae9c5c9bf1bee9f475
2022-08-25 08:40:29 -07:00
Bill Yi
6ccb75281f
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I222a6fa89b2ba5da975e473b52c7ebb70e5e607f
2022-08-25 08:36:52 -07:00
Zaiyue Xue
87db35205a
Fix b/243485315: NullPointerException when getAppBatteryUsageData().
...
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
2022-08-25 13:36:44 +00:00
lbill
b77c2639d9
Refine face enroll & remove button layout padding
...
The button include in the security_settings_face.xml
When FaceSettingsRemoveButtonPreferenceController#updateState(),
the margin of Button will be overrided by FooterButtonStyleUtils.
So we should set listPreferredItemPaddingStart or End for Button's
parent view instead.
Test: manual Security > Face Unlock > Delete face model
> Set up face unlock > Back > Check the button layout
Bug: 202091542
Change-Id: I2b3815f5484ae1e5d256a43b432384e5f0f0f96a
2022-08-25 10:24:09 +00:00
Tom Hsu
7ddbff8eca
Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev am: 12377854b1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674442
Change-Id: I43489e9e2476925c2680b8ec7da335900e0ad106
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:46 +00:00
Tom Hsu
a18ec335a9
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev am: 34cb6d3237
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19674012
Change-Id: I30906dc1a60949776b27ba6df3fe723f1eed6076
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:44 +00:00
Tom Hsu
7dfd2ade2f
Merge "[Languages] Add new information to system language page." into tm-qpr-dev am: bd3c0da9e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19594790
Change-Id: I767bf8a2b177a5b764458e7c8fff90e3de1b869b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 07:25:42 +00:00
Tom Hsu
12377854b1
Merge "[Panlingual] Improve conditions of supporting app locale." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
34cb6d3237
Merge "[Panlingual] Remove featureflag of app language." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Tom Hsu
bd3c0da9e3
Merge "[Languages] Add new information to system language page." into tm-qpr-dev
2022-08-25 06:24:12 +00:00
Bill Lin
ac4f84f05d
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587
Change-Id: I404da502a6cfa3d8e40ca7ee935332e9e4931968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 05:41:19 +00:00
Bill Lin
fd8e54e391
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev
2022-08-25 04:36:14 +00:00
Bill Yi
6d1ddadb67
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0709fb76a91edba3a67b139bb09171dc756010cd
2022-08-24 20:58:26 -07:00
Bill Yi
926be7fe01
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: If3d72d0385bacf5df7243f6b7ae0263a733753d3
2022-08-24 20:48:40 -07:00
Joshua McCloskey
15a1adbe8f
Replaced fingerprint finish strings.
...
Test: Verified manually correct string shows.
Fixes: 239614495
Change-Id: I5b52d21fb6a9faf5769de46ccb17308a1649e22a
2022-08-25 00:35:09 +00:00
Chloris Kuo
fd947cb0b3
Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110
Change-Id: If0ff5b45d3e38a1e5b08cb6a648ea64474b731d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 22:59:00 +00:00
Chloris Kuo
6f79ffd831
Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev
2022-08-24 22:37:58 +00:00
menghanli
66a96d220e
Fix tapping magnification crash in vision settings setup screen
...
Root cause: ag/17286343 introduces hiding the settings entry in magnification settings if window magnification feature is not supported. It causes SuW page cannot find the settings preference reference.
Solution: Add null pointer check.
Bug: 242242266
Test: Manual testing
Change-Id: I1007a580047dd302228b28c15b82e958a2b01fec
(cherry picked from commit 5a87f6bbbf
)
2022-08-24 21:17:46 +00:00
Chloris Kuo
54c677a83c
Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications
...
Show detail settings page from the default NAS app if it implements the new intent ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS.
Test: Robotest, manually test on device
Bug: 231492005
Change-Id: I6566cd9d615331a56728613583295637982bcd3f
Merged-In: I6566cd9d615331a56728613583295637982bcd3f
2022-08-24 19:51:08 +00:00
Michael Wright
bbde399410
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797
Change-Id: Ifa352490aff4a215710aec57e6d42aab162d5cd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 16:05:15 +00:00
Michael Wright
1218065085
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev
2022-08-24 15:24:15 +00:00
Lucas Silva
1eeae5a623
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464
Change-Id: Iaf38d68d9a2c03c2612ae17fec3094bc41087edf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 14:16:59 +00:00
Lucas Silva
225b3b0640
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev
2022-08-24 13:54:16 +00:00
lbill
7a4ddb8337
Set appropriate theme for SkipFingerprintDialog
...
The SkipFingerprintDialog is instantiation in
SetupFingerprintEnrollFindSensor#onSkipButtonClick()
Due to the call flow did not set appropriate theme
defined in setuplib for skip alertDialog instance
we set GlifV2ThemeAlertDialog AlertDialog.Builder.
Test: m RunSettingsRoboTests -j30 ROBOTEST_FILTER= \
SetupFingerprintEnrollFindSensorTest
Test: manual factory reset, go through SUW, and check
skip AlertDialog Bottom Bar Buttons visual.
Bug: 233243999
Change-Id: Ic198a23eb3e76d70e287b24f2ab1ef249b30b2fc
2022-08-24 13:45:21 +00:00
Michael Wright
475632c4fe
Revert^3 "Improve App notification loading"
...
33710fd9e2
Change-Id: Ifb45f949c28bff04f8abfe3e1a73628f2e407241
2022-08-24 12:22:12 +00:00
kellyz
cf78e650f7
Enable predictive back gesture for Settings app. am: 76516bbd3d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19697762
Change-Id: I9b782ec75a470bb90568e6a4c2be3f4067f556d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 08:14:21 +00:00
kellyz
76516bbd3d
Enable predictive back gesture for Settings app.
...
Bug: 238729272
Test: manually tested on device
Change-Id: Ib75902d1d7bbd289705cb62ef00d5840676bda72
(cherry picked from commit 1bda6428c2
)
Merged-In: Ib75902d1d7bbd289705cb62ef00d5840676bda72
2022-08-24 07:26:24 +00:00
Bonian Chen
80e17e97f3
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417
Change-Id: I0ce4c4789f2e839ab92b71a8b517cc2680e49c2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 07:03:40 +00:00
Bonian Chen
6920c9e7ce
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev
2022-08-24 06:38:58 +00:00
Wesley Wang
20e927164b
Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19695293
Change-Id: I50b0b62fd268026ac0e79a14df8640f19be5078f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:02:02 +00:00
YK Hung
7e9c49305f
Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev am: 821c5702cd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19707329
Change-Id: I2f0a4c8b200f69d37d16577ee1131efe2eaba248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:01:54 +00:00
TreeHugger Robot
3588b515f2
Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303
Change-Id: I137233586abf15929227f3795ef061699a7335e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:01:14 +00:00
Wesley Wang
a0c76c92a1
Merge "Update extra defend layout string" into tm-qpr-dev
2022-08-24 05:11:03 +00:00
YK Hung
821c5702cd
Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev
2022-08-24 05:08:48 +00:00
TreeHugger Robot
adf79eae3e
Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev
2022-08-24 05:04:05 +00:00
Betty Chang
3852ceab9b
Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826
Change-Id: I7a4f1366a1481e303afe73f21320cd3c421015e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 03:51:23 +00:00
tom hsu
3aa4440b36
[Panlingual] Improve conditions of supporting app locale.
...
There are 3 conditions we need to check.
1. Has locale config file
2. Has locale config file w/o content
3. Has locale config file w/ content
Currently, we do not have condition 2 into the condition group, and we
need to add it into.
Bug: b/243099750
Test: Manual
Change-Id: I58d0275af53031ba4f4c705022017d5143f45795
2022-08-24 03:39:35 +00:00
tom hsu
e6b46dc853
[Panlingual] Remove featureflag of app language.
...
Panlingual successfully landed. Hence, we can remove the feature flag
right now.
Bug: b/209775925
Test: atest pass
Test: Manual test pass
Change-Id: I464a206027fd63ee1763acaf17d1b6251e839bc0
2022-08-24 11:29:31 +08:00
tom hsu
3cbb6f8680
[Languages] Add new information to system language page.
...
- Add top Intro preference
- Add footer preference
- Add sub string to language picker
- Modify title of app locale pages
Bug: 242182598 Add information to system language page.
Bug: 241600418 [Panlingual] Change strings on App languages
Test: Maunal test
Change-Id: I9bca8911e8e70c97c273294b3c9d1d73d4ea0cb2
2022-08-24 11:04:24 +08:00
Betty Chang
f14071682f
Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev
2022-08-24 02:55:13 +00:00
Bonian Chen
534dbdfd29
Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214
Change-Id: Ib5200b5c3a0cbf87fc8a8de5991742847b924049
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 20:50:09 +00:00
Bill Yi
a6e3a37237
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 1be27e97c5
-s ours am: 7c8eb553f3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19694398
Change-Id: I297f2dc5429b7a5d3bd0384766e2c1b7037efa43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-23 20:42:09 +00:00