Amy Hsu
eca20b0820
Merge "[ScreenResolutionController] UI string update" into tm-d1-dev
2022-05-27 00:17:19 +00:00
Tom Hsu
806582197e
Merge "Fix wrong summary string show on the network page." into tm-dev am: f6ea9c99b3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18603834
Change-Id: I56919305722783a24bd68c0e378cc1d272a6f2aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 15:41:44 +00:00
Tom Hsu
f6ea9c99b3
Merge "Fix wrong summary string show on the network page." into tm-dev
2022-05-26 15:06:00 +00:00
tom hsu
d793e9512d
Fix wrong summary string show on the network page.
...
Bug: 206742805
Test: local test, see b/206742805#4
Change-Id: I4fa9468e4f3b7d3671e383d3203b67636daa416c
2022-05-26 17:41:13 +08:00
Amy Hsu
ea858a6afc
[ScreenResolutionController] UI string update
...
Bug: b/230626771
Test: Check the string manually
Change-Id: Ic5c8ed146297bf1672e18e078aa8389738584cfb
2022-05-26 11:33:52 +08:00
Bill Yi
6096b86e1a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: b91e43c526
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I909d66a4cb1412a9e924996fab95e63727a3acb5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:43 +00:00
Bill Yi
c99eb87613
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: fdcf407543
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586095
Change-Id: I734c6876008c4eb19d6e7867b3bfe9ec5c56c4cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:26 +00:00
Bill Yi
f344101fdb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: f4cb74b97a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I611a79eded17b14ff32f4e80df239a70e6eb0f86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:06:13 +00:00
Bill Yi
9b4e0f0e67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: cec4bd47cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18586094
Change-Id: I5c7cec9a49b35cd390c817a66221921095cdbdc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:05:54 +00:00
Bill Yi
b91e43c526
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Bill Yi
f4cb74b97a
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-25 18:43:37 +00:00
Chaohui Wang
6c2ffc2220
Merge "Fix Conversation page flickers" into tm-dev am: 7dc1aec524
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475672
Change-Id: Ic7dfd8258e5c2d0475d8365a3a4d740dc0f5baf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:49:37 +00:00
Chaohui Wang
7dc1aec524
Merge "Fix Conversation page flickers" into tm-dev
2022-05-25 14:28:43 +00:00
Chaohui Wang
1484d1a472
Merge "Fix SeekBarPreference selectable test" into tm-dev am: 02314870c7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18578961
Change-Id: I51c7156ffdeaecd55464be761cb8d62203e8655d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:09:01 +00:00
Chaohui Wang
02314870c7
Merge "Fix SeekBarPreference selectable test" into tm-dev
2022-05-25 10:50:48 +00:00
Chaohui Wang
635c506a92
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev am: 87f8135959
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18591472
Change-Id: Id62102e910aa81346a986551244fb689c74aa0cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:32:46 +00:00
Chaohui Wang
87f8135959
Merge "Clean up lifecycle in MobileNetworkSettings" into tm-dev
2022-05-25 09:13:44 +00:00
Chaohui Wang
968f30a470
Fix SeekBarPreference selectable test
...
SeekBarPreference is set to unselectable in change
Ie5d819088dc3c435005ddd00e232b2f6992b234a
Update the test accordingly.
Bug: 230553896
Test: robotest
Change-Id: Ia024b81e3f8e3808b0bb1e48c41a84d0ececaa85
2022-05-25 16:58:08 +08:00
Weng Su
676498649e
Merge "Refine carrier Wi-Fi functions" into tm-dev am: 750376ec40
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18558087
Change-Id: I5fc1cd3176b7ba042d32e46e2fd94b2b3331c707
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:11:40 +00:00
Weng Su
750376ec40
Merge "Refine carrier Wi-Fi functions" into tm-dev
2022-05-25 07:50:35 +00:00
Chaohui Wang
866b79c245
Clean up lifecycle in MobileNetworkSettings
...
To avoid double registering, which prevent potential issues and could
improve latency.
Since DashboardFragment already supported register lifecycle
automatically for the controllers bound by XML which implements
androidx.lifecycle.Lifecycle, so doing a cleanup to prevent register
lifecycle event manually (doubling).
Bug: 149338098
Test: temporarily add logging to make sure the lifecycle method is
called and only called once
Change-Id: I4dbc36414991ef6b599be61aa77ff0dc8c52468c
2022-05-25 13:46:55 +08:00
Chaohui Wang
bd369cfee5
Fix Conversation page flickers
...
In this page, 3 conversation lists are implemented by the
ConversationListPreferenceController, these lists updates its contents
in updateState(), which is after the preference screen view created.
So when the first time this page is showed, animations of added contents
will be shown.
The improvement is when the first time, update the list in the
onCreate(), which is called before view creation, instead of the
updateState().
And also do the same thing for RecentConversationsPreferenceController.
Also, to reduce latency,
1. Because currently there are duplicated calls in
NoConversationsPreferenceController to check whether conversations are
exists or not, by removing the duplicated calls and reuse the result
from other controllers, the latency could be reduced.
2. Currently, there are seperated api calls, the
mBackend.getConversations(false) in AllConversationsPreferenceController
and the mBackend.getConversations(true) in
PriorityConversationsPreferenceController, use one
mBackend.getConversations(false) in ConversationListSettings to improve,
this does not change the behavior because the result is filtered in
matchesFilter() both before and after.
3. Currently, we sort conversations first then filter them, change to
filter first then sort to reduce latency.
Fix: 215073227
Test: visual check & robo tests
Change-Id: I028a7fabbbf64cf5627e6615372282a36eb784e5
2022-05-25 10:43:16 +08:00
Daniel Chapin
1c432c5a1e
Merge "Fix crash for DefaultSubscriptionController" into tm-dev am: fa878f2f26
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18573290
Change-Id: I6f97b69e20648341043bbdfff4e8d28ca62b7d73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:43:16 +00:00
Daniel Chapin
fa878f2f26
Merge "Fix crash for DefaultSubscriptionController" into tm-dev
2022-05-25 00:22:04 +00:00
Bill Yi
fdcf407543
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6c7ab074649b1423cfbad6622f579fe7e158ba20
2022-05-24 13:13:59 -07:00
Bill Yi
cec4bd47cb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4e350b98ef0169548a6a142fd4545dc602d67bc5
2022-05-24 13:10:09 -07:00
Chaohui Wang
2e34038233
Fix crash for DefaultSubscriptionController
...
setSummaryProvider() is used instead of setSummary() in
Ia24d88817c99db7ed3fc264dbc9c10e0a09d8a39, but there is still a place
using the setSummary(), mixing these two will lead to crash.
Change it to setSummaryProvider() to prevent crash.
Fix: 233295254
Fix: 233712251
Test: manual
Change-Id: I4627545711b848009c3bd7179f0368ff82e62697
2022-05-24 16:51:51 +00:00
TreeHugger Robot
0dc5eff113
Merge "Fix can't start injected item problem" into tm-dev am: 74c324b70f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18570252
Change-Id: Ie33b331b8facb0d59287bf445dd93bee1054cbe5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 13:03:03 +00:00
TreeHugger Robot
74c324b70f
Merge "Fix can't start injected item problem" into tm-dev
2022-05-24 12:41:46 +00:00
Edgar Wang
9b81fec6a0
Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev am: 4c07e2b865
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18475669
Change-Id: I93c94eee39fa5ea786632b04498ba99eecc02eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 12:29:09 +00:00
Edgar Wang
4c07e2b865
Merge "Fix talkback speak "double tap to activate" on LabeledSeekBarPreference" into tm-dev
2022-05-24 12:07:41 +00:00
Binyi Wu
2331e4b511
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev am: 8fd6873250
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18556457
Change-Id: I513978e2c436055ac1269fd4795d11c48b0ddef3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:17:12 +00:00
Binyi Wu
8fd6873250
Merge "Prevent keyboard from blocking the input box for WiFi configuration page." into tm-dev
2022-05-24 08:32:03 +00:00
Arc Wang
03d8d11914
Fix can't start injected item problem
...
Should set highlight Preference key after
isDuplicateClick to ensure clicked Preference
key & highlight Preference are different and
then isDuplicateClick returns a correct value.
Bug: 233553587
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.dashboard
manual
1. Click all left pane items and see if there is any launch problem.
2. Check if duplicate click check works.
Change-Id: Ic6394b96896fd3a0fb926707565f63beff74a27b
2022-05-24 07:13:35 +00:00
Edgar Wang
2b0d9cfc5d
Fix talkback speak "double tap to activate" on LabeledSeekBarPreference
...
- SeekBarPreference should be unselectable
- remove unnecessary handling of Summary
- set currect Title color when preference is enabled and unselectable
Bug: 230553896
Test: robotest
Change-Id: Ie5d819088dc3c435005ddd00e232b2f6992b234a
2022-05-24 05:08:16 +00:00
Binyi Wu
26e5e919c8
Prevent keyboard from blocking the input box for WiFi configuration page.
...
Bug: 223980567
Test: manual
Change-Id: I2b95b065394e2395396ff71b00bd949ac824dac3
2022-05-24 12:50:41 +08:00
TreeHugger Robot
9ba22d2ec9
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev am: d9174aa3cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18490664
Change-Id: I05b01fbce6e6e1dc51cd5bdad2d9fdd0a80bb068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:42:47 +00:00
TreeHugger Robot
d9174aa3cc
Merge "[VolumePanel] Add Hearable control slice in VolumePanel" into tm-dev
2022-05-24 03:51:23 +00:00
TreeHugger Robot
56c0920c7c
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 0a367dea1d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I037cb6676fd41cb985c7bffcb0bb17535a7270b4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 01:00:08 +00:00
Bill Yi
6adb47ebfa
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f9b665e302
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18519367
Change-Id: I989eaca89d3cb7666d68d5ce2f889fcbdc6ab316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:56 +00:00
TreeHugger Robot
0a367dea1d
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev
2022-05-24 00:38:21 +00:00
TreeHugger Robot
d8e9a267cf
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours am: 5fdd0b386f
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I3faca04cf31d63cf8336ee8acab098cb450704f0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:44:46 +00:00
Bill Yi
ea5907aeae
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours am: 6db82b3062
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I0375c5e00aa7a6a8fef1b96407e624359363908d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:44:30 +00:00
TreeHugger Robot
5fdd0b386f
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: a39043d1ab
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I12819ca7ba3388a2d3379ba419f489086ca090d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:33:10 +00:00
Bill Yi
6db82b3062
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70a7ba0f71
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520099
Change-Id: I09c5bc7d92a8b7c1371d938c219b0cf0d2ebacc8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:50 +00:00
Bill Yi
74bb796c67
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours am: d28e552f18
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: I10f818e527b6b9329305a4f4d706210911934c92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:32:30 +00:00
Bill Yi
d28e552f18
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 0c0b16955b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18520141
Change-Id: Ie4c9dd453c4b845cdde6abefbf8eb3ddd32c7619
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:30:00 +00:00
Weng Su
77f9cbe315
Refine carrier Wi-Fi functions
...
- Sync the same design to query and set carrier Wi-Fi enabled status from MergedCarrierEntry
- Add more logs for issue tracking
Bug: 227236604
Test: manual test
atest -c CarrierWifiTogglePreferenceControllerTest \
WifiPickerTrackerHelperTest
Change-Id: I869fa97bd24ed31a3224b4a395ffc97a17aa1471
2022-05-24 03:16:36 +08:00
TreeHugger Robot
b3f63399f7
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:30 +00:00
TreeHugger Robot
d097fe6e2f
Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev
2022-05-23 18:51:30 +00:00