Commit Graph

5788 Commits

Author SHA1 Message Date
Matthew Fritze
c301964167 Prevent crashes on null intent in Slice Builder
Change-Id: Ia429dd00fce785bc9d23ac8cf15f6855d7fca7c2
Fixes: 79147458
Test: Robotests
2018-05-08 15:37:42 -07:00
android-build-team Robot
714b15cbdf Merge "Use ListFormatter to join strings" 2018-05-08 20:20:28 +00:00
hughchen
f431088f9d Change the title when in call/media state
* For fix the "Automatic merge failed" in pi-dev, cherry pick the ag/3909960 in
  master. Change android.support.* to androidx.*
* Change the title when in call/media state.
  Example: call state show "Available call devices"
           media state show "Available media devices"
* Use isAudioModeOngoingCall() utility function for checking if it is in call status
* Add register test to verify when in onStart() and onStop()
  the BluetoothCallback can be register and unregister.
* Add title string test to verify when in call or media state,
  the title can be changed to corresponding string

Bug: 78150641
Test: make -j40 RunSettingsRoboTests
Change-Id: I6be72cf0cae75525084ac3c5be8524c709f51f7d
2018-05-08 17:14:59 +08:00
Lei Yu
162c81e1d5 Fix crash in anomaly job service
If job has been stopped by any reason, we should cancel the background
thread, otherwise it will throw SecurityException when dequeuing from
JobParams.

This CL adds a lock to synchronize the method and stops dequeue work
if job has been canceled.

Change-Id: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Merged-In: I7732b7f7d444a55a4b4ba6645cd2c16b6f840a6c
Fixes: 77968649
Test: RunSettingsRoboTests
2018-05-07 15:19:28 -07:00
Salvador Martinez
d86cbe36b0 Hide hidden network spinner for non-hidden networks
We only want to show this when a user is manually adding a
network. This CL hides it when the user is adding a network
from the detected wifi list.

Test: robotests
Bug: 78436456
Change-Id: I81d738267d4cb21d6b7722ec619faaf8ef1fc965
2018-05-07 14:46:56 -07:00
Julia Reynolds
e9211d58d2 Merge "DO NOT MERGE DND settings redesign" into pi-dev 2018-05-07 18:25:52 +00:00
Christine Franks
a1c70443be Merge "Add night display pref controllers and change UX" into pi-dev 2018-05-07 18:20:25 +00:00
Doris Ling
1e9a979edd Fix improper dismiss of suggestion.
- when handling dismiss of suggestion card, need to check if the
dismissed suggestion can actually be removed from the current
suggestion list before trying to refresh the list.

Change-Id: Ia07b4cb76ef6c61a7d27184c3cba9d99fcc90bb3
Fixes: 76094746
Test: RunSettingsRoboTests
2018-05-04 12:29:20 -07:00
Julia Reynolds
cb6fe394d0 DO NOT MERGE DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug: 78447976
2018-05-04 14:45:43 -04:00
Christine Franks
77df09244e Add night display pref controllers and change UX
- Convert NightDisplaySettings to a DashboardFragment
- Add preference controllers for all Night Display settings
- Change UX for activation from a toggle to a button

Bug: 73739388
Bug: 69912911
Test: make -j100 and make RunSettingsRoboTests -j100
Change-Id: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
Merged-In: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
2018-05-04 09:35:29 -07:00
pastychang
aea3e0b205 Show Option of "Screen lock options" on SUW pattern screen page
Add more check for stages of Patern input. Make sure that button "Screen lock options" is visiable.

Test: atest SetupChooseLockPatternTest
Bug: 76431549
Change-Id: Iec7d0eb4a3c16ebd2a504fbbc6de465c341ca43a
2018-05-04 17:31:41 +08:00
android-build-team Robot
7309dddaa3 Merge "Refactor badging notification preference controller." into pi-dev 2018-05-04 05:18:34 +00:00
android-build-team Robot
23474e93f1 Merge "Refactor badging notification preference controller." 2018-05-04 04:17:09 +00:00
Doris Ling
4db6f3dfb5 Fix line break in Opening links app list summary.
- the installed app list is using the app preference layout, which has
the appendix field to the right of the app title and summary. The
appendix and title/summary each has weight 1 to take up half of the
screen width. However, the appendix field is not used in the Opening
links page at all, so that field should be set to GONE to let the
title/summary takes up the whole available width.

