Commit Graph

1247 Commits

Author SHA1 Message Date
tim peng
3cea72fb2b Merge changes from topic "media_output_dialog" into rvc-qpr-dev
* changes:
  Redirect to output switcher panel to the new dialog
  Update rule of launching media output dialog
  Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
  Add PairNewBluetoothReceiver to launch Bluetooth pairing page
2020-12-08 05:46:13 +00:00
tim peng
de2f2754d9 Merge "Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController" into rvc-qpr-dev 2020-12-08 00:55:21 +00:00
Eugene Susla
31505ca0b3 RESTRICT AUTOMERGE am: bfa7a75545 am: d67e22c122
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: I1a046e98511c50641b0fcb42b97233b3fa36e6dd
2020-12-07 16:58:33 +00:00
Eugene Susla
d67e22c122 RESTRICT AUTOMERGE am: bfa7a75545
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12998688

Change-Id: Id7909dd47451e3fbd02b5ca3ce4643cdd1da6715
2020-12-07 16:44:22 +00:00
timhypeng
6472c98ffa Update rule of launching media output dialog
-Do not hide Media Output Dialog in Settings, and let dialog handles
-Hide Media output slice panel when launching dialog

Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Merged-In: I16732f625f100b259d6e53c85db40af0ec1652c5
Change-Id: I16732f625f100b259d6e53c85db40af0ec1652c5
2020-11-30 13:33:59 +00:00
timhypeng
7127fff467 Update OutputSwitcher from MediaOutputSlice to MediaOutputDialog in Settings
-Update entry point at media indicator in volume panel
-Update entry point at remote media slice in volume panel
-Update entry point at remote volume group in Sound Settings
-Update entry point at media output preference in Sound Settings
-Hide Media output dialog when the caller is not active

Bug: 155822415
Test: make -j50 RunSettingsRoboTests
Merged-In: Ib6c86067522925c439f336644e4d027dbae3379c
Change-Id: Ib6c86067522925c439f336644e4d027dbae3379c
2020-11-30 13:33:47 +00:00
timhypeng
8469dea09b Fix java.lang.ArrayIndexOutOfBoundsException in RemoteVolumeGroupController
-Caused by removing and adding preference at the same time
-Make preference operation method synchronized
-Not to update preference by removing and adding. To check session status and update its content to preference
-Post to UI thread to handle the onDeviceListUpdate() callback from framework

Bug: 170049403
Test: make -j50 RunSettingsRoboTests
Merged-In: Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd
Change-Id: Ibfc11e1bd99ba2e578b5d9e7dcc9132e372b68dd
(cherry picked from commit 1268629fda)
2020-11-27 07:20:20 +00:00
Eugene Susla
bfa7a75545 RESTRICT AUTOMERGE
Prevent non-system overlays from showing over notification listener consent dialog

Bug: 170731783
Test: use a visible overlay, ensure it's gone when notification consent is open
Change-Id: I58e017982f385ffc0d0ba2174512490b1d83dd36
2020-11-05 11:52:32 -08: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
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
Jason Chiu
c3ed62e3ae Merge "Fix the ANR in panel when changing volume continuously" into rvc-qpr-dev 2020-09-23 03:01:56 +00:00
Jason Chiu
f447cbbcb5 Fix the ANR in panel when changing volume continuously
When users open volume panel and keep on changing the volume slider for
a while, the panel starts to defer the slider updating, and finally gets
stuck and causes an ANR.

Root cause:
Volume panel has four volume adjusting slices. Each of them registers
a broadcast receiver to listen to the volume changed and muted events.
However, when the media volume changes, AudioManager will send four
broadcasts (music, assistant, accessibility, tts) to every receiver, and
each of them will reload slice four times. Thus, one media volume
changed event will lead to 16 (4*4) UI updates. Consequently, keeping on
sliding the volume bar will trigger hundreds of broadcasts and UI
updates, which makes the system busy and getting stuck.

Solution:
Introduce a VolumeSliceHelper to integrate the broadcasts of the volume
slices specifically.
1. Only register one broadcast receiver to reduce the broadcast loading
   since the four slices are listening to the same signal.
2. Filter the only one eligible broadcast among the multiple concurrent
   ones, and then relay it to the registered slice.
3. Listen to one more action STREAM_DEVICES_CHANGED_ACTION to update the
   volume panel when audio output device changes.

