Commit Graph

82 Commits

Author SHA1 Message Date
Julia Reynolds
f8cdea4b9d Add NEW_TASK flag for intents that leave Settings
Test: manual
Fixes: 202101382
Change-Id: Ie0cc7c10b19b49ad33227f3fdaad397e03e33858
2021-10-08 17:05:45 +00:00
Julia Reynolds
2ffbb747d4 Handle spanned conversation labels
Test: Robotests
Fixes: 194446117
Change-Id: If21f727e00b181f0da127b09e5a1c46ec3257836
2021-08-12 20:11:00 +00:00
Edgar Wang
9bac8ec684 Adjust bubbles avatar icon size to align left icon
Bug: 185596897
Test: robotest & visual
Change-Id: I5d283db7e6b7f0d8cda9689c1ead2fdd318cc8ab
2021-06-21 23:59:45 +08:00
Julia Reynolds
6a603e7f4b Clean up notification settings
- Reorganize settings
- Fix dividers
- Add icons
- Fix titles
- Fix colors
- Fix indentation
- Add summaries

Fixes: 190079590
Test: manual inspection, robotests

Change-Id: Ia03219575d3b0c78f9f9b088aa3cdaa29cfdf412
2021-06-18 14:36:20 -04:00
TreeHugger Robot
d6b3885ef5 Merge "Revert "Disable RecyclerView animation to fix the broken UI"" into sc-dev 2021-06-18 10:45:20 +00:00
Yi-Ling Chuang
357b08a63e Revert "Disable RecyclerView animation to fix the broken UI"
This reverts commit 5b219a34ab.

Reason for revert: <b/191335572>

Bug: 191335572
Change-Id: I47ceb8d043e3b02a59e43a1ae021c3c7855cbe57
2021-06-18 10:45:13 +00:00
Julia Reynolds
0d937afbb8 Add a11y text for disappearing preference
Test: Talkback
Fixes: 182241259
Change-Id: I99c1ce635c5717e22ee28bc86b51bd3be4b83d91
2021-06-17 14:28:35 +00:00
Julia Reynolds
a2c2889c78 Merge "Update method name" into sc-dev 2021-06-09 17:33:23 +00:00
Julia Reynolds
b70d3d5c13 Update method name
Test: RoboTests
Bug: 184709662
Change-Id: I3a998a151f9647efae00909e2b4f88fa27d645eb
2021-06-09 09:53:09 -04:00
Giuliano Procida
ef0e09f7a3 Merge "Revert "Apply SettingsLib SeekBarPreference to Settings"" into sc-dev 2021-06-08 09:55:58 +00:00
Edgar Wang
cdff5c6ceb Revert "Apply SettingsLib SeekBarPreference to Settings"
Revert submission 13422386-seekbar-sc-dev

Reason for revert: build broken in SettingsGoogle
Reverted Changes:
I0c2d0d5fb:Apply SettingsLib SeekBarPreference to SettingsGoo...
I1844bb3b0:Apply SettingsLib SeekBarPreference to a11y vibrat...
Ia3e4adec8:Apply SettingsLib SeekBarPreference to a11y vibrat...
Iadee57e9d:Apply SettingsLib SeekBarPreference to a11y vibrat...
I219878716:Apply SettingsLib SeekBarPreference to Settings
I959f5672c:Create SettingsLibSeekBarPreference
I92545a69c:Apply SettingsLib SeekBarPreference to a11y vibrat...

Change-Id: Ie6c3b0dc072e044796abdb33fca305f9f9d47c4d
Bug: 176818438
2021-06-08 09:47:51 +00:00
Edgar Wang
4aad4a88a7 Merge "Apply SettingsLib SeekBarPreference to Settings" into sc-dev 2021-06-08 07:23:54 +00:00
Edgar Wang
d6b5bbb5cb Apply SettingsLib SeekBarPreference to Settings
Bug: 176818438
Test: robotest

Change-Id: I219878716457ce4bb7cad251bccf5d50d93030a5
2021-06-07 18:09:19 +00:00
Julia Reynolds
6d6280c634 Merge changes I31066a6f,I081cea0d into sc-dev
* changes:
  Fix broken test
  Updates to conversation page