Change-Id: Ia066a60dcd0a4c1d8562bd47e173378b49912d18
Fixes: 77954267
Test: visual and make RunSettingsRoboTests
2018-05-03 15:43:58 -07:00
Christine Franks
a9565419b3 Merge "Add night display pref controllers and change UX" 2018-05-03 15:37:37 +00:00
Julia Reynolds
c196a69129 Merge "Update onboarding" 2018-05-03 14:09:33 +00:00
Julia Reynolds
6eabafeacd Update onboarding
Change text and add 'repeat callers'

Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes: 78448988
2018-05-03 13:10:15 +00:00
Chuck Liao
a7c14d474a Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
Merged-In: If10744c067f065e7c2465ca1fff66895d7dc1c56
2018-05-03 09:35:18 +00:00
Chuck Liao
6f4d440414 Refactor badging notification preference controller.
- Convert inheritance from AbstractPreferenceController to TogglePreferenceController.
- Register BadgingNotificationPreferenceController in XML.
- Add RoboTests test cases for BadgingNotificationPreferenceController.

Fixes: 67997784
Test: RunSettingsRoboTests
Change-Id: If10744c067f065e7c2465ca1fff66895d7dc1c56
2018-05-03 16:50:12 +08:00
Chalard Jean
0e8e89f576 Show the status of private DNS. am: f249555f97
am: 43a42e4592

Change-Id: I7ba6ec19ab4f373d6d78609f5a8a6bd76749ead7
2018-05-02 22:13:37 -07:00
Chalard Jean
f249555f97 Show the status of private DNS.
This works as follows :
Off → "Off"
Opportunistic, inactive → "Automatic"
Opportunistic, active → "On"
  (stealing a string from notifications for this)
Strict, not resolved and/or not validated → "Couldn't connect"
Strict, resolved and validated → Set up hostname

Bug: 73641539
Test: manual, and updated tests pass
Change-Id: Id1132467288d51aa9cb81a04db65dee438ddfad9
2018-05-03 05:04:47 +00:00
Christine Franks
d67ec89c4b Add night display pref controllers and change UX
- Convert NightDisplaySettings to a DashboardFragment
- Add preference controllers for all Night Display settings
- Change UX for activation from a toggle to a button

Bug: 73739388
Bug: 69912911
Test: make -j100 and make RunSettingsRoboTests -j100
Change-Id: Ia173f16207ba59bf57eb7546cbb1e2dbca67b063
2018-05-02 13:12:26 -07:00
Yueming Wang
4c89530ff2 Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev 2018-05-02 14:58:47 +00:00
Julia Reynolds
d521588510 Merge "DO NOT MERGE Update onboarding" into pi-dev 2018-05-02 13:46:17 +00:00
Eran Messeri
a6d36c4e2e Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev 2018-05-02 13:44:48 +00:00
yuemingw
01816f4cbb Policy transparency dialog should be shown when SwitchBar is restricted.
After ag/3818911, touch event of Switchbar is delegated to the switch.
When the SwithBar is disabled by admin, switch is GONE and restricted icon
is VISIBLE instead. We should let touch event be delegaed to restricted
icon and show policy transparency dialog when it's clicked in this case.

Bug: 77898233
Bug: 70206452
Test: Manually via setting disallow_share_location in TestDPC.

Merged-In: Ifa4fa6ebbe7986277f5cd0951a399ea2377a39f9

Change-Id: If4a5349134e6f0e064561b4860966f950ce423b3
2018-05-02 13:38:12 +01:00
Julia Reynolds
16bafbbc74 DO NOT MERGE Update onboarding
Change text and add 'repeat callers'

Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes: 78448988
2018-05-02 12:28:33 +00:00
yuemingw
69fa9e0d49 Policy transparency dialog should be shown when SwitchBar is restricted.
After ag/3818911, touch event of Switchbar is delegated to the switch.
When the SwithBar is disabled by admin, switch is GONE and restricted icon
is VISIBLE instead. We should let touch event be delegaed to restricted
icon and show policy transparency dialog when it's clicked in this case.

Cherry-picked from ag/3924516.

Bug: 77898233
Bug: 70206452
Test: Manually via setting disallow_share_location in TestDPC.

Change-Id: Ifa4fa6ebbe7986277f5cd0951a399ea2377a39f9
2018-05-02 09:40:21 +00:00
hughchen
8dcd550d36 Remove the gear icon and change tapping event
* Remove the gear icon in "currently connected" section.
* Change the tapping event in "currently connected" section.
  When tapping device in this section, take user to device detail page.

Bug: 78490845
Test: make -j40 RunSettingsRoboTests
Change-Id: I25f8455def3c38e24dea9af9e9e29ba37c250f67
Merged-In: I25f8455def3c38e24dea9af9e9e29ba37c250f67
2018-05-02 07:15:35 +00:00
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
Eran Messeri
f61ccf3fa3 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
Merged-In: Id168911b082fffac193cd7c7a658ab92d6ce2c15
Change-Id: I0a3a4ec4dda78e28ee88a11d383eda49e9cf50a6
2018-05-01 21:55:56 +01: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
Doris Ling
61909b5af1 Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev am: 5ddff9371d
am: 674fec7f3c

