PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
45,424 Commits 1 Branch 0 Tags
4d015b17b308d93b868102c718f02c4bcd53e52a
Commit Graph

730 Commits

Author SHA1 Message Date
jyhshiangwang
4d015b17b3 Use ListFormatter to join strings 
Currently in Settings we are using R.string.join_many_items_first, R.string.join_many_items_middle and R.string.join_many_items_last to manually join strings. The join code is messy and the joined string is incorrect in some languages, so we migrate all string join to just use ListFormatter.getInstance().format().

Bug: b/78248791
Test: robotests
Change-Id: I898339978e6e2027587e28994b0280fa46821fd6
 2018-05-02 11:15:32 +08:00
android-build-team Robot
c66613306a Merge "Workaround task-resolution bug in AM" into pi-dev am: bb5a46fabd 
am: f22e98e7c7

Change-Id: I0c2407144a87accaa8e884b31ecc0af2893b6d6e
 2018-05-01 16:21:13 -07:00
android-build-team Robot
bb5a46fabd Merge "Workaround task-resolution bug in AM" into pi-dev 2018-05-01 23:08:15 +00:00
Eran Messeri
7b36ccdd9b Merge "Require work profile to be unlocked for changing notification settings in a different way" 2018-05-01 20:51:39 +00:00
android-build-team Robot
979ece432a Merge "Disable 'remove' option while setting is selected" into pi-dev am: 24cfa88e19 
am: 035e2006e8

Change-Id: Ibae065e51330af2c7abb72a10ac84d284666e4d2
 2018-05-01 12:45:07 -07:00
Julia Reynolds
5c19e7b6b0 Update zen onboarding ui am: 29ba3601b0 
am: fa6482c4a4

Change-Id: I9010987409185d91ff039657cf2b20aeaefd01ad
 2018-05-01 11:05:14 -07:00
Julia Reynolds
ded64625f4 Disable 'remove' option while setting is selected 
Test: robotests
Bug: 78916709
Change-Id: Id1dfc3b61a80c2e0677472ae84dc7425116825f0
 2018-05-01 13:45:53 -04:00
Winson Chung
7bfc62f562 Workaround task-resolution bug in AM 
- Keep launching notification settings in the Settings task. This is not
  the expected behavior, but only a workaround until b/72420153 is
  fixed.

Bug: 72420153
Test: Enter PIP, go to app > notifications > additional settings, ensure
      that it doesn't start in the PIP task

Change-Id: I73e704a283285462d4884db21923818cfb6deead
 2018-05-01 10:23:59 -07:00
Julia Reynolds
29ba3601b0 Update zen onboarding ui 
Test: robotests
Bug: 78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
 2018-05-01 15:11:03 +00:00
android-build-team Robot
bf9c07cb59 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev am: 8e55299f98 
am: 72cedc72a4

Change-Id: Ib15d341f90072be2fbe3d6b5cb1bfd9c4fcbb938
 2018-04-30 14:29:58 -07:00
android-build-team Robot
8e55299f98 Merge "Revert "Get rid of charging sounds toggle"" into pi-dev 2018-04-30 21:08:51 +00:00
Beverly Tai
6761acdd33 Revert "Get rid of charging sounds toggle" 
Bug: 77912907
This reverts commit fbe721b1b3.

Reason for revert: negative dogfood feedback

Change-Id: I8485a379eafee0a4fcd599e9b1c47aee7dd3c6ad
 2018-04-30 20:01:40 +00:00
Eran Messeri
d204af1aa8 Require work profile to be unlocked for changing notification settings in a different way 
Rather than check for the state of the work profile in
LockScreenNotificationPreferenceController#handlePreferenceTreeClick, do so in
the RestrictedListPreference#performClick.
The drawback of checking the state in handlePreferenceTreeClick is that the
preferences are displayed first and then the requirement to unlock/enable the
work profile is displayed on top of it.

This is rather poor UX, so switch to doing the check in performClick and
returning early if the work profile needs to be unlocked/enabled.
This is similar to Patchset 1 from ag/3805482.
The main difference is that the user is returned to the settings screen
both after enabling the work profile and unlocking it.

Test: Manually with TestDPC
Test: atest SettingsRoboTests:RestrictedListPreferenceTest
Bug: 77408805
Change-Id: Id168911b082fffac193cd7c7a658ab92d6ce2c15
 2018-04-30 11:29:36 +01:00
Julia Reynolds
4cf8bfd5b2 Redesign zen visual effects screens 
Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
Merged-In: I3040c1103d76c75601e82e3660a2ace202837ec2
 2018-04-27 11:12:34 +00:00
