Commit Graph

33211 Commits

Author SHA1 Message Date
SongFerng Wang
9493731935 Merge "To fix bug, summary is wrong if nr_enabled_bool=false" into rvc-qpr-dev am: 3e5defe561
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12875667

Change-Id: I2b69a34d035e70cbc1bea9a2482be876eeabda66
2020-10-21 08:19:13 +00:00
Treehugger Robot
e3dd9644b6 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023 am: d719de84c1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I3005a83ba8d27238d2fbd883d77b4a20432cabc6
2020-10-21 03:53:00 +00:00
Treehugger Robot
d719de84c1 Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" am: 21846b228b am: 0a2c406023
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1405190

Change-Id: I91608590cc7b0255706d0ea4bdc896a778e72b8b
2020-10-21 03:21:48 +00:00
Treehugger Robot
21846b228b Merge "Highlight the MMS messages preference for ACTION_MMS_MESSAGE_SETTING" 2020-10-21 02:40:55 +00:00
SongFerngWang
706036e5b3 To fix bug, summary is wrong if nr_enabled_bool=false
The carrier config nr_enabled_bool is false, preferred network mode
should hide 5G UI. This bug is that the summary show 5G item when
nr_enabled_bool is false.
Solution: if nr_enabled_bool is false, it checks capability and then
removes 5G capability of network mode.

Bug: 170460943
Test: make RunSettingsRoboTests ROBOTEST_FILTER=\
EnabledNetworkModePreferenceControllerTest   (PASS)
Change-Id: I3f7d41c196569c0cb61e89cfc270b957e2f0add5
2020-10-20 13:07:59 +00:00
Andrei-Valentin Onea
acfad23908 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3 am: 8e111e3de3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: Iec4b14d29945ae3088838428cc48b36ae71faeb2
2020-10-19 15:26:01 +00:00
Andrei-Valentin Onea
8e111e3de3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba am: 38747f76f3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I60df429605c78749c0259f7efffab026210a4977
2020-10-19 14:56:40 +00:00
Andrei-Valentin Onea
38747f76f3 Merge "Add support for @EnabledSince compat changes" am: 2d57867aba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455019

Change-Id: I600c63a996b1684a2b801787d88974501062c073
2020-10-19 14:37:30 +00:00
Andrei-Valentin Onea
2d57867aba Merge "Add support for @EnabledSince compat changes" 2020-10-19 14:19:31 +00:00
TreeHugger Robot
09a906b972 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev am: 1a09d244d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12755868

Change-Id: I0026c3fbb1bf26d68f203c36c49576deb6d79681
2020-10-16 22:42:07 +00:00
TreeHugger Robot
1a09d244d4 Merge "Hide 'View plan' button in data usage settings" into rvc-qpr-dev 2020-10-16 22:18:33 +00:00
Amit Mahajan
0f36371e3e Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d am: 0e5fdb184d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: I282af7cad68106b706d6b6fa477d720797b74ad1
2020-10-16 07:48:10 +00:00
Amit Mahajan
0e5fdb184d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47 am: b09f09b02d
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: If8cd3e5f3aec33840fc5a7477e2895dc6f2a158c
2020-10-16 07:35:48 +00:00
Amit Mahajan
b09f09b02d Merge "Add the extra "Ask every time" if supported only" am: 7b9edcde47
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1455946

Change-Id: Ib2b9864613071c7a6819f03d5c1803b81b9a6575
2020-10-16 06:39:15 +00:00
Jeff DeCew
03ebcc2474 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev am: e9523b7636
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12792910

Change-Id: I55f6310b344baebfe6a4425d3644d22d8e479638
2020-10-14 14:41:46 +00:00
Jeff DeCew
e9523b7636 Merge "Update NotificationChannelSettings Preferences in place to prevent re-layout." into rvc-qpr-dev 2020-10-14 14:26:56 +00:00
Taesu Lee
50ef14540d Add the extra "Ask every time" if supported only
Test: manual

Change-Id: Ie4bb150db41f1e654ea427a605050afbb57114cf
Signed-off-by: Taesu Lee <taesu82.lee@samsung.com>
2020-10-13 10:13:50 +09:00
Jeff DeCew
5bfe1d3f9c Update NotificationChannelSettings Preferences in place to prevent re-layout.
(cherry picked from commit b409b64045)

Fixes: 110093185
Test: ChannelListPreferenceControllerTest
Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f
Merged-In: If6acf305c44085e502a3304ea57e409ce049b40f
2020-10-12 20:06:48 -04:00
Jason Chiu
3e5ce2c8e6 Reduce the flickering of injected items when package is changed am: e4b2b77452 am: fe66e87832
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: I51833ab9e852bedd3c5bb28dc233f142e66a3238
2020-10-12 04:49:02 +00:00
Jason Chiu
fe66e87832 Reduce the flickering of injected items when package is changed am: e4b2b77452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: Ia334ab14dd3aa48c0d48ad6adcfd50ecfcb3400a
2020-10-12 04:32:12 +00:00
Jason Chiu
4b3d851f41 Reduce the flickering of injected items when package is changed am: e4b2b77452
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12771880

