Commit Graph

1661 Commits

Author SHA1 Message Date
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
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
Julia Reynolds
bfab43571d Increase expand/collapse tap target
Bug: 157160901
Test: manual with voice a11y service
Change-Id: Ic1cdd3ee4f22d66d76718fae11304a0d6128def2
2020-07-09 12:58:45 -04:00
TreeHugger Robot
8a2468447b Merge "Restore original importance when unblocking notif channel" 2020-07-09 15:47:01 +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
Beverly
c549280a33 Replace zen setting plurals with MessageFormat
For better translations. See go/android-i18n-plurals.

Test: manual
Test: make RunSettingsRoboTests7
Fixes: 156651436
Change-Id: Ic82140b81bf49f071291d2824fa45d310de238ae
2020-07-06 11:25:00 -04:00
TreeHugger Robot
9aa80727c4 Merge "Fix sketchy bubble preference button" into rvc-qpr-dev am: 031b9fe646 am: 0642f08479
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/12061236

Change-Id: I9d0fc91fa3623b901855a03eea65a82bdee43751
2020-07-06 14:09:27 +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
0394734aaf Merge "Add bubble and shortcut info to notification log debug" into rvc-dev am: 5d625e2341 am: 75e505cc88 am: bfd11a8930 am: 54e05c08ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11931358

Change-Id: Ie2049770c6a8b3c87be8a4e1131e7452dce74ea7
2020-06-26 22:22:01 +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
c8184bbae9 Merge "[Settings] Avoids disabled component when page start from setup wizard." into rvc-dev am: 3f8d40bd95 am: 0567bb7834 am: d5f6a66682 am: 8dc66ef820
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11900662

Change-Id: I8b61d4f39dc18a105850f5c6e55da25c09019275
2020-06-22 04:50:55 +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
3e032c93b5 Merge "Update notification subtext" into rvc-dev am: 141153e789 am: 385e9be34f am: 73ebf35f81 am: 399e5e3d7e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11920342

Change-Id: I2309a23cb2c461d5893571ef63561888ec14afcb
2020-06-19 02:04:33 +00: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
Alex Mang
4368da2e23 Merge "Add flag to allow NAS to indicate adjustments on notifications and solicit feedback." 2020-06-18 20:38:06 +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
TreeHugger Robot
4ce89147b7 Merge "Launch work dnd setting for work-profile apps" into rvc-dev am: ea45695190 am: ce685b4142
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11889174

Change-Id: Ia76e93e5631dbd07f4c613977d11cb29182a36e8
2020-06-18 13:59:43 +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
1ed3d7c6b5 Merge "Unable to adjust remote session volume in Sound Setting" into rvc-dev am: e5c9b113b6 am: ae2c0de1b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11862419

Change-Id: I1fadfd59a30cd5392fd2eacc2433ff14431240e3
2020-06-15 06:55:29 +00: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
Julia Reynolds
4029f92f12 Add a bubbles content description
Test: manual with a11y service
Fixes: 155262236
Change-Id: Ib4c9650e1d90c4681ca721df3fde58ffc9430078
2020-05-29 20:47:40 +00:00
Julia Reynolds
3d613bb6c9 Only show Bubbles link for messaging apps
Apps that have sent at least one valid conversation

Test: manual, atest
Fixes: 156033178
Change-Id: If4fff6810f2e390ba0ad0f7587b8d8c2d5819c93
2020-05-29 14:51:06 -04:00
TreeHugger Robot
39507de82b Merge "Some notification history fixes" into rvc-dev am: 69d210c7df
Change-Id: I122252be30db11ea6030d5d23c353d36b617b059
2020-05-27 20:35:46 +00:00
Julia Reynolds
ef4c044053 Some notification history fixes
- Update header count when item swiped away
- Clean up container when last notification is swiped away
- Long pressing on the top two section brings you to settings to
modify notification behavior
- Show more notification content

Test: manual
Bug: 157547283
Change-Id: I1d43cacca7a0f22f83cef9187cf288839e0d5795
2020-05-27 09:45:32 -04:00
Julia Reynolds
4b78d753b8 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
Change-Id: I2a163df1ff0574518804bcff3be2f9650357f73a
2020-05-22 11:48:34 +00:00