2021-06-07 14:50:00 +00:00
Julia Reynolds
c94f997a2f Fix broken test
Test: robotests
Fixes: 189352955
Change-Id: I31066a6fdd72e923369e613b656ffe767b3e3b5c
2021-06-03 10:52:18 -04:00
Yi-Ling Chuang
5b219a34ab Disable RecyclerView animation to fix the broken UI
RecyclerView has item animation by default. In this bug, RV animation
seems to be interrupted by the page transitions(Shared Axis), and so
items could not finish sliding to its position.

Hence, disable RV animation to fix it.

Fixes: 189720797
Test: Navigate to Mobile & Wifi usage page and see the normal UI.
Change-Id: I52920715ae4b63ef78a73fcb9c76c6d20f80e012
2021-06-03 18:12:07 +08:00
Julia Reynolds
679445fb43 Updates to conversation page
- Make info preference not selectable
- remove dividers

Test: manual
Fixes: 189414449
Change-Id: I081cea0d51fbc2d1c54ac392cee88a5750985fce
2021-06-02 16:16:17 -04:00
Julia Reynolds
05f20f44f2 Improve entrance animations on convo page
By moving loading in each controller to the same thread.
There will still be shifting as the conversation prefs are added, but it
won't be the over thte top shift up and shift down motion that existed
prior to this cl.

Test: manual
Fixes: 188734400
Change-Id: I202981b603b8f9308b2b352a0939182910869cd6
2021-05-24 09:02:24 -04:00
Julia Reynolds
86af9e9da0 Add a11y announcement
Since the button for clearing recent conversations may still
exist after the user triggers the button since some of the
conversations might not be removable

Test: manual with talkback
Fixes: 185433664
Change-Id: Id58d76237643e4e206ea6d551cdf7dd9f5742282
2021-05-17 11:11:29 -04:00
Alex Stetson
413893244d Merge "Use shared model for non-system overlay toggle" into sc-dev 2021-05-07 14:08:52 +00:00
Alex Stetson
aff80d1e14 Use shared model for non-system overlay toggle
Allows settings applications on other platforms to re-use values by
migrating to Settings.secure and moving HideNonSystemOverlayMixin to
SettingsLib.

Bug: 184967544
Test: atest SettingsUnitTests
Change-Id: If9aaeca29ebb8b481d75622934503e368d7435d3
2021-05-06 08:28:19 -07:00
Mill Chen
efbcc69cc4 Fix inconsist color filling on collapsing toolbar
Some pages are updating the background color for action bar after action
bar is created, which will break the animation of collapsing toolbar. It
also causes the different color filled in the status bar and collapsing
toolbar area separately. Removing the styleActionbar method from
EntityHeaderController can fix this issue.

Fix: 187019164
Test: robotests && visual verified
1) Settings -> Apps -> See all apps -> pick up either app -> Mobile data
& Wi-Fi
2) Scrolling the content and see if the toolbar has the different color
between status bar and toolbar

Change-Id: Ic0842b9e6c48662872694534a3696c4b8900481f
2021-05-06 14:46:30 +08:00
Tsung-Mao Fang
a58b144822 Replace to correct footer preference style
Test: Rebuilt apk and see the result
Fix: 186078568
Change-Id: I24ee2371dd51b8be4aa69d51d08c534117978ff2
2021-04-22 17:28:26 +08:00
Mady Mellor
24adce034d Change bubble settings to use Secure rather than Global
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug: 173408780
Change-Id: I53fcd59c22c219551bd2eb6f0251acb5a03690ea
2021-04-20 01:37:34 +00:00
Julia Reynolds
14cdcfdee9 Mark non actionable preferences as non-selectable
Test: navigate the conversations page with switch access enabled
Fixes: 178765656
Change-Id: If5d5dd301e2d95b4aa7512f58a6e1adf01f3dbf0
2021-04-07 14:35:39 -04:00
Julia Reynolds
4b301dba7a Fix some 'clear recent issues'
- Don't show the button if nothing is clearable
- Optimistically remove preferences on pressing clear since the actualy
clear action is asynchronous

