OSDN Git Service
Lei Yu [Thu, 15 Mar 2018 18:33:42 +0000 (18:33 +0000)]
Merge "Add dialog when restrict apps are more than 5" into pi-dev
am:
34bfe74249
Change-Id: I5ba41a7343c8c274c785429322fe2b1ed4c6aa81
Lei Yu [Thu, 15 Mar 2018 18:01:58 +0000 (18:01 +0000)]
Merge "Add dialog when restrict apps are more than 5" into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 17:18:15 +0000 (17:18 +0000)]
Merge "Change text for data warning and data limit." into pi-dev
am:
b673aaadc9
Change-Id: Icf0d3cc17abe30946543af85829f9223fc89d921
Lei Yu [Thu, 15 Mar 2018 17:17:25 +0000 (17:17 +0000)]
Merge "Update string in battery app info page" into pi-dev
am:
e5c7317f3f
Change-Id: Ib4ee8e6d0a2470e995dfd9c7d577759cb146ec58
Sundeep Ghuman [Thu, 15 Mar 2018 17:08:34 +0000 (17:08 +0000)]
Merge "Change text for data warning and data limit." into pi-dev
Lei Yu [Thu, 15 Mar 2018 17:06:00 +0000 (17:06 +0000)]
Merge "Update string in battery app info page" into pi-dev
Jan Nordqvist [Mon, 12 Mar 2018 20:15:47 +0000 (13:15 -0700)]
Change text for data warning and data limit.
This change modifies the "data warning" text to show either nothing, only
warning, only limit, or warning and limit, based on which of the values are
set. It also remove the capitalization of the first letter of the texts.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceControllerTest
Change-Id: Ifebb411b906719c6e2f343f48d825f7b6f17af53
Brad Ebinger [Thu, 15 Mar 2018 16:19:32 +0000 (16:19 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
am:
ab988900c4 -s ours
Change-Id: I9c9d6c5062f20d9c84a7c1ac8ff7e97b473f916e
Suresh Koleti [Thu, 15 Mar 2018 16:18:49 +0000 (16:18 +0000)]
Donot disable Wi-Fi Calling when getting "registration error" intent.
am:
87e0d43237 -s ours
Change-Id: Ic79f29b10792a680f846322bafa8b504a3325ff2
Brad Ebinger [Thu, 15 Mar 2018 16:04:56 +0000 (16:04 +0000)]
Merge "Donot disable Wi-Fi Calling when getting "registration error" intent." into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 15:54:16 +0000 (15:54 +0000)]
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
am:
437d421eaf
Change-Id: I346e1868268fa53979886cf4a9c9bb0cebf9af9a
Sundeep Ghuman [Thu, 15 Mar 2018 15:43:17 +0000 (15:43 +0000)]
Merge changes Icf6fafe9,I35eb3f0c,Ieec0c486,I8accb164 into pi-dev
* changes:
Set color of update line to red if update is older than six hours.
In Data Usage screen, Below the data bar, Add “X days left” field.
In Data Usage screen, add over-limit state.
Change text layout of data usage string.
Alan Viverette [Thu, 15 Mar 2018 13:59:45 +0000 (13:59 +0000)]
Merge "Update for 1.0.0-beta1" into pi-dev
am:
3618f68c01
Change-Id: I66ac7416a3aa3cccbd22ca4b2b934dcfff0a4893
Alan Viverette [Thu, 15 Mar 2018 13:32:16 +0000 (13:32 +0000)]
Merge "Update for 1.0.0-beta1" into pi-dev
Jan Nordqvist [Mon, 12 Mar 2018 22:19:29 +0000 (15:19 -0700)]
Set color of update line to red if update is older than six hours.
In Data Usage screen, out-of-date state
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Icf6fafe9ab61a2c1ac3fba2bebf3bd4407c0ecfe
Jan Nordqvist [Fri, 9 Mar 2018 23:13:46 +0000 (15:13 -0800)]
In Data Usage screen, Below the data bar, Add “X days left” field.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I35eb3f0c09c84d609ad54e87400913ec77e19ea0
Sundeep Ghuman [Thu, 15 Mar 2018 06:00:54 +0000 (23:00 -0700)]
In Data Usage screen, add over-limit state.
Bug:
70950124
Test: make RunSettingsRoboTests
ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: Ieec0c486c6a5451cd5983f02e202ddac3413a602
Jan Nordqvist [Wed, 7 Mar 2018 17:59:06 +0000 (09:59 -0800)]
Change text layout of data usage string.
In Data Usage screen, Above the data bar, Change font size of number
In Data Usage screen, Above the data bar, Update text style of “GB used”
In Data Usage screen, Above the data bar, Add “GB left” aligned right of bar (not always shown)
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I8accb16425283cf148ddb6b6646f92ff51a74b7c
Andrew Sapperstein [Thu, 15 Mar 2018 05:16:29 +0000 (05:16 +0000)]
Merge "update the whitelist for anomaly detection" into pi-dev
am:
eb029cffaf
Change-Id: Ib30f325cd325099cf2a9909924227f99cb23b4ee
Andrew Sapperstein [Thu, 15 Mar 2018 05:09:59 +0000 (05:09 +0000)]
Merge "update the whitelist for anomaly detection" into pi-dev
Sundeep Ghuman [Thu, 15 Mar 2018 05:09:41 +0000 (05:09 +0000)]
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
am:
d610e51613
Change-Id: I04c04bf38ef388ddd99827407659327222aa7f44
Andrew Sapperstein [Thu, 15 Mar 2018 05:08:47 +0000 (05:08 +0000)]
Merge "Rename Mobile data usage to App data usage & hide summary" into pi-dev
am:
0f6ff091b4
Change-Id: Ib5a548c80fb2e0c7afeb0df9e4e1c368ec9be65f
Sundeep Ghuman [Thu, 15 Mar 2018 05:00:41 +0000 (05:00 +0000)]
Merge "Fix the ProgressBar in DataUsageSummaryV2 page." into pi-dev
Andrew Sapperstein [Thu, 15 Mar 2018 04:58:42 +0000 (04:58 +0000)]
Merge "Rename “Mobile data usage” to “App data usage” & hide summary" into pi-dev
Lei Yu [Thu, 15 Mar 2018 00:02:30 +0000 (17:02 -0700)]
Update string in battery app info page
Change-Id: I78ce7499f10bb65d44865349738bf77300180867
Fixes:
73576591
Bugs:
73018395
Test: Manual
Sundeep Ghuman [Tue, 13 Mar 2018 05:25:23 +0000 (22:25 -0700)]
Fix the ProgressBar in DataUsageSummaryV2 page.
Bug:
70950124
Test: make RunSettingsRoboTests ROBOTEST_FILTER=DataUsageSummaryPreferenceTest
Change-Id: I83f268c0824d9e3520899725fa572753e1de0814
Andreas Terzis [Fri, 9 Mar 2018 06:51:47 +0000 (22:51 -0800)]
Rename “Mobile data usage” to “App data usage” & hide summary
In Data usage screen, rename “Mobile data usage” to “App data usage” &
hide summary.
Also, change the title of the new "App data usage" (old "Mobile data
usage") screen to "App data usage".
Test: manual
Test: make RunSettingsRoboTests
Bug:
70950124
Change-Id: Ide9bcb2a4b171edcd088d68275bacda1eb449afe
Yuchen Chang [Wed, 14 Mar 2018 17:54:35 +0000 (17:54 +0000)]
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
am:
4786291624
Change-Id: I6f3596bb4cde597c9fd72804432aa272504aff0e
Lei Yu [Tue, 13 Mar 2018 00:16:54 +0000 (17:16 -0700)]
Add dialog when restrict apps are more than 5
Bug:
73018395
Test: RunSettingsRoboTests
Change-Id: Iec24fc1ce8e5840207610b3155dffa7059f9aa49
TreeHugger Robot [Wed, 14 Mar 2018 17:11:37 +0000 (17:11 +0000)]
Merge "Request focus in wifi screen in add network and secure wifi" into pi-dev
Phil Weaver [Wed, 14 Mar 2018 16:52:54 +0000 (16:52 +0000)]
Merge "Show default a11y icon in shortcut menu" into pi-dev
am:
920548005b
Change-Id: Ic132edde69bb1b2feb93f209cc4deab12f3a80f1
Phil Weaver [Wed, 14 Mar 2018 16:45:49 +0000 (16:45 +0000)]
Merge "Show default a11y icon in shortcut menu" into pi-dev
Phil Weaver [Wed, 14 Mar 2018 16:25:48 +0000 (16:25 +0000)]
Merge "Don't pre-scale vector drawables in settings" into pi-dev
am:
be27390af8
Change-Id: I7690249ea06347b5ecf1c58528710b426dc323c2
Phil Weaver [Wed, 14 Mar 2018 16:03:28 +0000 (16:03 +0000)]
Merge "Don't pre-scale vector drawables in settings" into pi-dev
Yuchen Chang [Wed, 14 Mar 2018 09:16:05 +0000 (17:16 +0800)]
Request focus in wifi screen in add network and secure wifi
Request focus from parent view in controller. Based on framework
patch, it can be placed in a parent and focus will go to whatever view
is the default focusable in that hierarchy.
Fixes:
68776177
Fixes:
72882629
Test: RunSettingsRobotests and Manual test
Change-Id: I3bcdc4ec814f68079a00e40435f46bdfa53f4425
Ecco Park [Wed, 14 Mar 2018 07:03:09 +0000 (07:03 +0000)]
Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev
am:
de08983dd2
Change-Id: I3991de744ca033132d44f7456be126b2603f11c9
TreeHugger Robot [Wed, 14 Mar 2018 06:53:12 +0000 (06:53 +0000)]
Merge "Fix the system crash issue when secondary user clicks any 802.1x AP on Wifi Picker." into pi-dev
Sundeep Ghuman [Wed, 14 Mar 2018 06:06:44 +0000 (06:06 +0000)]
Merge "Fix new DataUsageSummary page line spacing." into pi-dev
am:
9f6ee6e1f8
Change-Id: I0eb675f86c3b3da8d7efd049f311484847e68a6b
jackqdyulei [Wed, 14 Mar 2018 06:00:36 +0000 (06:00 +0000)]
Merge "Add dialog for summary tip" into pi-dev
am:
349c9b2691
Change-Id: I189eb9e680baa9d40ae31dab1fc1aa3fae81d00e
TreeHugger Robot [Wed, 14 Mar 2018 06:00:29 +0000 (06:00 +0000)]
Merge "Fix new DataUsageSummary page line spacing." into pi-dev
Lei Yu [Wed, 14 Mar 2018 05:59:24 +0000 (05:59 +0000)]
Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
am:
61bdf047a4
Change-Id: I5d6560a63ec8d9d906c2bcc3f2536f9032875ca0
Sundeep Ghuman [Wed, 14 Mar 2018 05:54:20 +0000 (05:54 +0000)]
Merge "Add Data warning and limit footer text." into pi-dev
am:
a41941ce39
Change-Id: I01e218c63c4b3955defdc54ada55903888cce6b9
TreeHugger Robot [Wed, 14 Mar 2018 05:47:12 +0000 (05:47 +0000)]
Merge "Add dialog for summary tip" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 05:47:10 +0000 (05:47 +0000)]
Merge "Change default value for SOFT_AP_TIMEOUT_ENABLED" into pi-dev
TreeHugger Robot [Wed, 14 Mar 2018 05:44:44 +0000 (05:44 +0000)]
Merge "Add Data warning and limit footer text." into pi-dev
Andreas Terzis [Wed, 14 Mar 2018 04:09:53 +0000 (04:09 +0000)]
Merge "Change the color of the measurement numbers below the data bar." into pi-dev
am:
b687dac159
Change-Id: I8a90af2a6bfc35de53c5b9e5d9ecd2b582ed6c2d
Andreas Terzis [Wed, 14 Mar 2018 03:58:32 +0000 (03:58 +0000)]
Merge "Change the color of the measurement numbers below the data bar." into pi-dev
Dianne Hackborn [Wed, 14 Mar 2018 03:15:39 +0000 (03:15 +0000)]
Merge "Fix issue #
62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
am:
2dc4e36a2c
Change-Id: I4e74cc4be5b45dad4772610adf1aded89e6f19d9
Dianne Hackborn [Wed, 14 Mar 2018 03:02:20 +0000 (03:02 +0000)]
Merge "Fix issue #
62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
Doris Ling [Wed, 14 Mar 2018 01:10:37 +0000 (01:10 +0000)]
Merge "Fix alignment for the instant app button." into pi-dev
am:
2dd0a66c81
Change-Id: I0d817a996ee558a3aa6f962ed0c3eccc45ce59eb
Sundeep Ghuman [Tue, 13 Mar 2018 03:28:09 +0000 (20:28 -0700)]
Fix new DataUsageSummary page line spacing.
There are still some unspecified items pending UX. Have left comments on
ag/
3702541 to avoid regressions.
Bug:
70950124
Test: UI change only, no code to test.
Change-Id: I7fa96134af750d71786d031652162aed6bffbeb5
Katsiaryna Naliuka [Wed, 14 Mar 2018 00:55:10 +0000 (00:55 +0000)]
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev
am:
2ae02f56fb
Change-Id: I86f951720246dadd5835dfae8ecbfa3158adc16e
TreeHugger Robot [Wed, 14 Mar 2018 00:28:12 +0000 (00:28 +0000)]
Merge "Fix alignment for the instant app button." into pi-dev
Lei Yu [Wed, 14 Mar 2018 00:20:16 +0000 (17:20 -0700)]
Change default value for SOFT_AP_TIMEOUT_ENABLED
Change the default value to 1.
Change-Id: I78a69d6224ad417537be59ce51357e1093d6bae4
Fixes:
73501186
Test: RunSettingsRoboTests
Ecco Park [Mon, 12 Mar 2018 18:37:51 +0000 (11:37 -0700)]
Fix the system crash issue when secondary user clicks any 802.1x AP on
Wifi Picker.
Catch the exception when keystore failed to list the certs
Bug:
73794111
Test: test it with clicking the Google-A on Wifi Picker.
Test: make ROBOTEST_FILTER="(WifiConfigControllerTest)"
RunSettingsRoboTests -j32
RunSettingsRoboTests: OK (12 tests)
Change-Id: I0db66730261c72ef35d1b299bacd2aed7710d247
Katsiaryna Naliuka [Tue, 13 Mar 2018 23:29:01 +0000 (23:29 +0000)]
Merge "Made ordering in the Sound settings page more sparse to allow injecting tiles in arbitrary positions." into pi-dev
jackqdyulei [Wed, 28 Feb 2018 19:21:39 +0000 (11:21 -0800)]
Add dialog for summary tip
Also change SummaryTip to store the time data, which is used
in the dialog. If "Full last charge" time is available, show
normal message otherwise show message without it.
Bug:
72997971
Test: RunSettingsRoboTests
Change-Id: I4ce94f0935465a18275edb13e3be343313427c3b
Doris Ling [Tue, 13 Mar 2018 21:38:33 +0000 (14:38 -0700)]
Fix alignment for the instant app button.
- wrap the secondary button in the FrameLayout to make it align properly
with the primary button.
Change-Id: I6964bc67773a77eae551521747c19898a2f22210
Fixes:
69562807
Test: visual
Sundeep Ghuman [Tue, 13 Mar 2018 05:26:52 +0000 (22:26 -0700)]
Add Data warning and limit footer text.
Bug:
70550124
Test: XML only change, visual inspection.
Change-Id: Iaea3f100051bb908b13ca6809463db7f01f8d92d
Doris Ling [Tue, 13 Mar 2018 21:04:23 +0000 (21:04 +0000)]
Merge "Fix presubmit test failure." into pi-dev
am:
ceaa6c5a0b
Change-Id: I2af70de2d3917b470f78eef5ef920f5de6e42dc9
Beverly [Tue, 13 Mar 2018 20:34:41 +0000 (20:34 +0000)]
Merge changes from topic "dnd_touch_sounds" into pi-dev
am:
e9fbcd7114
Change-Id: Ie536a0126a05b379d06caceb54681f4757077c7b
TreeHugger Robot [Tue, 13 Mar 2018 20:18:14 +0000 (20:18 +0000)]
Merge "Fix presubmit test failure." into pi-dev
Jan Nordqvist [Fri, 9 Mar 2018 22:02:54 +0000 (14:02 -0800)]
Change the color of the measurement numbers below the data bar.
Original line item: In Data Usage screen, Below the data bar, Make GB measurement numbers smaller.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id30233e038c664539fd688dcd4eb99af0c41f010
Katsiaryna Naliuka [Tue, 13 Mar 2018 19:48:05 +0000 (20:48 +0100)]
Made ordering in the Sound settings page more sparse to allow injecting
tiles in arbitrary positions.
Also increased a number of settings that are not hidden behind the
overflow to accommodate 1 more line.
Bug:
64065365
Test: manual
Change-Id: I3ac8dfd4802967e02bebc6558a5b96d68cb2ea34
TreeHugger Robot [Tue, 13 Mar 2018 19:58:51 +0000 (19:58 +0000)]
Merge changes from topic "dnd_touch_sounds" into pi-dev
* changes:
Test for string changes in DND Sound Settings
Update seconday text DND Exceptions preference
Lei Yu [Mon, 12 Mar 2018 20:32:59 +0000 (13:32 -0700)]
update the whitelist for anomaly detection
Add "allow-in-power-save-except-idle" to whitelist. Also ignore
all the system uids
Bug:
74241534
Test: RunSettingsRoboTests
Change-Id: I593e558168db339f6f38c7f78ab4fd63f99b16ab
Andreas Terzis [Tue, 13 Mar 2018 18:31:24 +0000 (18:31 +0000)]
Merge "Increase string character limits to 40" into pi-dev
am:
2e7e15c82f
Change-Id: I41b251514ac761300e3c1923aa826648b2173e37
Doris Ling [Tue, 13 Mar 2018 18:25:04 +0000 (11:25 -0700)]
Fix presubmit test failure.
- fix the typo in the manifest that reference the zen mode fragment.
Change-Id: Iae6975d015174fabb98033b917290c954c5483c2
Fixes:
74577539
Test: make SettingsUnitTests
Andreas Terzis [Tue, 13 Mar 2018 17:58:12 +0000 (17:58 +0000)]
Merge "Increase string character limits to 40" into pi-dev
Suresh Koleti [Mon, 20 Nov 2017 12:50:26 +0000 (18:20 +0530)]
Donot disable Wi-Fi Calling when getting "registration error" intent.
Test: Manual
Bug:
69446679
Merged-In: I95a108f4e6090b61e4584a64bed58c024e120fd0
Change-Id: I92869d091f3ad1ece5d3c33457d7601d07797639
Doris Ling [Tue, 13 Mar 2018 01:10:58 +0000 (01:10 +0000)]
Merge "Update suggestion title and summary text." into pi-dev
am:
388b5314d7
Change-Id: I2cd2b0a74b5f07fd4115e74e9d30bf6354af9926
Doris Ling [Tue, 13 Mar 2018 00:27:34 +0000 (00:27 +0000)]
Merge "Update suggestion title and summary text." into pi-dev
Victor Chang [Tue, 13 Mar 2018 00:27:00 +0000 (00:27 +0000)]
Merge "Align the search view with the setting items" into pi-dev
am:
f11976d817
Change-Id: Icb137a37b06643514f4c1f519b52ad61b1ad21e2
Beverly Tai [Mon, 12 Mar 2018 23:29:41 +0000 (23:29 +0000)]
Merge "Adding zen duration preference" into pi-dev
am:
e652a039af
Change-Id: Ief1577186f507572471d65d9aa8cbdf8cb7e1d69
Alan Viverette [Fri, 9 Mar 2018 23:07:30 +0000 (18:07 -0500)]
Update for 1.0.0-beta1
Bug:
74449147
Test: make
Change-Id: I664b5f29efbb5d6c40420c0d8aaa8629ddfcd31b
Victor Chang [Mon, 12 Mar 2018 22:58:53 +0000 (22:58 +0000)]
Merge "Align the search view with the setting items" into pi-dev
Ajay Panicker [Mon, 12 Mar 2018 22:57:27 +0000 (22:57 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
am:
5906621ea4
Change-Id: I643cee8c6e35519f41d15939ea80dab056649e37
Doris Ling [Mon, 12 Mar 2018 22:10:49 +0000 (22:10 +0000)]
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
am:
425f033782
Change-Id: I86b200c0e3a33fc1e3538a7a25eec8c249469fb0
Beverly Tai [Mon, 12 Mar 2018 21:39:18 +0000 (21:39 +0000)]
Merge "Adding zen duration preference" into pi-dev
Julia Reynolds [Mon, 12 Mar 2018 21:17:21 +0000 (21:17 +0000)]
Merge "Fix tests" into pi-dev
am:
f22eb94b18
Change-Id: I42ade3f384469eb817555e9c6b6f7e76d2791870
TreeHugger Robot [Mon, 12 Mar 2018 21:08:59 +0000 (21:08 +0000)]
Merge "Bluetooth: Enable AVDTP Delay reports by default." into pi-dev
Andreas Terzis [Mon, 12 Mar 2018 19:27:50 +0000 (12:27 -0700)]
Increase string character limits to 40
Increase character limits for the "billing_cycle" and
"app_usage_cycle" strings to 40 characters because the
current limit of 30 characters is not enough for some
translations.
Test: manual
Test: make RunSettingsRoboTests
Bug:
70950124
Change-Id: I2091915ca78786f4b29de211b4635af45cb4946f
Victor Chang [Mon, 12 Mar 2018 15:41:19 +0000 (15:41 +0000)]
Align the search view with the setting items
- Remove the margin and paddings in the search view
Bug:
73952488
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: I67fb420cf77fc427a550449a053f80dcf66d16ff
TreeHugger Robot [Mon, 12 Mar 2018 19:36:32 +0000 (19:36 +0000)]
Merge "Fix failing testcases in SettingsAdapterTest." into pi-dev
Doris Ling [Fri, 9 Mar 2018 19:17:34 +0000 (11:17 -0800)]
Update suggestion title and summary text.
Bug:
73164111
Test: rebuild
Change-Id: I35db24cd78e88091154e5cbcc9fa089181f3edb2
TreeHugger Robot [Mon, 12 Mar 2018 19:22:22 +0000 (19:22 +0000)]
Merge "Fix tests" into pi-dev
Ben Lin [Mon, 12 Mar 2018 18:53:53 +0000 (18:53 +0000)]
Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev
am:
aedf00c4f8
Change-Id: Ie0d8a377c4c138b3bc1dcd1e8bd1bf0761d59d9a
Ben Lin [Mon, 12 Mar 2018 18:45:46 +0000 (18:45 +0000)]
Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev
am:
2d452df643
Change-Id: I027d3de2a7388da8b6ece1d03e9c2c5a0b4ffce9
Beverly [Mon, 12 Mar 2018 18:35:27 +0000 (14:35 -0400)]
Test for string changes in DND Sound Settings
Test: this
Change-Id: I47ba1d1bad6a5be04d718d2e58eaf5dd6c69f107
Fixes:
74529508
Ben Lin [Mon, 12 Mar 2018 17:52:47 +0000 (17:52 +0000)]
Merge "Introduce boolean flag to show/hide Reset Options." into pi-dev
Ben Lin [Mon, 12 Mar 2018 17:52:37 +0000 (17:52 +0000)]
Merge "Introduce boolean flags to show/hide Encryption status." into pi-dev
Beverly [Mon, 26 Feb 2018 14:19:41 +0000 (09:19 -0500)]
Adding zen duration preference
Test: make ROBOTEST_FILTER=ZenModeDurationPreferenceControllerTest RunSettingsRoboTests -j40
Bug:
73741459
Change-Id: I55a75897045ef059dc872bf6403a62f46cedc417
Beverly [Fri, 9 Mar 2018 20:49:22 +0000 (15:49 -0500)]
Update seconday text DND Exceptions preference
Test: manual
Bug:
74441398
Change-Id: Ibaa459aa368f62c4ef8cdbefef462848e7bc6fe7
Beverly [Mon, 12 Mar 2018 15:33:19 +0000 (15:33 +0000)]
Merge "Updated dnd secondary text in sound settings" into pi-dev
am:
c984e49262
Change-Id: I27d5c30102a5786e4e7a5aaf9306d1286089b33b
TreeHugger Robot [Mon, 12 Mar 2018 15:02:01 +0000 (15:02 +0000)]
Merge "Updated dnd secondary text in sound settings" into pi-dev
Julia Reynolds [Mon, 12 Mar 2018 14:08:19 +0000 (10:08 -0400)]
Fix tests
Test: make -j20 RunSettingsRoboTests
Change-Id: I40fda22b4a9da3df7f4319bc68a78d291c1b943d
Fixes:
74446970
Matthew Fritze [Mon, 12 Mar 2018 03:24:40 +0000 (03:24 +0000)]
Merge "Declare official platform slice" into pi-dev
am:
decea2055d
Change-Id: Ic0ae75607d275ff75f383d83ea1193ab8229ae1a
TreeHugger Robot [Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)]
Merge "Declare official platform slice" into pi-dev
Yohei Yukawa [Mon, 12 Mar 2018 02:19:58 +0000 (02:19 +0000)]
Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev
am:
e1703e867a
Change-Id: I6d1e6304f2d592ec9ff46b265bd9937ed554bef9
TreeHugger Robot [Mon, 12 Mar 2018 01:58:06 +0000 (01:58 +0000)]
Merge "Reenable pre-N style hard keyboard layout settings" into pi-dev