Test: robotest, visual
Fixes: 144134209
Fixes: 160489394
Change-Id: I780b9eee35802b19a5f0ab0a7d07bd3e081f5556
Merged-In: I780b9eee35802b19a5f0ab0a7d07bd3e081f5556
(cherry picked from commit 2c7b77dad7)
2020-09-22 02:58:01 +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
TreeHugger Robot
794482fb92 Merge "Hide conversation bubble switch if app bubbles are off" into rvc-qpr-dev 2020-08-25 18:14:50 +00: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
Julia Reynolds
4cf561d2c3 Fix pending intent links
Test: manual
Fixes: 154795795
Change-Id: Ia870bd0bfd90be852121b542100806cac5bac881
(cherry picked from commit 97894bcfb7)
2020-08-20 12:38:37 +00:00
Julia Reynolds
52cf852b63 UX updates for notif history
- no relative time
- fix background color in dark theme
- fix text alignment in RTL

Test: manual
Fixes: 160061165
Fixes: 160388261
Fixes: 156410384
Change-Id: I7d4c5a5f81ce5b5ce43fdaa3ee99184906753a76
(cherry picked from commit 3dd023f363)
2020-07-17 13:25:05 +00: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
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
0bdffb98c3 Increase expand/collapse tap target
Fixes: 157160901
Test: manual with voice a11y service
Change-Id: Ic1cdd3ee4f22d66d76718fae11304a0d6128def2
(cherry picked from commit bfab43571d)
2020-07-10 19:34:06 +00: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
Daniel Sandler
75e505cc88 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: I159e8a7c412967b5ac9c063ecd01d4554ec90d4f
2020-06-26 21:38:56 +00:00
Daniel Sandler
5d625e2341 Merge "Add bubble and shortcut info to notification log debug" into rvc-dev 2020-06-26 21:22:26 +00:00
Alex Li
0567bb7834 Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: I1606b0ae03f46750d0067a9c9abc898dbbfe0c4b
2020-06-22 04:10:37 +00:00
Alex Li
3f8d40bd95 Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev 2020-06-22 03:59:30 +00:00
alexylli
40b79387cc [Settings] Avoids disabled component when page start from setup wizard.
Fixs when disable component during system busy, the framework have high possibility to force closing activities on the same task.

test
1. setup a pin code and go through to the anything else page. click "control info on lock screen".
>> The SetupRedactionInterstitial not been disabled.
>> The lock screen can be setup repeatedly.
2. into home screen. using adb command to start SetupRedactionInterstitial.
>> the screen not shown.
3. using adb command to start RedactionInterstitial and click "done".
>> the activity existed normally.

Bug: 158961310
Test: Manual
Change-Id: I09fe95db591d3d3603b2c13623a0873bfab3bac0
2020-06-22 09:59:28 +08:00
Dan Sandler
9c3cb64e08 Add bubble and shortcut info to notification log debug
Bug: 159442644
Test: adb shell am start -n com.android.settings/.Settings\\\$NotificationStationActivity
Change-Id: I5c628ed52bfb44af1cc99ec9fd3dc436fe296344
2020-06-19 15:44:49 -04:00
TreeHugger Robot
385e9be34f Merge "Update notification subtext" into rvc-dev am: 141153e789
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I9f48f9e9fc98eee8ae3df94135c0baac9783429e
2020-06-19 01:16:42 +00:00
TreeHugger Robot
141153e789 Merge "Update notification subtext" into rvc-dev 2020-06-19 01:04:09 +00:00
Julia Reynolds
03a42fd844 Update notification subtext
Test: atest
Fixes: 159274325
Change-Id: Iff98b4b056bf7a3c6386063d6588a26607ee7525
2020-06-18 16:25:38 -04:00
TreeHugger Robot
315695c17a Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: I9f4afbcceebfc4eaf74e1ae1dd852a201a7c5404
2020-06-18 15:10:09 +00:00
Beverly
51fb73e512 Launch work dnd setting for work-profile apps
Test: manual
Fixes: 159178762
Change-Id: Ifa4c7f776e19f3aec87b5ef1f858c92cff46b30b
2020-06-17 11:57:19 -04:00
tim peng
b4d7fe8d6b Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I98ea63c8fce726891bd60918be64ead454b13f52
2020-06-15 06:40:19 +00:00
Tim Peng
e3a821d6fe Unable to adjust remote session volume in Sound Setting
-It is incorrect to compare the device ID with session ID
-The preference key is the session ID and we should adjust remote session volume by it