Test: RoboTests
Fixes: 178765511
Change-Id: Ic305d4d199b149078ea52a614cb93cebe55cd245
2021-03-29 17:43:31 -04:00
Edgar Wang
0c914077aa Merge "Change packagename of TwoTargetPreference" into sc-dev 2021-03-17 05:08:21 +00:00
Julia Reynolds
efe26e2d44 Launch channel settings as half sheet
If opening app has requested only a subset of fields

Test: manual - launch from an app, filtered and unfiltered, for
normal channels and conversations
Bug: 177246841
Change-Id: Ifd70478101d1ea1340d2ecc55033fab55e65ca92

Change-Id: I5194b959c82b2cfa7990c84285aaf69464cff3a8
2021-03-12 09:58:41 -05:00
Julia Reynolds
85511dbef8 Fix exception sorting conversations
Test: robotests
Fixes: 178618139
Change-Id: I524187a5840163d65dce35827785f3139b6fede7
2021-02-19 13:22:31 -05:00
Julia Reynolds
4dc7795eb3 Add filtering to notification channel settings
Allow apps that are launching this page to specify targeted subsets of
settings that should be shown.

Test: settings notification robotests
Bug: 177246841
Change-Id: Ib491c43f1861a9775e3b25f39134cdbe105a7ff8
2021-02-16 14:40:26 -05:00
Edgar Wang
9691da0d21 Change packagename of TwoTargetPreference
Bug: 180156703
Test: robotest
Change-Id: Ida344e689971aa780054093b2472582d61c476d1
2021-02-13 12:17:14 +08:00
Stanley Wang
10b7a7d483 Use MainSwitchPreference to replace the button style switches.
Fix: 177967926
Fix: 177968295
Fix: 177967925
Fix: 177968078

Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: Ie854de96e5495fa564fb8a097ed4547bbd2b10c5
2021-02-02 08:39:37 +00:00
Julia Reynolds
33f4f59b04 Merge "Fix some issues with notif blocking in settings" 2021-01-25 17:18:53 +00:00
Beverly
857dfe131b Don't iterate channel list in bgthread
To avoid a ConcurrentModificationException

Fixes: 173674911
Test: manual
Change-Id: If35c6f66a2cfae7ee4a6f8e83dd70aa5877f8362
2021-01-22 17:43:18 +00:00
Julia Reynolds
c1ca4b81c1 Fix some issues with notif blocking in settings
- Fix cast cast exception
- Make sure unblocking a notification channel also actually
unblocks it

Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.notification"
Fixes: 177968301
Fixes: 177907827
Change-Id: Ibad56e102e167bcf004fbd0f9873cc29834a30c1
2021-01-21 11:13:57 -05:00
Stanley Wang
b87ddba6cd Use SettingsLib's MainSwitchBar to replace SwitchBar in Settings.
To log Settings metrics, the MainSwitch extends MainSwitchBar and
replace the SwitchBar in SettingsActivity.

Bug: 175181773
Test: Run robotest and apply the widget in Settings and see the ui

Change-Id: I3add3702e9058ad9192b5172c7cf0e2ccfb55a70
2021-01-14 22:48:31 +08:00
Julia Reynolds
0aef57d67e Add 'Recent Conversations' to the conversation page
Test: atest
Bug: 171191376
Change-Id: Id7208312dff0cc022c2f16b3872fae1a9dc09ed7
2020-10-21 16:39:04 -04:00
TreeHugger Robot
89cc479bd8 Merge "Disable bubbles for low ram devices" into rvc-qpr-dev am: f9469f109a am: 3bce073370
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12620222

Change-Id: I3485643cce554f1b028ed35d20b9ea4ed500cc73
2020-09-22 17:56:32 +00:00
Lyn Han
29559b1645 Disable bubbles for low ram devices
Fixes: 167677013
Test: set low ram true => bubble settings hidden
Test: make -j80 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"

