Commit Graph

46722 Commits

Author SHA1 Message Date
android-build-team Robot
21ca611203 Merge "Storage wizard UI tweaks." into pi-dev am: 0e84839f62
am: 9573433b39

Change-Id: I66191238a4bc14cb29b7870cd24aa8589a766375
2018-05-03 11:28:39 -07:00
android-build-team Robot
9573433b39 Merge "Storage wizard UI tweaks." into pi-dev
am: 0e84839f62

Change-Id: I27d42323da5c0bb65620b3c73f78578de8040704
2018-05-03 11:23:08 -07:00
android-build-team Robot
0e84839f62 Merge "Storage wizard UI tweaks." into pi-dev 2018-05-03 18:18:55 +00: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
prochinwang
ae8fdff1af Using plurals to define for min length of string
When a number of min length of a string is singular,
the definition of <plurals> can show a localization with a correct
grammar for singular.

Bug: http://b/78537276
Test: Manual
Change-Id: Ic5d94078f1c80a81a37ff7c11d5d5e106a764bed
2018-05-03 06:35:15 +00: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
43a42e4592 Show the status of private DNS.
am: f249555f97

Change-Id: I1e1ba2929e2251ee067580564ecec82f7f8c7d44
2018-05-02 22:09:27 -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
Android Build Merger (Role)
3d99dc7e7d [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b skipped: 3e48235bf6
Change-Id: Iea466a1bb688d8ff74cbb6cf964fbd7205705960
2018-05-02 22:37:16 +00:00
Android Build Merger (Role)
3e48235bf6 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8 skipped: 8bc91c3b8b
Change-Id: I5beeaa99ef0cafa7ac716dc0745c90855954dc60
2018-05-02 22:37:15 +00:00
Android Build Merger (Role)
8bc91c3b8b [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e skipped: 2d1bae1bd8
Change-Id: Ie0c9a58d5b24ae22fa183f656c2378fa957da7c1
2018-05-02 22:37:13 +00:00
Android Build Merger (Role)
2d1bae1bd8 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313 skipped: ba2ea1e53e
Change-Id: Ie28e68f8334f8e6e74241c25b522bb64a16e3f1b
2018-05-02 22:37:12 +00:00
Android Build Merger (Role)
ba2ea1e53e [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71 skipped: 4a82795313
Change-Id: Ibb7ba4f78bb2ff73ddde61bf4fb57ef2997517b0
2018-05-02 22:37:10 +00:00
Android Build Merger (Role)
4a82795313 [automerger skipped] Merge translations of Bluetooth confirmation text skipped: 3f8d33ff71
Change-Id: I552259236b2aef72e2b50441943e6b413fdd3ab7
2018-05-02 22:37:02 +00:00
Antony Sargent
3f8d33ff71 Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: Id393c4296efef03f38b6e55396c83da9dd9c8b4c
2018-05-02 15:32:36 -07:00
Jeff Sharkey
f6e47386b1 Metrics for user choices in storage wizard.
These metrics help us understand more about how users in the field
are interacting with adoptable storage.

Bug: 37284068
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I2bb9b5b3683c6ed080233aa595c2626685384923
2018-05-02 16:14:37 -06:00
Antony Sargent
7d505aefa5 Merge translations of Bluetooth confirmation text
This is a manual merge of the translated strings from the master branch
of the 'bluetooth_pairing_shares_phonebook' string. The fix for this bug
requires these translations because the fix was to slightly reword the
confirmation text in the pairing dialog and stop substituting in the
device name.

Bug: 62672248
Test: manual
Change-Id: Ia386cc2d98de086ed545e4fe6d41be20e9c24dc4
2018-05-02 14:07:34 -07:00
Jeff Sharkey
ccabf4ed71 Storage wizard UI tweaks.
Updated assets from UX, and shift to "GlifV3" to get the latest
theme styles.  Verified visually.

Bug: 77469852
Test: atest com.android.settings.ui.StorageWizardTest
Change-Id: I5bf84e6649577b0c5c874f129fbd1d71c53356e2
2018-05-02 15:03:23 -06: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
android-build-team Robot
c7174ce384 Merge "Import translations. DO NOT MERGE" 2018-05-02 18:04:48 +00:00
Yueming Wang
0cc7e38722 [automerger skipped] Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev am: 4c89530ff2
am: 5221bbab26  -s ours

Change-Id: I198fb14f3d66fa1a36bf90857ae6e0183ba2c163
2018-05-02 08:15:05 -07:00
Yueming Wang
5221bbab26 Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev
am: 4c89530ff2

Change-Id: Idda9afd69aae7eec7c00872be1ad8510409416df
2018-05-02 08:10:30 -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
70d624813c [automerger skipped] Merge "DO NOT MERGE Update onboarding" into pi-dev am: d521588510
am: cb2bd69789  -s ours

Change-Id: I87a2b801987b601a22b9588602dcc1d703eef2d8
2018-05-02 06:56:41 -07:00
Eran Messeri
85a8a70594 [automerger skipped] Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev am: a6d36c4e2e
am: b7c83db4fb  -s ours

Change-Id: I3d968f8f600f8d9fae356b16dd0b58b8f003c32d
2018-05-02 06:55:42 -07:00
Julia Reynolds
cb2bd69789 Merge "DO NOT MERGE Update onboarding" into pi-dev
am: d521588510

Change-Id: Ibd40108722683e048cc841f2e4a5352bb412cf8d
2018-05-02 06:53:05 -07:00
Eran Messeri
b7c83db4fb Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev
am: a6d36c4e2e

Change-Id: I8b55406992369ecec72172d0a2620e6b42093d16
2018-05-02 06:51:41 -07: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
7ca868bfda Revert policy transparency dialog title to "Action not allowed".
Bug: 78443458
Test: manually by TestDpc.
Change-Id: Ie4a4b6cacb61d7d1a328d67bcf780040efc23ccd
2018-05-02 13:38:19 +01: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
07ec1d47df [automerger skipped] Remove the gear icon and change tapping event am: 8dcd550d36
am: fb5b43d7c8  -s ours

Change-Id: I0f4e70b10e789e9aa893f4df71609730ecb0fdb2
2018-05-02 00:28:08 -07:00
hughchen
fb5b43d7c8 Remove the gear icon and change tapping event
am: 8dcd550d36

Change-Id: I404d9abb5338785c74c0587e838f4bce9594c228
2018-05-02 00:20:53 -07: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
Bill Yi
bc58a9ad53 Import translations. DO NOT MERGE
Change-Id: Ic54f94e9a80d85c1264d5aa3da5e4b7dfa861e72
Auto-generated-cl: translation import
2018-05-01 22:27:03 -07: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
android-build-team Robot
7c45f59478 Merge "Update cellular data condition icon and padding." into pi-dev am: 1a38390728
am: 8907b93d07

Change-Id: I1f6c63ad8c8d3a3d020a7ece8fd540ac77427650
2018-05-01 17:24:43 -07:00
android-build-team Robot
8907b93d07 Merge "Update cellular data condition icon and padding." into pi-dev
am: 1a38390728

Change-Id: I2372af3d9e40cf3d0d4bcc1f13dffe6d856af18f
2018-05-01 17:17:41 -07:00
android-build-team Robot
1a38390728 Merge "Update cellular data condition icon and padding." into pi-dev 2018-05-02 00:08:11 +00: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
f22e98e7c7 Merge "Workaround task-resolution bug in AM" into pi-dev
am: bb5a46fabd

Change-Id: Ie3def1978876a5429dc6888de69c2b7c51ed0faa
2018-05-01 16:16:52 -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
Fan Zhang
2b9f8c96d1 Update cellular data condition icon and padding.
Change-Id: I01fcdcc09a81758eb12e898aea5d64fa1dc6ef06
Fixes: 79090390
Test: visual
2018-05-01 15:27:01 -07: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