Xiaowen Lei
f4ead190ef
Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev am: 6a6374bc9b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19748830
Change-Id: I3ce6d60442ba1dd4d3b49406910eab7559da8d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-29 16:49:19 +00:00
Xiaowen Lei
6a6374bc9b
Merge "Set page_id when logging ACTION_DREAM_SELECT_TYPE." into tm-qpr-dev
2022-08-29 16:32:40 +00:00
Les Lee
03cb9dcb8a
Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev am: b75858bf82
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19491094
Change-Id: I65a54ab88204a4dfd484a8faf157d6b9db5b3f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-29 02:02:41 +00:00
Les Lee
b75858bf82
Merge "wifi: Handle wifi ap initial state before register intent" into tm-qpr-dev
2022-08-29 01:38:58 +00:00
Kedar Chitnis
c9c224e403
Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev am: 82a33ac452
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19664054
Change-Id: Iddbb56c3ce2176ab6f9edbe3353ea2ccfef923e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-27 04:48:27 +00:00
Kedar Chitnis
82a33ac452
Merge "Remove feature flag SETTINGS_GUEST_MODE_UX_CHANGES" into tm-qpr-dev
2022-08-27 04:36:58 +00:00
Bonian Chen
90a36213bb
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev am: d2644b4ea9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19739248
Change-Id: Id550ed73ab4e6dd7c01504eaf315de23598aff01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 11:17:02 +00:00
Bonian Chen
d2644b4ea9
Merge "[Settings] Not allow APN delete when adding is not an option" into tm-qpr-dev
2022-08-26 10:52:02 +00:00
Bonian Chen
9202260a42
[Settings] Not allow APN delete when adding is not an option
...
When not allowing APN to add, user may not be able to recover easily
when delete it.
Therefore, avoid from APN to be deleted when adding is not allowed.
Bug: 200875858
Test: local, robolectric
Change-Id: I5cf984000244b4ad901c6a4977a1368279323e0a
2022-08-26 08:50:51 +00:00
TreeHugger Robot
a2c9a702dc
Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev am: 6b5dc07b95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745373
Change-Id: If0db0c59dce301909f6a1d7d5f4453fb04a2c1d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 05:54:41 +00:00
TreeHugger Robot
6b5dc07b95
Merge "Fix b/243746796 Crash when mouse hangs over an empty battery chart" into tm-qpr-dev
2022-08-26 05:36:37 +00:00
TreeHugger Robot
b9a44a9130
Merge "Fix b/243485315: NullPointerException when getAppBatteryUsageData()." into tm-qpr-dev am: 9c39783771
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19745374
Change-Id: I72232623545b854b4683c2ec1013d7bf5ac858a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-08-26 04:41:26 +00:00
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
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
Xiaowen Lei
3d41a009c8
Set page_id when logging ACTION_DREAM_SELECT_TYPE.
...
To differentiate from the same action logged on other pages.
Bug: 243553826
Test: on device via statsd_testdrive
Change-Id: If722e8ffa417aac11d92e7519d89bd459ddc5eeb
2022-08-25 23:48:36 +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
Les Lee
c6c6ef3a58
wifi: Handle wifi ap initial state before register intent
...
The intent WIFI_AP_STATE_CHANGED_ACTION is not sticky intent after
SC-V2, query wifi ap state and run intent handling after registering intent.
Bug: 231214355
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Hotspot
Test: make RunSettingsRoboTests ROBOTEST_FILTER=Tether
Test: Manual test, the state shows correctly even if resume hotspot settings page from recent app.
Change-Id: Iab6b2b8628d725b003d5e5c4086420a329611745
2022-08-25 23:07:40 +08: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
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
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
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