Change-Id: I1c40a05404ea7c78cc82102b33e4bc3cb3528075
2020-09-21 15:11:07 -07:00
Jeff DeCew
b409b64045 Update NotificationChannelSettings Preferences in place to prevent re-layout.
Fixes: 110093185
Test: ChannelListPreferenceControllerTest
Change-Id: If6acf305c44085e502a3304ea57e409ce049b40f
2020-08-24 15:11:22 -04:00
Lyn Han
aea66dcc96 Hide conversation bubble switch if app bubbles are off
Fixes: 159340745

Test: BubblePreferenceControllerTest

Test: priority conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle checked
=> app bubbles ON => toggle checked

Test: default/silent conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle NOT checked
=> app bubbles ON => toggle NOT checked

Change-Id: Ia5759c2a06c1da4d84b3dafed95e52c3aa30ad56
(cherry picked from commit 9af95dae7d)
2020-08-20 16:59:33 +00:00
Lyn Han
9af95dae7d Hide conversation bubble switch if app bubbles are off
Fixes: 159340745

Test: BubblePreferenceControllerTest

Test: priority conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle checked
=> app bubbles ON => toggle checked

Test: default/silent conversation bubble
=> app bubbles OFF => toggle hidden
=> selected bubbles ON => toggle NOT checked
=> app bubbles ON => toggle NOT checked

Change-Id: Ia5759c2a06c1da4d84b3dafed95e52c3aa30ad56
2020-08-14 20:18:26 +00:00
govenliu
b70ddb9df7 [Wi-Fi] WiFi Settings inclusive language fix plan phase 1
Replace WiFi related terms which contain Master wording.
Goal: Create a fixit for Android Platform to reduce the use of non-inclusive language for all code.

Bug: 161425297
Test: make RunSettingsRoboTests -j or
make RunSettingsRoboTests ROBOTEST_FILTER=DashboardFragmentTest
make RunSettingsRoboTests ROBOTEST_FILTER=WirelessDebuggingPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=TopLevelNetworkEntryPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=PrimarySwitchPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest

Change-Id: I9395c50e092e124016609f88f7c8151554a0d874
2020-07-21 20:56:22 +08:00
Julia Reynolds
2f8bc4954c Fix overlapping importance icons
We can't re-use the same background because not
all of the buttons are the same size

Test: manual
Fixes: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
2020-07-16 14:31:19 +00:00
Julia Reynolds
f04c167475 Fix overlapping importance icons
We can't re-use the same background because not
all of the buttons are the same size

Test: manual
Bug: 161297551
Change-Id: I8583cb2fbbcb971ab5819eefd84dde3f7c3b4bdf
2020-07-16 10:19:27 -04:00
Julia Reynolds
2700b83c48 Restore original importance when unblocking notif channel
Test: atest
Fixes: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
(cherry picked from commit e2a8266328)
2020-07-13 20:13:43 +00:00
Julia Reynolds
e2a8266328 Restore original importance when unblocking notif channel
Test: atest
Bug: 62355992
Change-Id: I5d764d0ade68b2ce5708ae79e9ef488ab57bb141
2020-07-08 15:09:41 -04:00
Lyn Han
5de9b1e4f1 Fix sketchy bubble preference button
We were re-using the same "unselected" drawable for buttons with
different heights, which causes one height to override the other,
leading to unexpected drawable overlap and height/text-line mismatch.

Instead, use separate drawable per button.

Fixes: 154087375
Test: toggle between pref buttons in every font size
Change-Id: I5db6e1eb5150a72a0d8038b0840538a0982a5f67
2020-07-01 19:00:34 +00:00
Mady Mellor
87e16f416f Don't pass channel info for the bubble app page
Fixes: 157485149
Test: make SettingsUnitTests; adb shell am instrument etc
Change-Id: If8d9b446ed056996cda91fcc5e92c7077ff3ea5d
2020-06-11 08:33:45 -07:00
Julia Reynolds
2545b4aa3d Hide header if no items present
Test: atest
Fixes: 157093918
Change-Id: If4f86ff71fc5e961e36e5485186d247546355174
2020-06-01 09:24:18 -04:00