Zaiyue Xue
8e00605228
Fix b/243485315: NullPointerException when getAppBatteryUsageData().
...
Bug: 243485315
Fix: 243485315
Test: presubmit
Change-Id: I8bb2db7976f6c8817e9ab45fe3a40456afcd8128
2022-08-25 14:50:32 +08: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
1e60f829e9
Merge "Set appropriate theme for SkipFingerprintDialog" into tm-qpr-dev am: fd8e54e391
am: ac4f84f05d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19732587
Change-Id: I1d714e27beaa1f3ac5bccd45e5c11663d2fcba19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-25 06:10:59 +00:00
Zaiyue Xue
079aaf1261
Fix b/243746796 Crash when mouse hangs over an empty battery chart
...
Bug: 243746796
Fix: 243746796
Test: manual
Change-Id: I3e595c96a55f1114b50ed5ed8e49e962cc90cbde
2022-08-25 13:45:01 +08: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
Omer Osman
dc7fdfa060
Update Opus over A2DP to use BluetoothCodecConfig api
...
Bug: 240635097
Test: sink device using bds-dev
Change-Id: Idd0a0c8a63dc969acbb10a88df5218507017e475
2022-08-25 04:10:18 +00:00
Bill Yi
6577aa89b6
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I7db8155cb74847cc3a16d49793c7018b2d3c6e77
2022-08-24 21:02:51 -07: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
f9bf84d822
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I022fac7bfc51decd6c42007534917453acf4b7cf
2022-08-24 20:54:14 -07:00
Bill Yi
631dfab65d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I69bb22cae943842b51980d5fe875e14033930a1e
2022-08-24 20:50:20 -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
Bill Yi
1d3e63f1ab
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I849b26dc45abefbb04f7b16a40b8f629805cdd78
2022-08-24 20:47:00 -07:00
Bill Yi
7c2619b3de
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ic5cc1cd37df4cd14b05c496c138ff3b43c241439
2022-08-24 20:43:57 -07:00
Bill Yi
63567e48bc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I242dbec711ce4b0367cefb3795a31791c2549455
2022-08-24 20:40:01 -07:00
TreeHugger Robot
5d42149249
Merge changes from topic "nfc_logging_control_master"
...
* changes:
Add test cases for NfcSnoopLog and NfcVerboseVendorLog
Show reboot dialog when users disable developer options
Add a new NFC developer setting option for NFC vendor verbose log
Add a new NFC developer setting option for NFCSNOOP
2022-08-25 03:31:24 +00: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
a79194f081
[automerger skipped] Merge "Support ACTION_NOTIFICATION_ASSISTANT_DETAIL_SETTINGS in Enhanced Notifications" into tm-qpr-dev am: 6f79ffd831
am: fd947cb0b3
-s ours
...
am skip reason: Merged-In I6566cd9d615331a56728613583295637982bcd3f with SHA-1 5adf602ef7
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19717110
Change-Id: I3ef2ce278cf4aff6d06ad76c066e4c9b19536fed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 23:18:08 +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
Menghan Li
dc37f44a40
Merge "Fix tapping magnification crash in vision settings setup screen"
2022-08-24 21:17:21 +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
3b0cbefac1
Merge "Revert^3 "Improve App notification loading"" into tm-qpr-dev am: 1218065085
am: bbde399410
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19713797
Change-Id: Idcaa343d56921b2f2b4428a10fb5dffc99a0c698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 16:11:16 +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
285bfe2917
Merge "Update dream complication settings to use boolean setting." into tm-qpr-dev am: 225b3b0640
am: 1eeae5a623
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19699464
Change-Id: I51e5d21ba7e79c7752f2c824710443396257d025
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 14:45:51 +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
menghanli
5a87f6bbbf
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
2022-08-24 11:39:33 +00:00
kellyz
b75c9173ed
[automerger skipped] Enable predictive back gesture for Settings app. am: 76516bbd3d
am: cf78e650f7
-s ours
...
am skip reason: Merged-In Ib75902d1d7bbd289705cb62ef00d5840676bda72 with SHA-1 1bda6428c2
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19697762
Change-Id: I2ff85eabc3591009d4b5572d9c6791a3041fe927
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 08:24:08 +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
Bonian Chen
4e5102b5e9
Merge "[Settings] Data warning & limit UI should be configuable when running out of limit" into tm-qpr-dev am: 6920c9e7ce
am: 80e17e97f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19673417
Change-Id: I42f5a94866902b0812039025071fd95b8c8745b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 08:14:03 +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
320ad12543
Merge "Update extra defend layout string" into tm-qpr-dev am: a0c76c92a1
am: 20e927164b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19695293
Change-Id: I288c58df33642427aa8b39f3d1af6f4cb521c8d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:30:00 +00:00
YK Hung
2d3d452f93
Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev am: 821c5702cd
am: 7e9c49305f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19707329
Change-Id: I6be24ea85c35e15310610f90e5a4a109550326f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:29:52 +00:00
TreeHugger Robot
bfe3182bd8
[automerger skipped] Merge "Port battery usage bug fixing cls from master to tm-qpr-dev" into tm-qpr-dev am: adf79eae3e
am: 3588b515f2
-s ours
...
am skip reason: Merged-In Ice30508bc20b5de631efee0db0160fe6ad710dbb with SHA-1 65b635854f
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19711303
Change-Id: I58c2aebe110f8a1f69f4e11ddaf35e6ef1673684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 06:29:23 +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
Betty Chang
0e5de165ca
Merge "[LE Audio] Display the correct title on broadcast assistant device" into tm-qpr-dev am: f14071682f
am: 3852ceab9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705826
Change-Id: Ie1683d5586a6534220fb5c2024b7630267b454a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 05:26:11 +00:00
Wesley Wang
a0c76c92a1
Merge "Update extra defend layout string" into tm-qpr-dev
2022-08-24 05:11:03 +00:00
Bonian Chen
4eef87c36f
Merge "[Settings] Additional route for dismiss activity dialog" into tm-qpr-dev am: 105cda2fbe
am: 534dbdfd29
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19705214
Change-Id: Ibb21e7203621293265a0075988282afcdccb22a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-24 05:09:31 +00:00
YK Hung
821c5702cd
Merge "Reduce the calling times for isExtraDefend" into tm-qpr-dev
2022-08-24 05:08:48 +00:00