Fix: 158956140
Test: make -j42 RunSettingsRoboTests
Change-Id: Ia815b7bfdf6d7e44aca9832f11371669e973d363
2020-06-15 06:27:49 +00:00
TreeHugger Robot
2f75ebed19 Merge "Explicitly request focus after button pressed" into rvc-dev am: d9a246c49e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11851989

Change-Id: I5c6cdfe795d9df67bbb034e2120a0916e0dea570
2020-06-13 00:30:34 +00:00
TreeHugger Robot
d9a246c49e Merge "Explicitly request focus after button pressed" into rvc-dev 2020-06-13 00:19:44 +00:00
Beverly
258fd7c03b Explicitly request focus after button pressed
Don't use focusableInTouchMode, it was causing focus/clickability issues
when the device wasn't in touch mode.

Test: manually tap button (tap works first try)
Test: turn on talkback and toggle buttons, also try toggling QS tile
while on the Settings page - doesn't reannounce state
Fixes: 158717450
Change-Id: I785d0200dd61235aa3308a8588f9ee998e7cb6e5
2020-06-12 16:01:50 +00:00
TreeHugger Robot
4327cd65cc Merge "Don't pass channel info for the bubble app page" into rvc-dev am: d6081039c6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11636410

Change-Id: Icc6c824db2ad89a8a18fdcdcd595afc4f406aa6d
2020-06-11 17:37:14 +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
TreeHugger Robot
cc2652c5e9 Merge "Fix shortcut flags" into rvc-dev am: 01464a1bff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11797526

Change-Id: I9e00ad9c654ce922cd3d10803eabc71b0b6f37c1
2020-06-08 22:15:36 +00:00
Julia Reynolds
6534317317 Fix shortcut flags
Test: view the conversation detail page for a conversation
with a posted notification
Fixes: 158033229

Change-Id: I3c51d9565201cb39a5d76d8aaca75c026e630e51
2020-06-08 16:11:23 -04:00
Will Brockman
5d859ea300 Merge "Statsd UiEvent logging for notification history." into rvc-dev am: 5c1b9c357d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11694447

Change-Id: I93a6ace5ceab0cf0b0794c8a241e99d301f07cb1
2020-06-03 17:58:02 +00:00
Will Brockman
7f43530a15 Statsd UiEvent logging for notification history.
Events logged:
Notif history on/off/open/close
Notif click (recent/snoozed/older)
Notif delete (older)
Notif package history open/close

Additional background: There are 3 notif history sections: snoozed
notifs, recently dismissed notifs, and older notifs. In the snoozed &
recent sections we still know the notif SBN, so actions on those
events are logged with instance ID. The older-notifs section is
grouped by package, and we no longer know the instance ID.

This change depends on change 11692386 in frameworks/base, which adds
UiEventLogger support for the RankingSelected atom.

Bug: 155061525
Test: Manual (statsd testdrive)
Change-Id: If267fca97c40c1bbd8dfa785814c85927ab36c91
2020-06-02 13:07:05 -04:00
TreeHugger Robot
f349972f5a Merge "Some text polish" into rvc-dev am: 56c820fb65
Original change: undetermined

Change-Id: Ia8ca1f7e5977299de3515fa057e1cd22bf1dc359
2020-06-01 23:03:05 +00:00
Julia Reynolds
e32e6cc981 Some text polish
- Update styles and alignment

Test: manual
Fixes: 157769522
Change-Id: I92113b5e7a918e1ec31acb64aa10457f4c762760
2020-06-01 14:57:30 -04:00
TreeHugger Robot
101209195e Merge "Hide header if no items present" into rvc-dev am: 729c6c64a9
Change-Id: I8d4d7931e5c33c31126cd734ab496e6365a4dd29
2020-06-01 16:27:43 +00: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
Julia Reynolds
9be31ce9ef Merge "Only show Bubbles link for messaging apps" into rvc-dev am: 73b6bfc1e8
Change-Id: Ied54b377c639d4beeff1d0f576f426f55b110fdc
2020-05-31 19:08:20 +00:00
Julia Reynolds
73b6bfc1e8 Merge "Only show Bubbles link for messaging apps" into rvc-dev 2020-05-31 18:57:41 +00:00
Julia Reynolds
ff85c188d8 Add a bubbles content description am: 4029f92f12
Change-Id: I2bb8406aca20a1052379b6c4cf06608785363ee9
2020-05-29 22:25:38 +00:00