Commit Graph

45375 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
yuemingw
3da2118260 Add back up message id for "Action not allowed".
Bug: 78443458
Test: manual
Change-Id: Ib93d8bf767be36323515ecb7cf496a6c234c06fe
2018-05-08 22:41:26 +01:00
Bill Yi
02d2f4b5e0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I60f5a1972ab0788573426988633195b41086d83c
2018-05-08 14:34:25 -07: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
android-build-team Robot
2cc1168d39 Merge "Update Support and Tips setting title." into pi-dev
am: e30007dcc0

Change-Id: I3adf6f5f14d4aaf78054ce429ab7cfd1ff552fd3
2018-05-07 12:15:53 -07:00
android-build-team Robot
e30007dcc0 Merge "Update Support and Tips setting title." into pi-dev 2018-05-07 19:06:27 +00:00
Julia Reynolds
62491a2c82 Merge "DO NOT MERGE DND settings redesign" into pi-dev
am: e9211d58d2

Change-Id: I23dd32b66fa5ba2630af0dec7e20c6e6099ad90a
2018-05-07 11:33:29 -07:00
Christine Franks
c8ba60d90a Merge "Add night display pref controllers and change UX" into pi-dev
am: a1c70443be

Change-Id: Ib43979544865303492c20e25b53d117a044d29c1
2018-05-07 11:30:59 -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
3b0b677194 Update Support and Tips setting title.
- change to Tips and support.

Change-Id: Ie4f7a7cd238686316de52bc8641fde863ea82fe8
Fixes: 79164716
Test: rebuild
2018-05-07 11:04:23 -07:00
timhypeng
2184aaf444 Update string from "Add device" to "Pair new device" in Setting > Connected devices
Bug: 79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I172aa867c85532912a06d52ca773f840d25647ec
2018-05-07 16:30:36 +08:00
Julia Reynolds
4b9f5c10b1 Hide uneccessary dividers
am: 99902e1faf

Change-Id: I6c5746c701dbb9774898d7e7dd32e041bd1eda76
2018-05-04 14:29:45 -07:00
Julia Reynolds
99902e1faf Hide uneccessary dividers
Test: manual
Change-Id: I159732e35b88815458786b180438380b280410ff
Fixes: 79256291
2018-05-04 19:13:21 +00: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
android-build-team Robot
0f1986a863 Merge "Refactor badging notification preference controller." into pi-dev
am: 7309dddaa3

Change-Id: I198931640f8d0f3b59c966e4f7c6d6143ec6597f
2018-05-03 22:25:04 -07: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
ba61b88b62 Merge "Metrics for user choices in storage wizard." into pi-dev
am: 1786dcd4f8

Change-Id: I360d9249d8109ab4733657fe28277c26124066c1
2018-05-03 19:47:45 -07:00
android-build-team Robot
1786dcd4f8 Merge "Metrics for user choices in storage wizard." into pi-dev 2018-05-04 02:32:09 +00:00
android-build-team Robot
da8fd0d757 Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
am: 9b29aeba5a

Change-Id: Iac3969e34aa8375b84ee5048636a3670e0e5c586
2018-05-03 16:40:21 -07:00
android-build-team Robot
9b29aeba5a Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev 2018-05-03 23:15:51 +00:00
Doris Ling
fc5c190795 Update arrow icon for see all apps.
- update the path value for the right arrow icon.

Bug: 79161670
Test: visual
Change-Id: I529315d096c0a4c78d1bd44fd52129f04bb40b72
2018-05-03 14:34:35 -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
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
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
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
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
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