OSDN Git Service
android-build-team Robot [Wed, 9 May 2018 04:09:12 +0000 (21:09 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am:
9a1d318b37 -s ours
am:
09df358bd8 -s ours
Change-Id: Iaa228298b45bc1686cc07faa22c65e0062d8d25d
android-build-team Robot [Wed, 9 May 2018 04:04:42 +0000 (21:04 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
am:
9a1d318b37 -s ours
Change-Id: Ie5f9d8b1e7883d2e523a8481616bcb24c3dd9b40
android-build-team Robot [Wed, 9 May 2018 03:56:40 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE"
android-build-team Robot [Wed, 9 May 2018 03:56:36 +0000 (03:56 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Hugh Chen [Wed, 9 May 2018 03:14:16 +0000 (20:14 -0700)]
[automerger skipped] Merge "Change the title when in call/media state" into pi-dev am:
32adc82c8a
am:
44526c44ca -s ours
Change-Id: I464549ce35281bcb57e15fddacf2d21ee83b1d66
Hugh Chen [Wed, 9 May 2018 03:09:49 +0000 (20:09 -0700)]
Merge "Change the title when in call/media state" into pi-dev
am:
32adc82c8a
Change-Id: I9f066891464c55fb88ddd95b4f669c3f4e82ebbd
Hugh Chen [Wed, 9 May 2018 03:06:04 +0000 (03:06 +0000)]
Merge "Change the title when in call/media state" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:51:43 +0000 (19:51 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev am:
f4dd526f70
am:
3f40c15294
Change-Id: I169db327d5e07732e45164510244f320787339b0
android-build-team Robot [Wed, 9 May 2018 02:46:35 +0000 (19:46 -0700)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
am:
f4dd526f70
Change-Id: Iac7db28e7b22f49280e09974a73310061fb01afd
android-build-team Robot [Wed, 9 May 2018 02:36:26 +0000 (02:36 +0000)]
Merge "Update string from "Add device" to "Pair new device" in Setting > Connected devices" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:32:29 +0000 (19:32 -0700)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev am:
69fce6df71
am:
46dd838e8d
Change-Id: I2048cd12599e9d2ad115f2e6b1a6371feb2e72ae
android-build-team Robot [Wed, 9 May 2018 02:28:29 +0000 (19:28 -0700)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
am:
69fce6df71
Change-Id: I9a7e5a5531a81513fb7a0721d04a419cfe957295
android-build-team Robot [Wed, 9 May 2018 02:23:39 +0000 (19:23 -0700)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev am:
af7d41978c
am:
94907ce4c7
Change-Id: Ieb165e0f0be927f92846bbbce3328576d8a4a1e5
android-build-team Robot [Wed, 9 May 2018 02:22:17 +0000 (02:22 +0000)]
Merge "Prevent crashes on null intent in Slice Builder" into pi-dev
android-build-team Robot [Wed, 9 May 2018 02:15:41 +0000 (19:15 -0700)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
am:
af7d41978c
Change-Id: Iff2cc5c284add3017d307ced73b71fe101f13ecc
hughchen [Tue, 17 Apr 2018 08:36:58 +0000 (16:36 +0800)]
Change the title when in call/media state
* 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
Merged-In: I6be72cf0cae75525084ac3c5be8524c709f51f7d
android-build-team Robot [Wed, 9 May 2018 02:03:03 +0000 (02:03 +0000)]
Merge "Stop logging tether password in logcat & metrics provider" into pi-dev
Hugh Chen [Wed, 9 May 2018 01:43:53 +0000 (01:43 +0000)]
Merge "Change the title when in call/media state"
android-build-team Robot [Wed, 9 May 2018 00:57:04 +0000 (17:57 -0700)]
Merge "Update strings for summary tip." into pi-dev am:
0e7cff80ef
am:
171ec14458
Change-Id: I564c2f2099bfba4ba9a8327d7b426365bb4f7bd9
android-build-team Robot [Wed, 9 May 2018 00:53:01 +0000 (17:53 -0700)]
Merge "Update strings for summary tip." into pi-dev
am:
0e7cff80ef
Change-Id: I4c891ea16e4fed831998cf609a5d5d2418528856
Doris Ling [Wed, 9 May 2018 00:48:31 +0000 (17:48 -0700)]
Merge "Update arrow icon for see all apps." into pi-dev am:
6bc31d343e
am:
2f2d676897
Change-Id: Ibd0dd41ba169c057cc0af2357018d55e06d03bc9
android-build-team Robot [Wed, 9 May 2018 00:44:18 +0000 (00:44 +0000)]
Merge "Update strings for summary tip." into pi-dev
Doris Ling [Wed, 9 May 2018 00:39:13 +0000 (17:39 -0700)]
Merge "Update arrow icon for see all apps." into pi-dev
am:
6bc31d343e
Change-Id: I56e43f5fc4d4647aaa695bc071141fe7dcb80107
Doris Ling [Wed, 9 May 2018 00:30:59 +0000 (00:30 +0000)]
Merge "Update arrow icon for see all apps." into pi-dev
Fan Zhang [Tue, 8 May 2018 23:29:39 +0000 (16:29 -0700)]
Stop logging tether password in logcat & metrics provider
Change-Id: I7aaaf3148445bfb6c556ab37c6577da67dc94cbb
Fixes:
79419591
Test: adb logcat -b events | egrep "(sysui_|notification_)"
android-build-team Robot [Tue, 8 May 2018 23:27:38 +0000 (16:27 -0700)]
Merge "Add back up message id for "Action not allowed"." into pi-dev am:
c0edff7ffd
am:
4b118a3788
Change-Id: I29355e24dad7179c5cf430e860f6176cddcf42df
Lei Yu [Tue, 8 May 2018 23:22:19 +0000 (16:22 -0700)]
[automerger skipped] Merge "Fix crash in anomaly job service" into pi-dev am:
db5c1cef71
am:
d932e04ccd -s ours
Change-Id: Ia949a5dcd8fb506672705042bda7f96a47cc2499
android-build-team Robot [Tue, 8 May 2018 23:10:34 +0000 (16:10 -0700)]
Merge "Add back up message id for "Action not allowed"." into pi-dev
am:
c0edff7ffd
Change-Id: I4bfd6e2439ceafb5ed4567c6ead21c7ba8ead5e9
Lei Yu [Tue, 8 May 2018 23:09:48 +0000 (16:09 -0700)]
Merge "Fix crash in anomaly job service" into pi-dev
am:
db5c1cef71
Change-Id: If2946b45ba2e7fe22f5cbd24fabfeb5ef1e4ee7d
android-build-team Robot [Tue, 8 May 2018 22:53:45 +0000 (22:53 +0000)]
Merge "Add back up message id for "Action not allowed"." into pi-dev
Lei Yu [Tue, 8 May 2018 22:52:59 +0000 (22:52 +0000)]
Merge "Fix crash in anomaly job service" into pi-dev
Lei Yu [Tue, 8 May 2018 20:06:42 +0000 (13:06 -0700)]
Update strings for summary tip.
1. Strings for the tip preference
2. Strings for the tip dialog
Change-Id: I59c371328ec735a0b22f707d440f3be85cf59c77
Fixes:
79171948
Test: Manual & RunSettingsRoboTests
Matthew Fritze [Tue, 8 May 2018 21:56:00 +0000 (14:56 -0700)]
Prevent crashes on null intent in Slice Builder
Change-Id: Ia429dd00fce785bc9d23ac8cf15f6855d7fca7c2
Fixes:
79147458
Test: Robotests
android-build-team Robot [Tue, 8 May 2018 21:52:51 +0000 (21:52 +0000)]
Merge "Remove demo-specific Developer Options logic"
yuemingw [Tue, 8 May 2018 21:41:26 +0000 (22:41 +0100)]
Add back up message id for "Action not allowed".
Bug:
78443458
Test: manual
Change-Id: Ib93d8bf767be36323515ecb7cf496a6c234c06fe
Bill Yi [Tue, 8 May 2018 21:34:25 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60f5a1972ab0788573426988633195b41086d83c
Bill Yi [Tue, 8 May 2018 20:55:11 +0000 (13:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie8955e994d1560cc56f6d3d077b4fdc48d36fba0
Auto-generated-cl: translation import
android-build-team Robot [Tue, 8 May 2018 20:20:28 +0000 (20:20 +0000)]
Merge "Use ListFormatter to join strings"
Christine Franks [Mon, 23 Apr 2018 18:19:57 +0000 (11:19 -0700)]
Remove demo-specific Developer Options logic
Bug:
78654980
Test: make RunSettingsRoboTests
Change-Id: Ia0f3c10a6c73b3067a9f476af6e982e3ca60a46b
hughchen [Tue, 17 Apr 2018 08:36:58 +0000 (16:36 +0800)]
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
Lei Yu [Thu, 12 Apr 2018 23:44:45 +0000 (16:44 -0700)]
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
android-build-team Robot [Mon, 7 May 2018 19:20:56 +0000 (12:20 -0700)]
Merge "Update Support and Tips setting title." into pi-dev am:
e30007dcc0
am:
2cc1168d39
Change-Id: I9eeb3e34b88a9ff4fba7cda514d4f3f2f0dceafa
android-build-team Robot [Mon, 7 May 2018 19:15:53 +0000 (12:15 -0700)]
Merge "Update Support and Tips setting title." into pi-dev
am:
e30007dcc0
Change-Id: I3adf6f5f14d4aaf78054ce429ab7cfd1ff552fd3
android-build-team Robot [Mon, 7 May 2018 19:06:27 +0000 (19:06 +0000)]
Merge "Update Support and Tips setting title." into pi-dev
Julia Reynolds [Mon, 7 May 2018 18:40:24 +0000 (11:40 -0700)]
[automerger skipped] Merge "DO NOT MERGE DND settings redesign" into pi-dev am:
e9211d58d2
am:
62491a2c82 -s ours
Change-Id: I5edc0cc8e20b3ef0693cee35cad2be74826d6d75
Christine Franks [Mon, 7 May 2018 18:38:19 +0000 (11:38 -0700)]
[automerger skipped] Merge "Add night display pref controllers and change UX" into pi-dev am:
a1c70443be
am:
c8ba60d90a -s ours
Change-Id: I0430c58aa7d682a7d8b89e1e361e2c8e5b07ae4b
Julia Reynolds [Mon, 7 May 2018 18:33:29 +0000 (11:33 -0700)]
Merge "DO NOT MERGE DND settings redesign" into pi-dev
am:
e9211d58d2
Change-Id: I23dd32b66fa5ba2630af0dec7e20c6e6099ad90a
Christine Franks [Mon, 7 May 2018 18:30:59 +0000 (11:30 -0700)]
Merge "Add night display pref controllers and change UX" into pi-dev
am:
a1c70443be
Change-Id: Ib43979544865303492c20e25b53d117a044d29c1
Julia Reynolds [Mon, 7 May 2018 18:25:52 +0000 (18:25 +0000)]
Merge "DO NOT MERGE DND settings redesign" into pi-dev
Christine Franks [Mon, 7 May 2018 18:20:25 +0000 (18:20 +0000)]
Merge "Add night display pref controllers and change UX" into pi-dev
Doris Ling [Thu, 3 May 2018 22:18:37 +0000 (15:18 -0700)]
Update Support and Tips setting title.
- change to Tips and support.
Change-Id: Ie4f7a7cd238686316de52bc8641fde863ea82fe8
Fixes:
79164716
Test: rebuild
timhypeng [Mon, 7 May 2018 08:30:36 +0000 (16:30 +0800)]
Update string from "Add device" to "Pair new device" in Setting > Connected devices
Bug:
79298886
Test: make -j50 RunSettingsRoboTests
Change-Id: I172aa867c85532912a06d52ca773f840d25647ec
Julia Reynolds [Fri, 4 May 2018 21:40:00 +0000 (14:40 -0700)]
Hide uneccessary dividers am:
99902e1faf
am:
4b9f5c10b1
Change-Id: Icd85a3d4deefe3d48f5fe7699be4d22615722228
Julia Reynolds [Fri, 4 May 2018 21:29:45 +0000 (14:29 -0700)]
Hide uneccessary dividers
am:
99902e1faf
Change-Id: I6c5746c701dbb9774898d7e7dd32e041bd1eda76
Doris Ling [Fri, 4 May 2018 18:09:34 +0000 (11:09 -0700)]
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
Julia Reynolds [Fri, 4 May 2018 19:04:55 +0000 (15:04 -0400)]
Hide uneccessary dividers
Test: manual
Change-Id: I159732e35b88815458786b180438380b280410ff
Fixes:
79256291
Julia Reynolds [Fri, 4 May 2018 12:54:53 +0000 (08:54 -0400)]
DO NOT MERGE DND settings redesign
Test: robotests
Change-Id: I7b980218feea28e945994c8b7f8a934df6bc11f9
Bug:
78447976
Christine Franks [Fri, 16 Mar 2018 23:33:18 +0000 (16:33 -0700)]
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
android-build-team Robot [Fri, 4 May 2018 05:29:05 +0000 (22:29 -0700)]
[automerger skipped] Merge "Refactor badging notification preference controller." into pi-dev am:
7309dddaa3
am:
0f1986a863 -s ours
Change-Id: I63bcd96df54f610b34f78a3ada639e36b0f97677
android-build-team Robot [Fri, 4 May 2018 05:25:04 +0000 (22:25 -0700)]
Merge "Refactor badging notification preference controller." into pi-dev
am:
7309dddaa3
Change-Id: I198931640f8d0f3b59c966e4f7c6d6143ec6597f
android-build-team Robot [Fri, 4 May 2018 05:18:34 +0000 (05:18 +0000)]
Merge "Refactor badging notification preference controller." into pi-dev
android-build-team Robot [Fri, 4 May 2018 04:17:09 +0000 (04:17 +0000)]
Merge "Refactor badging notification preference controller."
android-build-team Robot [Fri, 4 May 2018 02:59:22 +0000 (19:59 -0700)]
Merge "Metrics for user choices in storage wizard." into pi-dev am:
1786dcd4f8
am:
ba61b88b62
Change-Id: I6c2e47e3142a6132f066854500b3a32252233574
android-build-team Robot [Fri, 4 May 2018 02:47:45 +0000 (19:47 -0700)]
Merge "Metrics for user choices in storage wizard." into pi-dev
am:
1786dcd4f8
Change-Id: I360d9249d8109ab4733657fe28277c26124066c1
android-build-team Robot [Fri, 4 May 2018 02:32:09 +0000 (02:32 +0000)]
Merge "Metrics for user choices in storage wizard." into pi-dev
android-build-team Robot [Fri, 4 May 2018 02:12:49 +0000 (02:12 +0000)]
Merge "Fix line break in Opening links app list summary."
android-build-team Robot [Fri, 4 May 2018 00:26:55 +0000 (17:26 -0700)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev am:
9b29aeba5a
am:
da8fd0d757
Change-Id: I4accda37f334988c561d0801acef145e513c951c
android-build-team Robot [Thu, 3 May 2018 23:40:21 +0000 (16:40 -0700)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
am:
9b29aeba5a
Change-Id: Iac3969e34aa8375b84ee5048636a3670e0e5c586
android-build-team Robot [Thu, 3 May 2018 23:15:51 +0000 (23:15 +0000)]
Merge "Revert policy transparency dialog title to "Action not allowed"." into pi-dev
Doris Ling [Thu, 3 May 2018 22:43:58 +0000 (15:43 -0700)]
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
Doris Ling [Thu, 3 May 2018 22:06:04 +0000 (15:06 -0700)]
Fix condition title not fully shown in biggest font.
- update the title height to be wrapped-content so that the height will
increase accordingly if the font size is very large.
Change-Id: I293eeba72414b3cfa004889ed39ec274fb70066d
Fixes:
78525649
Test: visual
Doris Ling [Thu, 3 May 2018 20:09:05 +0000 (13:09 -0700)]
Update arrow icon for see all apps.
- update the path value for the right arrow icon.
Bug:
79161670
Test: visual
Change-Id: I529315d096c0a4c78d1bd44fd52129f04bb40b72
android-build-team Robot [Thu, 3 May 2018 18:28:39 +0000 (11:28 -0700)]
Merge "Storage wizard UI tweaks." into pi-dev am:
0e84839f62
am:
9573433b39
Change-Id: I66191238a4bc14cb29b7870cd24aa8589a766375
android-build-team Robot [Thu, 3 May 2018 18:23:08 +0000 (11:23 -0700)]
Merge "Storage wizard UI tweaks." into pi-dev
am:
0e84839f62
Change-Id: I27d42323da5c0bb65620b3c73f78578de8040704
android-build-team Robot [Thu, 3 May 2018 18:18:55 +0000 (18:18 +0000)]
Merge "Storage wizard UI tweaks." into pi-dev
Christine Franks [Thu, 3 May 2018 15:37:37 +0000 (15:37 +0000)]
Merge "Add night display pref controllers and change UX"
Julia Reynolds [Thu, 3 May 2018 14:09:33 +0000 (14:09 +0000)]
Merge "Update onboarding"
Julia Reynolds [Tue, 1 May 2018 20:57:50 +0000 (16:57 -0400)]
Update onboarding
Change text and add 'repeat callers'
Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes:
78448988
Chuck Liao [Fri, 30 Mar 2018 10:41:18 +0000 (18:41 +0800)]
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
Chuck Liao [Fri, 30 Mar 2018 10:41:18 +0000 (18:41 +0800)]
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
prochinwang [Mon, 30 Apr 2018 07:03:41 +0000 (15:03 +0800)]
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
Chalard Jean [Thu, 3 May 2018 05:13:37 +0000 (22:13 -0700)]
Show the status of private DNS. am:
f249555f97
am:
43a42e4592
Change-Id: I7ba6ec19ab4f373d6d78609f5a8a6bd76749ead7
Chalard Jean [Thu, 3 May 2018 05:09:27 +0000 (22:09 -0700)]
Show the status of private DNS.
am:
f249555f97
Change-Id: I1e1ba2929e2251ee067580564ecec82f7f8c7d44
Chalard Jean [Thu, 19 Apr 2018 09:23:49 +0000 (18:23 +0900)]
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
Jeff Sharkey [Wed, 2 May 2018 22:12:05 +0000 (16:12 -0600)]
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
Jeff Sharkey [Tue, 1 May 2018 20:53:25 +0000 (14:53 -0600)]
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
Christine Franks [Fri, 16 Mar 2018 23:33:18 +0000 (16:33 -0700)]
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
android-build-team Robot [Wed, 2 May 2018 18:04:48 +0000 (18:04 +0000)]
Merge "Import translations. DO NOT MERGE"
Yueming Wang [Wed, 2 May 2018 15:15:05 +0000 (08:15 -0700)]
[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
Yueming Wang [Wed, 2 May 2018 15:10:30 +0000 (08:10 -0700)]
Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev
am:
4c89530ff2
Change-Id: Idda9afd69aae7eec7c00872be1ad8510409416df
Yueming Wang [Wed, 2 May 2018 14:58:47 +0000 (14:58 +0000)]
Merge "Policy transparency dialog should be shown when SwitchBar is restricted." into pi-dev
Julia Reynolds [Wed, 2 May 2018 13:56:41 +0000 (06:56 -0700)]
[automerger skipped] Merge "DO NOT MERGE Update onboarding" into pi-dev am:
d521588510
am:
cb2bd69789 -s ours
Change-Id: I87a2b801987b601a22b9588602dcc1d703eef2d8
Eran Messeri [Wed, 2 May 2018 13:55:42 +0000 (06:55 -0700)]
[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
Julia Reynolds [Wed, 2 May 2018 13:53:05 +0000 (06:53 -0700)]
Merge "DO NOT MERGE Update onboarding" into pi-dev
am:
d521588510
Change-Id: Ibd40108722683e048cc841f2e4a5352bb412cf8d
Eran Messeri [Wed, 2 May 2018 13:51:41 +0000 (06:51 -0700)]
Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev
am:
a6d36c4e2e
Change-Id: I8b55406992369ecec72172d0a2620e6b42093d16
Julia Reynolds [Wed, 2 May 2018 13:46:17 +0000 (13:46 +0000)]
Merge "DO NOT MERGE Update onboarding" into pi-dev
Eran Messeri [Wed, 2 May 2018 13:44:48 +0000 (13:44 +0000)]
Merge "Require work profile to be unlocked for changing notification settings in a different way" into pi-dev
yuemingw [Wed, 2 May 2018 12:36:06 +0000 (13:36 +0100)]
Revert policy transparency dialog title to "Action not allowed".
Bug:
78443458
Test: manually by TestDpc.
Change-Id: Ie4a4b6cacb61d7d1a328d67bcf780040efc23ccd
yuemingw [Thu, 19 Apr 2018 11:12:11 +0000 (12:12 +0100)]
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
Julia Reynolds [Tue, 1 May 2018 20:57:50 +0000 (16:57 -0400)]
DO NOT MERGE Update onboarding
Change text and add 'repeat callers'
Test: robotests
Change-Id: I4b7125a2a9d70cf5ec7e4d184528a444d7d2bcf1
Fixes:
78448988