Change-Id: Ib2ff68b59e8aa9567d1f6f7c7281832dd323c2dc
2020-10-12 04:31:57 +00:00
Xin Li
8656492241 Merge ab/6749736 in stage.
Bug: 167233921
Merged-In: I8e3eb6c072488fdc33fae1ebabd17980a67f5d7d
Change-Id: I0411c2f1dbc2fa47b23ff52cacca990f3141f52f
2020-10-08 23:40:50 -07:00
Sarah Chin
f3d7860c70 Hide 'View plan' button in data usage settings
There are currently no callers of the setSubscriptionPlan() API that
have a MDP app set up. Remove the button when SubscriptionPlans are
defined, since it does nothing and causes confusion for users.

Test: manually verify button does not exist when a plan is defined
Test: make RunSettingsRoboTests
Bug: 169806315
Change-Id: Ieda020bfa692e9465d6297e50cf338deff91a8a9
2020-10-08 21:03:39 -07:00
Andrei Onea
f21ba0c650 Add support for @EnabledSince compat changes
Bug: 49103556
Test: make RunSettingsRoboTests ROBOTEST_FILTER=PlatformCompatDashboardTest
Change-Id: Iaf83b1ef2f07a910a3590f59562c2f638b5a6089
2020-10-08 21:54:02 +01:00
Jason Chiu
e4b2b77452 Reduce the flickering of injected items when package is changed
Root cause:
Settings listens to four package-related broadcasts in order to refresh
injected items because UI data may change. However, when the system is
updating apps on the first boot, it triggers a burst of broadcasts. For
each broadcast Settings will reload and then redraw all injected items,
which leads to the flickering.

Solution:
1. When Settings recieves a broadcast, check if there are already two
reloading tasks to avoid redundant updates.
2. In the reloading task, check if any injected item is changed, added,
or removed to notify categories changed.
3. Only refresh the UI when any of the changed items belongs to the
current page.

Bug: 166785977
Bug: 168309941
Test: manual, robotest
Change-Id: I77745b60f84510554bff1870a5bb7a8013eab528
Merged-In: I77745b60f84510554bff1870a5bb7a8013eab528
(cherry picked from commit 20df25e6b9)
2020-10-07 17:49:17 +08:00
TreeHugger Robot
fafe12056c Merge "Hide tethering option when in a guest account" into rvc-qpr-dev am: ab41be5607
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12723406

Change-Id: I4caa8937deae9bc104c9c6c3446b7f793cac1f80
2020-10-06 02:25:09 +00:00
Hugh Chen
a50f020c85 Hide tethering option when in a guest account
- Before this CL, users can share their mobile data through enabling
  tethering in the USB menu when in a guest account.
  It will cause main users to spend their money unexpectedly.

  This CL will hide the tethering option on the USB menu when in the
  guest account.
- Add test cases.

Bug: 166125765
Test: 1. make -j42 RunSettingsRoboTests. 2. Switch to a guest account
to verify whether the tethering option is hiding.

Change-Id: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
Merged-In: I7523b3f3c3a1372bb128a58a6a7fac973d27cfbe
(cherry picked from commit bde627b263)
2020-09-29 01:57:37 +00:00
Treehugger Robot
da6ffe3636 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9 am: 2532a70ba1
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: I89308bbe2a0305f1d2a1a06da9f936e21c8bf6cd
2020-09-28 03:07:24 +00:00
Treehugger Robot
2532a70ba1 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590 am: 423f9801e9
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: Ibc85aecd1c5a83e67970fd9daf381e1da3f35bf2
2020-09-28 02:53:19 +00:00
Treehugger Robot
423f9801e9 Merge "Avoid unexpected state changes for enhanced preferences" am: 7f6271364b am: 6891dd4590
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1425491

Change-Id: Ibaaf851ae4b9b486b83b795aa9818413cd0f14bf
2020-09-28 02:25:26 +00:00
Treehugger Robot
7f6271364b Merge "Avoid unexpected state changes for enhanced preferences" 2020-09-28 02:01:05 +00:00
Tyler Gunn
ce636284ec Fix issue where "learn more" link on 5G NR settings doesn't work. am: d3d88afee7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12700756

Change-Id: I64aae8431da809ce109d68a0663c6c663235693e
2020-09-25 21:54:18 +00:00
Tyler Gunn
d3d88afee7 Fix issue where "learn more" link on 5G NR settings doesn't work.
Issue is due to the fact the footer text is a spannable string which
although different from the original text loaded when the preference
was constructed, is the same in terms of object equality.
Clearing the preference title before assigning the footer text fixes this.

Fixes: 162011372
Test: Manual test; open settings and verify link is clickable now.
Merged-In: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
Change-Id: I5d22c665b0d6fb842bc54dc55a2eb3045e0092a2
(cherry picked from commit 97d8711d84)
Exempt-From-Owner-Approval: Straight cherry-pick.
2020-09-25 21:18:29 +00:00
TreeHugger Robot
f6bcf2334e Merge "[adbwifi] wireless debugging qstile long-press to WirelessDebuggingFragment." into rvc-qpr-dev am: 39baa4a821
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12654737

