Hank Sheng
0c8e9b6510
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev am: 3dfcc708aa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18579898
Change-Id: Id4abc52bcccaec23a580f757b345c7d763ed1a3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:46:43 +00:00
Hank Sheng
3dfcc708aa
Merge "Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4." into tm-dev
2022-05-27 05:32:47 +00:00
Chaohui Wang
4bcaccf8d3
Merge "Fix unable to toggle off Pause app activity" into tm-dev am: bc2e0f5fc4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18581945
Change-Id: Ic1dcc095cf52be3495a4d4863d27fed25157c068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-27 05:24:54 +00:00
Chaohui Wang
bc2e0f5fc4
Merge "Fix unable to toggle off Pause app activity" into tm-dev
2022-05-27 04:59:46 +00:00
Tom Hsu
90875efc90
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: I3c6ddf5ca206114fa677a06a7086fa0eb75b0752
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-26 15:40:10 +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
Hank Sheng
bdda48ebe5
Create the glifv4 theme and set to glifv4 theme when the themestring is glifv4.
...
screen shot:
https://hsv.googleplex.com/5487921525161984
https://hsv.googleplex.com/4853914928152576
https://hsv.googleplex.com/6492643191160832
https://hsv.googleplex.com/5915886260060160
https://hsv.googleplex.com/6321050657751040
https://hsv.googleplex.com/6222016362315776
Bug: 233036258
Bug: 233032365
Change-Id: If2bb4a82912bfdd18dc17ced11adc59eaf474bed
2022-05-26 07:17:36 +00:00
Bill Yi
7cbd699752
[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: Icac35db797bfdf2230c03a8c08b2bdd978fdb8f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:08:09 +00:00
Bill Yi
142b69b865
[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: Ia539c2739edc240bccd6d45523972017bbd3cb40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:48 +00:00
Bill Yi
d3f6a2192f
[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: Ic04a2921b42cbf5292bdbb9d500257ac9f99ea52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:32 +00:00
Bill Yi
a34af9b081
[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: Ie822ccdbcab2f1bf46980f59847bf3d2e9320250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 19:07:22 +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
0d415d7cc6
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: Icdfbe0d9c4dae5cc561c65c01b01414611fa9783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 14:48:03 +00:00
Chaohui Wang
7dc1aec524
Merge "Fix Conversation page flickers" into tm-dev
2022-05-25 14:28:43 +00:00
Chaohui Wang
39bd94e1e5
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: I4c87be62cf59f3fea0c17c3fb6f5564b0cfa75e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 11:07:31 +00:00
Chaohui Wang
02314870c7
Merge "Fix SeekBarPreference selectable test" into tm-dev
2022-05-25 10:50:48 +00:00
Chaohui Wang
1e410610d8
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: I6a8942f58c25a773719f4db05a6d44b50a491ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 09:31:14 +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
395c675770
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: I2d1d5c15f39a86c93322e07f2f0cf17869a0d41d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 08:09:54 +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
2af5588692
Fix unable to toggle off Pause app activity
...
The "Pause app activity if unused" SwitchPreference under App info page.
Currently, the preference controller updates the UI state in the
onOpChanged(), which is unnecessary and is called in another non-UI
thread.
Not updating state in onOpChanged() to fix.
Note: This controller implements the LifecycleObserver to handle
lifecycle related logic, but it's actually a no-op before change
If9e48e44267de8e89a5e8f45d256719130936320. So it used to work fine
without the OnOpChangedListener, we can remove it now.
Fix: 227762370
Test: manual
Change-Id: I33f1f55a706407d7b409c3544f9889c45855b34d
2022-05-25 11:45:23 +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
61ffcb9b61
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: Id94e14072b159e13ae5d42f3c6aded5c8fae8404
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-25 00:41:38 +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
19589d5bb4
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: Ie40e649eb7e9ffd0859a0bd3af839bc7d647146f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 13:01:26 +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
0c461ec850
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: I38b97fd064bfaddde409a6c9bffc5a10d4dc9e05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 12:27:34 +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
Victor Chang
5aada33242
Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f
am: d5ab7dc729
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605
Change-Id: I8b616af8d02a6d984d7dbec2b50087242958dd40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 11:20:54 +00:00
Victor Chang
d5ab7dc729
Merge "Reland "Don't use framework strings for formatting file sizes"" am: ba69fd0d3f
...
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2096605
Change-Id: Ib0ad04ef4c225fbc449abed9913381d6c8d3a138
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 10:53:20 +00:00
Victor Chang
ba69fd0d3f
Merge "Reland "Don't use framework strings for formatting file sizes""
2022-05-24 10:04:46 +00:00
Binyi Wu
3ea7d18309
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: Ice082991ab8157716aa910ee15ad2c7fa8096086
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 09:15:28 +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
62050f266a
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: I062ee27af956efba4246b377f797bf11df9b43de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 04:42:12 +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
17093f454c
[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: Ibbf5b2d45f16c91642b1365e806c94224150a421
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:22 +00:00
Bill Yi
410d895879
[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: I82befbbb0ca1534c2fd0c892c892592358113773
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-24 00:59:05 +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
c484ac981e
[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: I9073902b4178775ca9f68828ab232430d185aee8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:43:52 +00:00
Bill Yi
9ba1e26bdf
[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: Ibc9231c1d7e7ca25a556d32e7a62bbc97589927d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2022-05-23 19:43:35 +00:00