OSDN Git Service
Jan Nordqvist [Mon, 19 Mar 2018 16:04:23 +0000 (16:04 +0000)]
Merge "In Network & internet screen, hide summary under Data usage when there is No SIM" into pi-dev
Andreas Terzis [Mon, 19 Mar 2018 14:22:51 +0000 (14:22 +0000)]
Merge "Add the string "No time remaining" when remaining time <= 0." into pi-dev
Julia Reynolds [Sat, 17 Mar 2018 14:28:41 +0000 (14:28 +0000)]
Merge "Add placeholder on DND settings screen" into pi-dev
Jan Nordqvist [Fri, 16 Mar 2018 23:14:28 +0000 (16:14 -0700)]
Add the string "No time remaining" when remaining time <= 0.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Id8ff1dde78f3389b5ab15120a2460ab19e895c6f
TreeHugger Robot [Fri, 16 Mar 2018 23:19:48 +0000 (23:19 +0000)]
Merge "Import translations. DO NOT MERGE" into pi-dev
Jerry Zhang [Fri, 16 Mar 2018 22:40:38 +0000 (22:40 +0000)]
Merge "Update USB settings screen" into pi-dev
Jan Nordqvist [Mon, 12 Mar 2018 23:23:13 +0000 (16:23 -0700)]
In Network & internet screen, hide summary under Data usage when there is No SIM
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I4abd401aa9420b2b0090fac76991fe5067acc2e9
Lei Yu [Fri, 16 Mar 2018 21:28:43 +0000 (21:28 +0000)]
Merge "Update the wifi off string" into pi-dev
Bill Yi [Fri, 16 Mar 2018 20:20:09 +0000 (13:20 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If94e8adc7ea1d0106ebb553314d47f4311ffbd0e
Julia Reynolds [Fri, 16 Mar 2018 19:43:38 +0000 (19:43 +0000)]
Merge "Link to dnd settings from notification settings" into pi-dev
Lei Yu [Fri, 16 Mar 2018 18:26:49 +0000 (18:26 +0000)]
Merge "update strings in battery settings(Round 1)" into pi-dev
Jan Nordqvist [Fri, 16 Mar 2018 17:18:37 +0000 (17:18 +0000)]
Merge "In Data Usage screen, Above the data bar, Change font size of number." into pi-dev
Julia Reynolds [Thu, 15 Mar 2018 14:22:01 +0000 (10:22 -0400)]
Link to dnd settings from notification settings
Test: make -j20 RunSettingsRoboTests
Change-Id: Idf70155134b2e78bd410468497cabe8faf1557ce
Fixes:
74319354
Jan Nordqvist [Thu, 15 Mar 2018 22:47:58 +0000 (15:47 -0700)]
In Data Usage screen, Above the data bar, Change font size of number.
Bug:
70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I671a605fe341f36adeb6ae239333295ddfb550c7
Julia Reynolds [Fri, 16 Mar 2018 15:45:05 +0000 (15:45 +0000)]
Merge "Fix channel screen launching" into pi-dev
Alison Cichowlas [Fri, 16 Mar 2018 15:44:12 +0000 (15:44 +0000)]
Merge "Sort Uncategorized channel to the bottom." into pi-dev
Adam Newman [Fri, 16 Mar 2018 14:26:25 +0000 (14:26 +0000)]
Merge "Enable launching captive portal directly" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 21:19:52 +0000 (21:19 +0000)]
Restore "Update for 1.0.0-beta1"
This reverts commit
b4fe52343c7df00cd4801c2d712a377d473b2a17.
Bug:
74950017
Test: manual
Change-Id: I9749b9ae8f2f75b1bbdf7c6686a036db1f6f8a74
Lei Yu [Tue, 13 Mar 2018 21:19:04 +0000 (14:19 -0700)]
update strings in battery settings(Round 1)
This cl updates the strings in several battery
settings pages and dialogs, also add footers
for battery manager page and restrict app page.
Update the strings in battery settings except:
1. Summary for smart battery toggle
2. "Full charge lasts"
3. Restrict dialog
4. App info page
Bug:
73018395
Test: RunSettingsRoboTests
Change-Id: I4955cc7c19b5f1df18f21cfb47e8859c997e19d1
Jerry Zhang [Fri, 23 Feb 2018 02:13:06 +0000 (18:13 -0800)]
Update USB settings screen
Screen now handles data role and power
role switching as separate categories.
Change the UsbBackend api to use predefined
constants. Split out data and power direction
changes into separate functions.
Add tests for new controllers and new backend
functionality.
Bug:
72829348
Test: passes
Change-Id: I28b96cf49463fa4f3a4b6be41c57d5841731fbd6
Alison Cichowlas [Thu, 15 Mar 2018 22:07:27 +0000 (18:07 -0400)]
Sort Uncategorized channel to the bottom.
Bug:
64803214
Test: manual, with Duo app
Change-Id: I8e39fbed4ecda2efebb4606f38ea934647317207
Adam Newman [Fri, 9 Mar 2018 00:59:34 +0000 (16:59 -0800)]
Enable launching captive portal directly
Whenever a user has connected to a captive portal network, split the
ConnectedAccessPointPreference to allow directly signing into the
captive portal or modifying the network's settings. When in any other
network state, use the old behavior of a single tappable preference that
takes the user to settings.
Bug:
63929546
Bug:
68031656
Test: make RunSettingsRoboTests
Test: manual by connecting to Captive Portal and normal WiFi networks.
Change-Id: I444202a12138d90c94bda94945c121c8c0810536
(cherry picked from commit
7577624db7bf9d9c8382161bab25849589822601)
Alan Viverette [Thu, 15 Mar 2018 20:04:22 +0000 (20:04 +0000)]
Merge "Revert "Update for 1.0.0-beta1"" into pi-dev
Alan Viverette [Thu, 15 Mar 2018 17:48:04 +0000 (17:48 +0000)]
Revert "Update for 1.0.0-beta1"
This reverts commit
6b1fd5cfa9e6ff2a1b7cdc5190ec844dacec7a72.
Reason for revert: broke Settings
Bug:
74950017
Test: revert only
Change-Id: If56a4dcac4671d8e2c5f2c0de30d13e3cf58666a
TreeHugger Robot [Thu, 15 Mar 2018 18:30:24 +0000 (18:30 +0000)]
Merge "Update strings for location" into pi-dev
Lei Yu [Thu, 15 Mar 2018 18:28:48 +0000 (18:28 +0000)]
Merge "Update the restrict app list" into pi-dev
Neil Fuller [Thu, 15 Mar 2018 18:26:36 +0000 (18:26 +0000)]
Merge "Track changes in libcore" into pi-dev
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
Lei Yu [Wed, 14 Mar 2018 23:20:06 +0000 (16:20 -0700)]
Update the wifi off string
When wifi scanning is on.
Bug:
65626601
Test: Manual
Change-Id: Ib4b6ee1cc7f2cc1d8d4ab4d7500579047fd1bfd6
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: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: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.
Julia Reynolds [Thu, 15 Mar 2018 13:34:03 +0000 (09:34 -0400)]
Add placeholder on DND settings screen
Bug:
74321426
Test: make -j20 RunSettingsRoboTests
Change-Id: Icb7d21e342af85d1ad83e89efa2fe9a1d41e710b
Alan Viverette [Thu, 15 Mar 2018 13:32:16 +0000 (13:32 +0000)]
Merge "Update for 1.0.0-beta1" into pi-dev
Julia Reynolds [Wed, 14 Mar 2018 20:28:39 +0000 (16:28 -0400)]
Fix channel screen launching
Test: launch channel screen from Settings & external app
Change-Id: Ib9add2f25cbacde192095407b83b17438946a493
Fixes:
73814186
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:09:59 +0000 (05:09 +0000)]
Merge "update the whitelist for anomaly detection" into pi-dev
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
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
Neil Fuller [Wed, 14 Mar 2018 17:11:44 +0000 (17:11 +0000)]
Track changes in libcore
Track method parameter changes in libcore.
Bug:
72142943
Test: Build only
Change-Id: I85396aeea98eaa8c093115ee52b52e22d1a4aa2b
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:45:49 +0000 (16:45 +0000)]
Merge "Show default a11y icon in shortcut menu" into pi-dev
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
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
TreeHugger Robot [Wed, 14 Mar 2018 06:00:29 +0000 (06:00 +0000)]
Merge "Fix new DataUsageSummary page line spacing." into pi-dev
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 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:02:20 +0000 (03:02 +0000)]
Merge "Fix issue #
62342672: API Review: OPSTR_ACTIVATE_VPN SystemApi" into pi-dev
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
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
Lei Yu [Fri, 9 Mar 2018 02:24:44 +0000 (18:24 -0800)]
Update strings for location
Bug:
65626601
Test: Screenshot
Change-Id: I66dc675246e3a15069821fddb9d02123429c3722
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
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
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
Lei Yu [Mon, 12 Mar 2018 21:42:54 +0000 (14:42 -0700)]
Update the restrict app list
Before this cl, we use getPackagesForOps() to populate restrict app
list. However in that API not all the apps are currently restricted,
so in this cl we filter out all the allowed apps.
Bug:
73085780
Test: RunSettingsRoboTest
Change-Id: Ia7c1eb95b07a1a0d203b394eb64dcd98d25bd561
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 00:27:34 +0000 (00:27 +0000)]
Merge "Update suggestion title and summary text." into pi-dev
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
Beverly Tai [Mon, 12 Mar 2018 21:39:18 +0000 (21:39 +0000)]
Merge "Adding zen duration preference" into pi-dev
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
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
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
TreeHugger Robot [Mon, 12 Mar 2018 03:17:19 +0000 (03:17 +0000)]
Merge "Declare official platform slice" into pi-dev
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
Victor Chang [Sat, 10 Mar 2018 12:24:38 +0000 (12:24 +0000)]
Merge changes from topic "picker-analytics" into pi-dev
* changes:
Fix UX problems in time zone pickers
Add tron metric logging
TreeHugger Robot [Sat, 10 Mar 2018 01:43:04 +0000 (01:43 +0000)]
Merge "Add extra log for battery tip." into pi-dev
TreeHugger Robot [Sat, 10 Mar 2018 01:21:41 +0000 (01:21 +0000)]
Merge "Disable bluetooth controller if unsupported" into pi-dev