Change-Id: I64e85bea61395c43b57521c2ad4463b27b432468
2020-09-25 16:27:50 +00:00
TreeHugger Robot
39baa4a821 Merge "[adbwifi] wireless debugging qstile long-press to WirelessDebuggingFragment." into rvc-qpr-dev 2020-09-25 15:55:55 +00:00
TreeHugger Robot
e71dc5640e Merge "Disable entry point of output switcher" into rvc-qpr-dev am: faf7a2ad78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12686593

Change-Id: I981a5fdc4356e41ceaf353b005077765568c6944
2020-09-25 09:31:06 +00:00
TreeHugger Robot
0306995bbd Merge "Fix output switcher will display previous media session" into rvc-qpr-dev am: 27a7be8a24
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12660648

Change-Id: Ia152136adbbf6a32ee79d08a06ba23a75b948ddc
2020-09-25 09:30:08 +00:00
TreeHugger Robot
faf7a2ad78 Merge "Disable entry point of output switcher" into rvc-qpr-dev 2020-09-25 09:04:36 +00:00
TreeHugger Robot
27a7be8a24 Merge "Fix output switcher will display previous media session" into rvc-qpr-dev 2020-09-25 09:03:50 +00:00
Jason Chiu
cad3c395da [DO NOT MERGE] Fix the blank space on contextual card loading timeout am: 4753adfb52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12533604

Change-Id: I974883a20ebcac94cf72ccbfdd9cab18b23d1690
2020-09-25 07:18:13 +00:00
Jason Chiu
e8b34c64f4 Merge "[DO NOT MERGE] Fix the blank space on contextual card loading timeout" into rvc-qpr-dev 2020-09-25 07:05:25 +00:00
Hugh Chen
455a0a3186 Disable entry point of output switcher
It adds a minimum value if it shows only one available
cast device in the output switcher. Because users can only
change the volume slider or stop control in the output switcher.
It's too hidden to have the user stop cast in the UI.

- This CL will disable the entry point of the output switcher
  if there is only one available cast device in the list.
- Update test cases.

Bug: 163095048
Test: make -j42 RunSettingsRoboTests
Change-Id: I8906878e1ba769d6940041f17d83b5de6b2a32c0
Merged-In: I8906878e1ba769d6940041f17d83b5de6b2a32c0
(cherry picked from commit b6840ced0d)
2020-09-25 03:18:05 +00:00
Joshua Duong
e04e9a508d [adbwifi] wireless debugging qstile long-press to WirelessDebuggingFragment.
Previously, long-pressing any developer options quick settings tiles
redirects to the application info page for Settings app. The manifest
change makes the long-press by default, go into the developer options
page.

Also, there's a check if the long-press came from the wireless debugging
tile so it can launch the WirelessDebuggingFragment.

Bug: 153275926

Test: Enable the wireless debugging qstile in developer options.
Then long-press the wireless debugging tile, which should direct you to
the WirelessDebuggingFragment. Also, enable any other qstile and
long-press them. It should direct you to the developer options page
instead of the application info page.

Change-Id: Id495e5c978005c21d0f33b949d7c410100bf3cf5
2020-09-24 18:17:42 +00:00
tim peng
0c786c8321 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b am: d3a9f472a2 am: f01d260512 am: 3501adcc86
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: I336bae8e93101a682eea6b51f08c52fb83cc1fc9
2020-09-24 13:21:55 +00:00
tim peng
3501adcc86 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b am: d3a9f472a2 am: f01d260512
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: Iaaef48f2af763fb1905596205bedd6b33574750e
2020-09-24 13:05:41 +00:00
TreeHugger Robot
d2f2f4b13e Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev am: 28b05910d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12682503

Change-Id: I9bbb023a738a2d58e178b8dc78e19a5d70a28feb
2020-09-24 13:05:22 +00:00
tim peng
f01d260512 Merge "Set highest priority as default value to Bluetooth codec" am: 594849082b am: d3a9f472a2
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1435258

Change-Id: I92cf2605c1e9ee48abedc483a1e461d196b09ef2
2020-09-24 12:39:06 +00:00
TreeHugger Robot
28b05910d8 Merge "Guard against flickering of dynamic injection items" into rvc-qpr-dev 2020-09-24 12:32:20 +00:00
tim peng
594849082b Merge "Set highest priority as default value to Bluetooth codec" 2020-09-24 11:48:51 +00:00
Jason Chiu
a7d76af933 Guard against flickering of dynamic injection items
The summary of injected items may flicker when the data is change from
URI.

Root cause:
If an external app injects an entry to Settings with a dynamic summary,
Settings will observe the summary change via the provideed URI. However,
sometimes when Settings observes the data change and then refreshes the
UI, the data doesn't really change and settings still gets the same
summary. If it happens in a short period, the summary will seem
flickering.

Solution:
Check if the data really changes before refresh UI. Guard both title and
summary.

Fixes: 168309941
Fixes: 166785977
Test: robotest
Change-Id: I137fc317dcfd8919195c10fa8cf7d2559fe1029d
2020-09-24 17:25:48 +08:00