Julia Reynolds
302b27ab9a Merge "Redesign zen visual effects screens" 2018-04-27 11:08:57 +00:00
Julia Reynolds
4aa42fed67 Redesign zen visual effects screens 
Test: robotests
Bug: 78448988
Change-Id: I3040c1103d76c75601e82e3660a2ace202837ec2
 2018-04-26 18:12:38 +00:00
Fan Zhang
47103ac3de Implement LifecycleObserver in pulse notif controller. 
Change-Id: Icb8d55c5a72bc6a8d6566c43e193b7f12377b4c9
Fixes: 74923755
Test: manually run through lifecycle
Test: atest CodeInspectionTest
 2018-04-25 18:08:14 -07:00
Pavel Grafov
2548326afc Merge "Pick default notification setting for work profile" into pi-dev am: bb839f81e3 
am: 0bdd7cf4f2

Change-Id: Id9c0d04e816f891df7e180974af104edac04905e
 2018-04-23 09:51:49 -07:00
TreeHugger Robot
bb839f81e3 Merge "Pick default notification setting for work profile" into pi-dev 2018-04-23 16:38:43 +00:00
Aurimas Liutikas
e0069d332d Migrate Settings to androidx. 
Test: make Settings
Bug: 76692459
Change-Id: I941dea40562170649bf056e675cc32e5163c0e39
 2018-04-20 12:52:29 -07:00
Julia Reynolds
538a4594ff Collapse notification advanced settings am: 5766d6e443 
am: b4127f1481

Change-Id: Ifca9c55f412baf3a1636e89daab5d022e28d0dfd
 2018-04-20 12:41:02 -07:00
Julia Reynolds
5766d6e443 Collapse notification advanced settings 
Leave footers visible outside of advanced

Test: visual inspection
Fixes: 77324998
Fixes: 38011858
Change-Id: I2d6fcb832b134bc97081f03a3ab38d593e943f76
 2018-04-20 13:24:45 -04:00
Pavel Grafov
c29b984a98 Pick default notification setting for work profile 
Managed profiles cannot completely hide notifications, so
this setting should be treated as always "true" for them.

Change-Id: I9808c1e9736d83efccb0e947d9097379bda59ebb
Fixes: 78194020
Test: atest RedactionInterstitialTest
 2018-04-20 16:29:37 +01:00
Julia Reynolds
cf326a0375 Merge "Fix crash on rotation" into pi-dev am: 3bdd65e255 
am: 60aa99a95c

Change-Id: I02a301bd9a83491acdf3c76e94a15253a3191e83
 2018-04-20 06:51:54 -07:00
Julia Reynolds
3bdd65e255 Merge "Fix crash on rotation" into pi-dev 2018-04-20 13:30:28 +00:00
Beverly Tai
83cbcbb72a Merge "Can disable checkbox without tint on text" into pi-dev am: 48831c837f 
am: ee3164bd42

Change-Id: I63a71e144fd3b93c2c9b285cd637ba656092fa79
 2018-04-19 10:30:43 -07:00
Beverly Tai
48831c837f Merge "Can disable checkbox without tint on text" into pi-dev 2018-04-19 16:57:05 +00:00
Julia Reynolds
e2897aedf5 Fix crash on rotation 
Load app/channel data early so that any open dialogs can be properly
reconstructed. Never call done on an entityheadercontroller with
an activity that's not yet started.

Test: robotests
Change-Id: Ib2b9f8f1985ef038959062204aaceff686f4ebcf
Fixes: 74114917
 2018-04-19 10:17:23 -04:00
Beverly
49f7f8137f Can disable checkbox without tint on text 
Fixes: 76101594
Test: DisabledCheckBoxPreferenceTest, ZenModeVisEffectPreferenceControllerTest
Change-Id: Ida92c7d94f788404d9cd48f07e779446d9ac0d54
 2018-04-19 09:27:22 -04:00
Julia Reynolds
8aa8f34b36 Expand channel settings if coming from app am: f3290eafce 
am: 520fde650d

Change-Id: I056fa1ed816ec1ef0b898ab18471f5dfe6c9613f
 2018-04-18 12:31:19 -07:00
Julia Reynolds
f3290eafce Expand channel settings if coming from app 
Test: manual inspection
Change-Id: I2ed7f5cc2355f27e0edf36a0d8ee23e418eafd99
Fixes: 77648459
 2018-04-18 12:17:33 -04:00
HJ ChangLiao
c65b1b3cca Convert Blink light to TogglePreferenceController 
Convert Blink light (notification) controller:
PulseNotificationPreferenceController
to TogglePreferenceController for slices

Change-Id: I4c49d2d52a5909b45f1a74518aa925abb14e1336
Fixes: 74923755
Test: make RunSettingsRoboTests
 2018-04-18 02:57:06 +00:00
Beverly
b74e635270 Merge "Get rid of charging sounds toggle" into pi-dev am: adec029f70 
am: cbc6bd837d

