OSDN Git Service
Bill Yi [Thu, 11 May 2017 18:10:10 +0000 (11:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7847ecf70524ecfc31bc2a661d7d4630b5e980b3
Auto-generated-cl: translation import
Bill Yi [Thu, 11 May 2017 11:50:09 +0000 (11:50 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
f1730bee90 -s ours
am:
ee8789939e -s ours
Change-Id: I4078ac746b6c2382d26ef9a1aa750c09bd414ede
Stephen Chen [Thu, 11 May 2017 06:18:36 +0000 (06:18 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev am:
25d1848e5f
am:
ac1b935437
Change-Id: Ieec705671f062119f67a94b559edc40762d90950
Bill Yi [Thu, 11 May 2017 01:21:10 +0000 (01:21 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
f1730bee90 -s ours
Change-Id: Ia9300d42352834b86cd789d6e8167d0c47220a65
Doris Ling [Thu, 11 May 2017 01:04:40 +0000 (01:04 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev am:
cf162d5354
am:
2a23542e68
Change-Id: Ifa0d367e40647ce825e90985658dc6a042edc2bd
Roozbeh Pournader [Thu, 11 May 2017 01:04:05 +0000 (01:04 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev am:
319250b1eb
am:
3a32750ee6
Change-Id: Ic6c6e8eb3e1bf0d5597e0d9e83b327265c847b3b
Jesse Evans [Thu, 11 May 2017 01:03:32 +0000 (01:03 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev am:
3c19120945
am:
28839c0531
Change-Id: I9a07ac3ab22585c93f0f8d90f324dab99e24ca7f
Matthew Fritze [Thu, 11 May 2017 00:54:01 +0000 (00:54 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev am:
ec00573139
am:
ab13b378c9
Change-Id: I7194c8f3a1e17cc7b44548f97b0eabb51d4f6616
Alison Cichowlas [Thu, 11 May 2017 00:53:19 +0000 (00:53 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev am:
b9a2d6a6e3
am:
16bc088c4e
Change-Id: Ia2204643ca06316a48810660fbbce5758020e45b
Daniel Nishi [Thu, 11 May 2017 00:52:43 +0000 (00:52 +0000)]
Merge "Fix the top summary layout." into oc-dev am:
154824f124
am:
4bff3e9841
Change-Id: I5b63fe9eca62a4c3a06206ebc1dfcd63e5b080bc
Daniel Nishi [Thu, 11 May 2017 00:52:07 +0000 (00:52 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev am:
9a5bac7d5a
am:
a3349519d5
Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
TreeHugger Robot [Thu, 11 May 2017 00:30:30 +0000 (00:30 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
Stephen Chen [Thu, 11 May 2017 00:22:12 +0000 (00:22 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
am:
25d1848e5f
Change-Id: Ic83a42d3fa508b2de14ee377eed6de92970fd31c
Doris Ling [Thu, 11 May 2017 00:21:31 +0000 (00:21 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
am:
cf162d5354
Change-Id: I73133604ea118457e49def80edbdcddb553e9bcd
Roozbeh Pournader [Thu, 11 May 2017 00:21:06 +0000 (00:21 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
am:
319250b1eb
Change-Id: I868f67c90626a39c3c0dd2f4107ab9bd755bb40c
Jesse Evans [Thu, 11 May 2017 00:20:40 +0000 (00:20 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
am:
3c19120945
Change-Id: I1cfc5a19c5a133607e5ebc0731632aca25a8f044
Matthew Fritze [Thu, 11 May 2017 00:20:13 +0000 (00:20 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
am:
ec00573139
Change-Id: I27166b54cd51b055d80a96afded31b2f55dbdb8e
Alison Cichowlas [Thu, 11 May 2017 00:19:46 +0000 (00:19 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
am:
b9a2d6a6e3
Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000
Daniel Nishi [Thu, 11 May 2017 00:19:20 +0000 (00:19 +0000)]
Merge "Fix the top summary layout." into oc-dev
am:
154824f124
Change-Id: I5f062c3d6d6df40c0e78f353f608c7efa7137c9f
Daniel Nishi [Thu, 11 May 2017 00:18:53 +0000 (00:18 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
am:
9a5bac7d5a
Change-Id: I59cea940381aa360be456c44afb36c58964c3065
TreeHugger Robot [Thu, 11 May 2017 00:05:48 +0000 (00:05 +0000)]
Merge "Update Wi-Fi Wakeup setting to check whether the feature is available." into oc-dev
TreeHugger Robot [Wed, 10 May 2017 23:39:52 +0000 (23:39 +0000)]
Merge "Also update the account preferences in displayPreference()." into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 23:23:44 +0000 (23:23 +0000)]
Merge "Set textDirection of app name to locale direction" into oc-dev
Bill Yi [Wed, 10 May 2017 20:48:13 +0000 (13:48 -0700)]
Import translations. DO NOT MERGE
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
TreeHugger Robot [Wed, 10 May 2017 20:47:28 +0000 (20:47 +0000)]
Merge "Properly set isInstantApp for power usage page" into oc-dev
Lei Yu [Wed, 10 May 2017 20:42:01 +0000 (20:42 +0000)]
Merge "Expose mac address in bluetooth main page"
TreeHugger Robot [Wed, 10 May 2017 20:16:13 +0000 (20:16 +0000)]
Merge "Only add icons to settings items with icons" into oc-dev
Roozbeh Pournader [Wed, 10 May 2017 19:54:53 +0000 (12:54 -0700)]
Set textDirection of app name to locale direction
Test: Manual
Fixes:
37347408
Change-Id: Icc01f3fdcf584c839cbbff151696171fb3c33c90
Lei Yu [Wed, 10 May 2017 19:55:13 +0000 (19:55 +0000)]
Merge "Add feature provider for Bluetooth"
Doris Ling [Tue, 2 May 2017 18:28:14 +0000 (11:28 -0700)]
Also update the account preferences in displayPreference().
- start creating the account preferences in displayPreference() to make
the data available earlier.
- when trying to update the UI when the page is resumed, instead of
clearing the whole list and add the latest accounts, compare the
differences between the currently shown accounts and the latest accounts
and only update the account preferences that has been changed.
Change-Id: I249eb2fe67f4adaab02bf77680c62d07756dc94a
Fix:
34035653
Test: make RunSettingsRoboTests
Salvador Martinez [Wed, 10 May 2017 18:50:53 +0000 (18:50 +0000)]
Merge "Fix null pointer error && add settings side guard"
Alison Cichowlas [Wed, 10 May 2017 18:42:52 +0000 (18:42 +0000)]
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
Alison Cichowlas [Tue, 9 May 2017 18:01:42 +0000 (14:01 -0400)]
Notifications settings updates to match spec:
- change badge language & remove summary
- change caps on sound text
Bug:
37479730,
37480708
Test: string changes manually verified
Change-Id: Iae7416cecd2cd6d84c2a05fd707f791bc5fe7ceb
jackqdyulei [Wed, 29 Mar 2017 23:06:32 +0000 (16:06 -0700)]
Expose mac address in bluetooth main page
This mac address means the owned device, not the device
to connect.
Bug:
35875420
Test: RunSettingsRoboTests
Change-Id: I142f49fdca72d8ffbb9b8b2e2666a61aefb80505
Matthew Fritze [Wed, 3 May 2017 01:43:31 +0000 (18:43 -0700)]
Only add icons to settings items with icons
Currently the icon for the category of setting is used for
each setting result. Change it to only add an icon when
it exists in xml.
Bug:
37858983
Test: make RunSettingsRoboTests
Change-Id: Ib95e76c5a9ba2e73738cea716d72c5994a6aa0ba
Stephen Chen [Tue, 9 May 2017 19:50:42 +0000 (12:50 -0700)]
Update Wi-Fi Wakeup setting to check whether the feature is available.
Bug:
38037361
Test: make ROBOTEST_FILTER=WifiWakeupPreferenceControllerTest
RunSettingsRoboTests -j40
Change-Id: I1c1b930546cc090d72f3047058a428acd1b2883a
Daniel Nishi [Wed, 10 May 2017 17:59:37 +0000 (17:59 +0000)]
Merge "Fix the top summary layout." into oc-dev
Daniel Nishi [Wed, 10 May 2017 17:59:08 +0000 (17:59 +0000)]
Merge "Add the badged icon for Movies & TV." into oc-dev
Alex Salo [Wed, 10 May 2017 17:48:58 +0000 (17:48 +0000)]
Merge "Location setting now updates summary timely."
Lei Yu [Wed, 10 May 2017 17:39:55 +0000 (17:39 +0000)]
Merge "Add framework for anomaly detection flags"
Matthew Fritze [Wed, 10 May 2017 05:40:55 +0000 (05:40 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev am:
8fc602fed8
am:
bdba7ab697 -s ours
Change-Id: I4e2fe671fefdd52df95bec2d35d6f26e33c7388a
Matthew Fritze [Wed, 10 May 2017 05:24:56 +0000 (05:24 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
am:
8fc602fed8
Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
TreeHugger Robot [Wed, 10 May 2017 05:07:52 +0000 (05:07 +0000)]
Merge "Remove accessibility duplicates in settings search" into oc-dev
Fan Zhang [Wed, 10 May 2017 03:18:53 +0000 (03:18 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev am:
8ff8b5e95b
am:
1b628ea972
Change-Id: I9ee3528030f56d2a7acab0d599c71c595ab87031
Doris Ling [Wed, 10 May 2017 03:18:21 +0000 (03:18 +0000)]
Merge "Fix crash when silencing condition." into oc-dev am:
ba2f3ee3ba
am:
ce5e0c3dc6
Change-Id: I9e5c4f0f9f8ee4cdced52bf1f9d79b28912bb154
Fan Zhang [Wed, 10 May 2017 03:02:21 +0000 (03:02 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
am:
8ff8b5e95b
Change-Id: I60efa39b81e3f54f6e3e9c37f45c751dbb48966c
TreeHugger Robot [Wed, 10 May 2017 02:57:18 +0000 (02:57 +0000)]
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
TreeHugger Robot [Wed, 10 May 2017 01:53:29 +0000 (01:53 +0000)]
Merge "Add support to show first impression type suggestions"
Doris Ling [Wed, 10 May 2017 01:45:17 +0000 (01:45 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
am:
ba2f3ee3ba
Change-Id: Iee2ce7c27469008142862ab866bf53e9e02d74e1
TreeHugger Robot [Wed, 10 May 2017 01:40:34 +0000 (01:40 +0000)]
Merge "Fix crash when silencing condition." into oc-dev
Fan Zhang [Wed, 10 May 2017 00:44:49 +0000 (17:44 -0700)]
Update setting icon paddings to align with actionbar title
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix:
38011653
Test: visual
Alex Salo [Fri, 5 May 2017 22:36:27 +0000 (15:36 -0700)]
Location setting now updates summary timely.
Subscribed the LocationPreferenceController to listen to the location
providers changed action. This allows timely summary update. Previous
approach, directly calling the updateSummary method onResume failed in
the scenario when user changed the location settings via the
QuickSettings.
Test: Added robolectric tests, and manually verified the intended
behavior on a device.
Bug:
37956060
Change-Id: I2f81713d59da3384f3c98b327d377d529d440a88
Matthew Fritze [Tue, 9 May 2017 23:23:23 +0000 (23:23 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev am:
120ec5d1eb
am:
ec6cfe32fd -s ours
Change-Id: I788be238c6319201b2be91633d67e02076d169f9
Bill Yi [Tue, 9 May 2017 23:22:24 +0000 (23:22 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev am:
4a0abee70e -s ours
am:
6d75c92f32 -s ours
Change-Id: I5b6d3319a7109cf9b207daf5345e97fbeb039273
Matthew Fritze [Tue, 9 May 2017 21:41:39 +0000 (21:41 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
am:
120ec5d1eb
Change-Id: Ic9bf5fc2aaa99592c362a3159aea0b11cb7ec950
Bill Yi [Tue, 9 May 2017 21:34:01 +0000 (21:34 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
am:
4a0abee70e -s ours
Change-Id: Ifc6b44fa916a03435be579d49c56362d4b71f576
Fan Zhang [Mon, 8 May 2017 16:31:01 +0000 (09:31 -0700)]
Add support to show first impression type suggestions
- Add FIRST_IMPRESSION type in suggestion order list.
- Make rule changes for a few suggestions.
Bug:
37947647
Test: manual
Change-Id: I2101f5e0f6424723bacc9f5febf2ffaab9398896
TreeHugger Robot [Tue, 9 May 2017 19:59:58 +0000 (19:59 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 18:25:53 +0000 (18:25 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dev
TreeHugger Robot [Tue, 9 May 2017 18:09:36 +0000 (18:09 +0000)]
Merge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 9 May 2017 18:07:39 +0000 (18:07 +0000)]
Merge "Remove accessibility duplicates in settings search"
TreeHugger Robot [Tue, 9 May 2017 18:07:09 +0000 (18:07 +0000)]
Merge "Prevent non-blocking whitespaces from showing up in search"
Bookatz [Tue, 9 May 2017 17:39:50 +0000 (17:39 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev am:
b296697e8e
am:
9b54572992
Change-Id: Ia4ea1a7e24267457ae659c8a67ff15c24c1b0a46
Bookatz [Tue, 9 May 2017 17:08:16 +0000 (17:08 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
am:
b296697e8e
Change-Id: Ic5fca069ab56fd2b9bebb12f27c13a27b7f94b35
Matthew Fritze [Fri, 5 May 2017 18:05:53 +0000 (11:05 -0700)]
Prevent non-blocking whitespaces from showing up in search
When search results use the placeholder summary text,
it becomes non-breaking whitespace. If that is the
summary, set the visibility to gone.
Change-Id: Ic3987a0990c33b6cc5aabffa0782ece6c553784a
Merged-In: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
Fixes:
38029215
Test: make RunSettingsRoboTests
Matthew Fritze [Fri, 5 May 2017 18:05:53 +0000 (11:05 -0700)]
Prevent non-blocking whitespaces from showing up in search
Merge from: ag/
2217040
Bug:
38029215
Test: make RunSettingsRoboTests
Change-Id: Ifefa785b6c56d56da73ca78d874f46efcb9e991f
Matthew Fritze [Mon, 17 Apr 2017 14:55:41 +0000 (07:55 -0700)]
Remove accessibility duplicates in settings search
Merge for: ag/
2148817
Bug:
33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
TreeHugger Robot [Tue, 9 May 2017 16:03:16 +0000 (16:03 +0000)]
Merge "Add BLE results counter to batterystats" into oc-dev
Bill Yi [Tue, 9 May 2017 11:07:09 +0000 (04:07 -0700)]
Import translations. DO NOT MERGE
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
Bill Yi [Tue, 9 May 2017 10:56:50 +0000 (03:56 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8bfce7755242dc89bb6a2ab277e874b3f92a1450
Auto-generated-cl: translation import
Fan Zhang [Tue, 9 May 2017 01:55:42 +0000 (01:55 +0000)]
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev am:
ce7f36c799
am:
b3afa6e84f -s ours
Change-Id: I0ec721881dcd6c75b90f26f2f322a7a445c2948a
Fan Zhang [Tue, 9 May 2017 01:44:00 +0000 (01:44 +0000)]
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
am:
ce7f36c799
Change-Id: I4bf3958e80286634dfc7d23f4133174d221be3b4
TreeHugger Robot [Tue, 9 May 2017 01:25:16 +0000 (01:25 +0000)]
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
Daniel Nishi [Tue, 9 May 2017 00:01:11 +0000 (17:01 -0700)]
Fix the top summary layout.
This changes the margin to the proper 32dp and updates the style on the
title text to be consistent with the rest of Settings.
Bug:
35245772
Test: Manual
Change-Id: Ib980e22d9fac258dd5a72385a2c80060561aa5ac
Stephen Chen [Mon, 8 May 2017 23:45:32 +0000 (23:45 +0000)]
Merge "Added WifiSettings Espresso tests." into oc-dev am:
6c0f337d52
am:
95a98f0686
Change-Id: I03d14cabee02252e69ca0c5c0057489446866d4e
Stephen Chen [Mon, 8 May 2017 23:42:59 +0000 (23:42 +0000)]
Merge "Added WifiSettings Espresso tests." into oc-dev
am:
6c0f337d52
Change-Id: I91235f3fc1754539d055a4e24e395705c7b8f967
Salvador Martinez [Fri, 5 May 2017 18:04:49 +0000 (11:04 -0700)]
Fix null pointer error && add settings side guard
The null check for the cursor happens in the try block
which causes a null pointer error in the finally block
even though we avoid executing the other code because
we still try to close the cursor. This change moves
that outside of the try block to avoid that. Also added
a test to verify that a no-op occurs in the method that
uses the enhanced prediction that would have caught this.
Additionally, the method for checking if the enhanced
prediction was available was not being called in Settings.
This CL adds that check and a relevant tests to ensure it
is respected.
Test: Robotests
Bug:
38031439
Change-Id: I6924acb5552baf09a9ff0cdef8e30881115aa1ca
TreeHugger Robot [Mon, 8 May 2017 23:39:21 +0000 (23:39 +0000)]
Merge "Added WifiSettings Espresso tests." into oc-dev
Fan Zhang [Mon, 8 May 2017 23:15:04 +0000 (23:15 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am:
2dbc30dc58
am:
df2ecdf3f0
Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb
Fan Zhang [Mon, 8 May 2017 23:08:31 +0000 (23:08 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
am:
2dbc30dc58
Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
jackqdyulei [Mon, 8 May 2017 22:29:14 +0000 (15:29 -0700)]
Add feature provider for Bluetooth
Also add method to check whether pairing page is enabled.
Bug:
38134564
Test: RunSettingsGoogleRoboTests
Change-Id: Ib74ece46f9624242895a366eac889957924f84c6
TreeHugger Robot [Mon, 8 May 2017 22:58:55 +0000 (22:58 +0000)]
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
Matthew Fritze [Mon, 8 May 2017 22:56:50 +0000 (22:56 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev am:
fc8e64eccb
am:
43171ef58a -s ours
Change-Id: I9b250e7420e2bf143a69c9a54f340bed040cc32b
Stephen Chen [Mon, 8 May 2017 22:56:17 +0000 (22:56 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev am:
f7980fc3cb
am:
95640767d1
Change-Id: I5b4374a51dfa73b3a8b17bad0a6de473a6808627
Doris Ling [Mon, 8 May 2017 22:55:50 +0000 (22:55 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev am:
a3c4339299
am:
06b670e4df
Change-Id: I1746fbdfeea5a1f807bfe3b7bf7b5847a298aa2e
Jesse Evans [Mon, 8 May 2017 22:53:47 +0000 (15:53 -0700)]
Properly set isInstantApp for power usage page
Previously the app header was not properly configured to be aware
it was rendering an instant app. This change properly sets the value
and adds tests to ensure it is correclty set in the future.
Test: make RunSettingsRoboTests -j30
Bug:
37919863
Change-Id: I0cbe2cb03bcd44208408f68188387e53ae98d8fb
TreeHugger Robot [Mon, 8 May 2017 22:34:47 +0000 (22:34 +0000)]
Merge "Update some rules for suggestions"
Doris Ling [Mon, 8 May 2017 22:08:58 +0000 (15:08 -0700)]
Fix crash when silencing condition.
- check if the broadcast receiver is being registered before trying to
un-regist it.
Change-Id: I6af215f393d16173f317c9e5bc05237c935e7133
Fix:
38131851
Test: make RunSettingsRoboTests
TreeHugger Robot [Mon, 8 May 2017 22:14:19 +0000 (22:14 +0000)]
Merge "Create RestrictedDashboardFragment."
Stephen Chen [Mon, 1 May 2017 21:40:19 +0000 (14:40 -0700)]
Added WifiSettings Espresso tests.
Added test cases for toggling Wi-Fi state, connected access points, and
saved network preferences.
Bug:
35322629
Bug:
35322690
Bug:
35322875
Test: runtest --path
packages/apps/Settings/tests/unit/src/com/android/settings/wifi/WifiSettingsUiTest.java
Change-Id: Iaba7fb2fa90cf0f37538c4b1ef141cf6b15d7f52
jackqdyulei [Wed, 3 May 2017 22:15:41 +0000 (15:15 -0700)]
Add framework for anomaly detection flags
This cl adds isAnomalyDetectorEnabled(type), which decides whether
to turn on specific check with that type.
Added method is used in AnomalyLoader.
Bug:
36924669
Test: RunSettingsRoboTests
Change-Id: I71c6acb1c58c24453a1936c5c36f59fe4e86cfd4
Daniel Nishi [Mon, 8 May 2017 21:13:13 +0000 (14:13 -0700)]
Add the badged icon for Movies & TV.
The work profile was missing the icon.
Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes:
38132211
Test: Settings robotest
Matthew Fritze [Mon, 8 May 2017 21:05:20 +0000 (21:05 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
am:
fc8e64eccb
Change-Id: I4cb1f8685c5d1f43aa5ce5b5b5e124d1240e43bd
Stephen Chen [Mon, 8 May 2017 21:04:55 +0000 (21:04 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
am:
f7980fc3cb
Change-Id: I0b9866922e764afba8f0b642fa16531cd48b73c0
Doris Ling [Mon, 8 May 2017 21:04:28 +0000 (21:04 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
am:
a3c4339299
Change-Id: Ia9ab661f1e870764c8e13c945389d734cbee14d4
Fan Zhang [Mon, 8 May 2017 20:54:19 +0000 (13:54 -0700)]
Update some rules for suggestions
Bug:
37947647
Test: rerun settingslib/settings robotests
Change-Id: Ie5278a2cb86c4d2dd7568b9c800db461ee3c1f04
TreeHugger Robot [Mon, 8 May 2017 20:51:03 +0000 (20:51 +0000)]
Merge "Prevent race conditions after dropping database" into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:44:11 +0000 (20:44 +0000)]
Merge "Fix Disallow config Wi-Fi message for AFW Do mode." into oc-dev
TreeHugger Robot [Mon, 8 May 2017 20:43:54 +0000 (20:43 +0000)]
Merge "Add summary placeholder to data saver preference." into oc-dev
Fan Zhang [Mon, 8 May 2017 20:15:58 +0000 (13:15 -0700)]
Remove placeholder summary text in auto-rotate preference
- Remove the %s from xml and set it in code instead.
- This is hack to make search stop display %s. It's fixed properly in
master but we don't want to cherry-pick the master change because of its
size and risk.
Bug:
36101902
Test: rerun robotests
Change-Id: I0e03957532b265c15d5cc0754396aea26e5cd8a1
Merged-In: If42cceb74296814311eb0eff8e26b4a48a1c4d29
OSDN Git Service