Change-Id: I0c9610bb467a9443480def643bb96135478473e5
2018-05-01 13:10:23 -07:00
Doris Ling
5ddff9371d Merge "Fix crash in ExternalSourceDetailPreferenceController." into pi-dev 2018-05-01 19:58:56 +00:00
Fan Zhang
10b4bc01f1 Merge "Add a test to verify lifecycle events are triggered" into pi-dev am: 139ebd91c0
am: cd3e50d4a5

Change-Id: I01d49c423c5ef56d59a51a2f03b4f11d956e19bc
2018-05-01 12:33:06 -07:00
Fan Zhang
139ebd91c0 Merge "Add a test to verify lifecycle events are triggered" into pi-dev 2018-05-01 19:04:44 +00: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
29ba3601b0 Update zen onboarding ui
Test: robotests
Bug: 78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
2018-05-01 15:11:03 +00:00
android-build-team Robot
d3ff522a0b Merge "Fix a NPE where developer options page crash sometimes." into pi-dev am: d940a680a5
am: aee1191c72

Change-Id: Iac0d2a8551d9c1ba230890dadb1bdf2b6edb12b9
2018-04-30 20:51:39 -07:00
android-build-team Robot
6451b7b91b Merge "Migrate PaymentSettings to DashboardFragment" 2018-05-01 01:37:34 +00:00
Fan Zhang
1f1c7042f5 Add a test to verify lifecycle events are triggered
- Added a footer in feature flags, displaying "Experimental" during
  onStart.
- Ui test to verify the text shows correctly.

Change-Id: Ibf4f79cb3c12e460384e83201a16005a18d6437d
Fixes: 78887450
Test: atest
2018-05-01 01:32:49 +00:00
Doris Ling
c3e4619af1 Fix crash in ExternalSourceDetailPreferenceController.
- Add null check for the package info when trying to retrieve the
install app state. During package update, the package info might becomes
null. The App info activity will finish in that case, but this method
might be called before the activity actually finishes.

Change-Id: I18ff448666dfb403bb6693fccd3e54276db36f37
Fixes: 78257414
Test: make RunSettingsRoboTests
2018-04-30 17:38:29 -07:00
chiujason
ff244c0e40 Migrate PaymentSettings to DashboardFragment
- Move preference related logic to controllers.
- Add some test cases for controllers.

Test: manual
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.nfc
      make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.core
      atest SettingsGatewayTest UniquePreferenceTest
Change-Id: I061a194c170f63fab51974f26c24be43d67d6f6f
2018-04-30 17:24:58 -07:00
Fan Zhang
ecadd0119d Fix a NPE where developer options page crash sometimes.
Developer options page crash for restricted users because the page
removes all preferences while DashboardFeatureProvider tries to
manipulate preferences on screen.

Added a null check to skip changin prefs in DashboardFeatureProvider
because the pref is going to be removed either way.

Change-Id: Ic83fd0dfb2a906605fb1d992d7b36c2163630e89
Fixes: 78655710
Test: robotests
2018-04-30 16:54:10 -07:00
android-build-team Robot
bd825f408b Merge "Fix NPE during unit test" 2018-04-30 23:44:27 +00:00
Fan Zhang
16de45d8ec Fix NPE during unit test
As of ag/3932176 the slice indexer now queries getSummary() for each
controller. So we need to create all necessary objects before
getSummary(). In this case, the PSCD object.

Change-Id: I0162996be37d740f1e450880bf4698acd94ca0ad
Fixes: 78897071
Test: atest
2018-04-30 15:17:22 -07:00
Fan Zhang
7987ccfffd Reset development tile values when turning off dev option.
Change-Id: Ib2e8ea3bfcffca5b2ee3d0ebd3c0c524239d2145
Fixes: 78654641
Test: robotest
2018-04-30 20:27:52 +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
android-build-team Robot
167612df0e Merge "Migrate ChooseAccountActivity to DashboardFragment" 2018-04-28 06:10:25 +00:00
Emily Chuang
b279b1c025 Migrate ChooseAccountActivity to DashboardFragment
- Build a controller to generate/manage a list of preferences.
- Move some logics to the controller and add tests.
- Rename to ChooseAccountFragment.

Bug: 73899467
Test: make RunSettingsRoboTests -j
      atest UniquePreferenceTest SettingsGatewayTest
Change-Id: Id2906c4b922ef159d08c803b976671264c54665f
2018-04-27 22:17:23 -07:00