Change-Id: Icbbcc62572671aab98a97fb7f28cd4a72a6875ba
 2018-04-17 13:59:34 -07:00
TreeHugger Robot
adec029f70 Merge "Get rid of charging sounds toggle" into pi-dev 2018-04-17 19:13:11 +00:00
Julia Reynolds
7d5f0bb018 Merge "Show suppression msg under ringer slider" into pi-dev am: 68f331d452 
am: 1351e761c8

Change-Id: I71b7a1ce25f3754ef2041419f2ddde33d48fa7e7
 2018-04-17 11:22:04 -07:00
Julia Reynolds
0ddba4c119 Show suppression msg under ringer slider 
Instead of replacing the rigner slider, because the stream
isn't actually muted.

Change-Id: Id2c60d6c570084ed8febcaeb3b096a487f572312
Fixes: 77641315
Test: robotests
 2018-04-17 10:46:47 -04:00
HJ ChangLiao
f3be34e01b Move device detail edit button from menu to header 
Move the edit button on Bluetooth device detail,
From action bar menu to header.
Use EntityHeaderController to add and control,
Rename those method because we use them on
more than one place now.

Change-Id: I3afad6baeab80895c109603e2ab13428582a4dd8
Fixes: 76206922
Test: make RunSettingsRoboTests
 2018-04-17 12:33:01 +08:00
Beverly
fbe721b1b3 Get rid of charging sounds toggle 
Users can no longer toggle on/off the charging sound.

Test: manual
Bug: 77912907
Change-Id: Ie050acab3972cb1fa6716c70afb6403db4d9c887
 2018-04-16 12:35:59 -04:00
Julia Reynolds
2b165aa6ae Merge "Notification summary updates" into pi-dev am: 81c15c05c8 
am: bd9eb14472

Change-Id: I47911d0bb91bc3e00d17c28ca674f7d3c7fcdaa6
 2018-04-12 16:36:46 -07:00
Julia Reynolds
f5d1f165eb Notification summary updates 
- Fix app info summary
- Add configure notifications summary

Test: make -j RunSettingsRoboTests
Change-Id: Ic3c3036ee903fe7403032925a8145693807793d5
Fixes: 77598357
Fixes: 73018368
 2018-04-12 13:49:34 -04:00
Julia Reynolds
84dc27b829 Merge "Add zen onboarding screen" into pi-dev am: 34a593db65 
am: a87381e9a8

Change-Id: Iebe2045ec162ddf2ea28b00913739cb9ecfaaa89
 2018-04-10 08:00:17 -07:00
TreeHugger Robot
34a593db65 Merge "Add zen onboarding screen" into pi-dev 2018-04-10 14:35:44 +00:00
Julia Reynolds
15dcf14191 Merge "Notification settings updates" into pi-dev am: d7a1c39694 
am: 88fa6fd0fb

Change-Id: I5771abecd37d732e11dbf9c7f1c31ac6b7993d6c
 2018-04-10 07:06:39 -07:00
Julia Reynolds
4b8fe09d72 Add zen onboarding screen 
Bug: 77658931
Test: make -j RunSettingsRoboTests
Change-Id: Ifc886148ed742d72b5606a9ce7eb19d0da234c9e
 2018-04-10 08:53:09 -04:00
Julia Reynolds
d7815fe18f Notification settings updates 
- smaller icons
- text update
- fx header
- fix category header

Test: make -j RunSettingsRoboTests

Change-Id: If822d6db31a8dccf20ee88182cda1aee34aa7675
Fixes: 77325154
Fixes: 77323406
Fixes: 77324677
Fixes: 74408368
 2018-04-09 17:24:09 -04:00
Beverly Tai
890283719a Merge "Update DndCondition settings summary" into pi-dev am: 9fc72be6c8 
am: 3153a0e540

Change-Id: I551283fe04d4df1d2dd492c91ec7589e0f94aa12
 2018-04-09 13:18:48 -07:00
Beverly Tai
9fc72be6c8 Merge "Update DndCondition settings summary" into pi-dev 2018-04-09 19:54:24 +00:00
Julia Reynolds
65fe2137d8 Merge "Reorder visual effect fields" into pi-dev am: b90e5aff53 
am: 2b5d069d4b

Change-Id: I1e0eac8dfb3f9dde02c29b540af381e45fb10eec
 2018-04-09 12:18:36 -07:00
TreeHugger Robot
283ac08e86 Merge "GesturesSettingPreferenceController to Toggle" into pi-dev 2018-04-09 18:59:44 +00:00
Beverly
98c63ed1c7 Update DndCondition settings summary 
Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests -j40
Test: atest DndConditionTest
Change-Id: Iff39e9dfda25453bfe4c2554fea3ef7be0832413
Fixes: 77704156
Fixes: 76208187
 2018-04-09 11:05:35 -04:00