Alison Cichowlas
b9a2d6a6e3
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
2017-05-10 18:42:54 +00:00
Alison Cichowlas
28543f82f9
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
2017-05-10 14:31:01 -04:00
jackqdyulei
d2ba0117fc
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
2017-05-10 11:18:10 -07:00
Daniel Nishi
154824f124
Merge "Fix the top summary layout." into oc-dev
2017-05-10 17:59:38 +00:00
Daniel Nishi
9a5bac7d5a
Merge "Add the badged icon for Movies & TV." into oc-dev
2017-05-10 17:59:09 +00:00
Matthew Fritze
bdba7ab697
Merge "Remove accessibility duplicates in settings search" into oc-dev
...
am: 8fc602fed8
Change-Id: Id19a964f26287a8f35a30ea33cf784deab088921
2017-05-10 05:24:56 +00:00
TreeHugger Robot
8fc602fed8
Merge "Remove accessibility duplicates in settings search" into oc-dev
2017-05-10 05:07:53 +00:00
Fan Zhang
7517975834
Merge "Update setting icon paddings to align with actionbar title" into oc-dev am: 8ff8b5e95b
...
am: 1b628ea972
Change-Id: I9ee3528030f56d2a7acab0d599c71c595ab87031
2017-05-10 03:18:53 +00:00
Fan Zhang
1b628ea972
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
...
am: 8ff8b5e95b
Change-Id: I60efa39b81e3f54f6e3e9c37f45c751dbb48966c
2017-05-10 03:02:21 +00:00
TreeHugger Robot
95e60e9816
Merge "Add support to show first impression type suggestions"
2017-05-10 01:53:32 +00:00
Fan Zhang
031c838162
Update setting icon paddings to align with actionbar title
...
Change-Id: I2aaf37c61ee6098329a9dd5695c516f3db970ada
Fix: 38011653
Test: visual
2017-05-10 00:48:24 +00:00
Fan Zhang
7afbf0f3a2
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
2017-05-09 14:20:43 -07:00
Amin Shaikh
dfa9bb8914
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
This reverts commit 2c4b42c0b7
.
Reason for revert: Need to use Settings.Global.WIFI_NETWORKS_AVAILABLE_NOTIFICATION_ON to toggle the feature because system NotificationChannels cannot be disabled.
Bug: 37794067
Test: m RunSettingsRoboTests
Change-Id: I6aaad78686f4fe929fd6bcd94897341fdaf6bd23
2017-05-09 13:56:51 -07:00
TreeHugger Robot
4a0abee70e
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-09 18:25:53 +00:00
TreeHugger Robot
531163412c
Merge "Import translations. DO NOT MERGE"
2017-05-09 18:09:39 +00:00
TreeHugger Robot
33b55ef1ba
Merge "Remove accessibility duplicates in settings search"
2017-05-09 18:07:42 +00:00
Matthew Fritze
6ad5848775
Remove accessibility duplicates in settings search
...
Merge for: ag/2148817
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-09 09:17:13 -07:00
Bill Yi
d8f1255323
Import translations. DO NOT MERGE
...
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
2017-05-09 04:07:09 -07:00
Bill Yi
2bb189fe55
Import translations. DO NOT MERGE
...
Change-Id: I8bfce7755242dc89bb6a2ab277e874b3f92a1450
Auto-generated-cl: translation import
2017-05-09 03:56:50 -07:00
Fan Zhang
b3afa6e84f
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
...
am: ce7f36c799
Change-Id: I4bf3958e80286634dfc7d23f4133174d221be3b4
2017-05-09 01:44:00 +00:00
TreeHugger Robot
ce7f36c799
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
2017-05-09 01:25:18 +00:00
Daniel Nishi
89effe9cbf
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
2017-05-08 17:01:11 -07:00
Fan Zhang
0498d4e864
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev am: 2dbc30dc58
...
am: df2ecdf3f0
Change-Id: Ie616f506702d2732d62b8a2ea02a4b7d52bdf0eb
2017-05-08 23:15:04 +00:00
Fan Zhang
df2ecdf3f0
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
...
am: 2dbc30dc58
Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
2017-05-08 23:08:31 +00:00
TreeHugger Robot
2dbc30dc58
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
2017-05-08 22:59:06 +00:00
Doris Ling
56428a599f
Merge "Add summary placeholder to data saver preference." into oc-dev am: a3c4339299
...
am: 06b670e4df
Change-Id: I1746fbdfeea5a1f807bfe3b7bf7b5847a298aa2e
2017-05-08 22:55:50 +00:00
Daniel Nishi
24077d899f
Add the badged icon for Movies & TV.
...
The work profile was missing the icon.
Change-Id: I005cc2baecfe86479156e19e0c4ec4b586336cff
Fixes: 38132211
Test: Settings robotest
2017-05-08 14:13:13 -07:00
Doris Ling
06b670e4df
Merge "Add summary placeholder to data saver preference." into oc-dev
...
am: a3c4339299
Change-Id: Ia9ab661f1e870764c8e13c945389d734cbee14d4
2017-05-08 21:04:28 +00:00
TreeHugger Robot
a3c4339299
Merge "Add summary placeholder to data saver preference." into oc-dev
2017-05-08 20:43:56 +00:00
Fan Zhang
966be254ab
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
2017-05-08 13:37:07 -07:00
Fan Zhang
86d4d51b62
Fix PrefCategory layout to align text with actionbar title
...
Change-Id: I2716a92e2802e3ff01d4e550dae96e689d4370ff
Fix: 38011653
Test: visual
2017-05-08 13:03:46 -07:00
Fan Zhang
8b422ba448
Merge "Remove summary template in sleep timeout setting." into oc-dev am: 014ff46fa6
...
am: f7ba1e7209
Change-Id: I867a5237475be372bcc183b038c9539a3c4a8087
2017-05-08 19:14:59 +00:00
Fan Zhang
f7ba1e7209
Merge "Remove summary template in sleep timeout setting." into oc-dev
...
am: 014ff46fa6
Change-Id: I9f9e924be57552eebfe5d8bff5463182463f6845
2017-05-08 19:08:20 +00:00
TreeHugger Robot
014ff46fa6
Merge "Remove summary template in sleep timeout setting." into oc-dev
2017-05-08 18:57:57 +00:00
Matthew Fritze
7ae3c078b6
Remove accessibility duplicates in settings search
...
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I46e79051d10c4cae851f8e76304e6cfe0a3f73d4
Merged-In: Idda6d2f98cb8d2cb91a9a4721b2ef84921f9056a
2017-05-08 18:34:43 +00:00
TreeHugger Robot
fa4f30e09f
Merge "Use a SwitchPreference for auto-rotate instead"
2017-05-08 18:22:30 +00:00
TreeHugger Robot
0ba42b0eac
Merge "Use framework pref layout for SwitchPreference"
2017-05-08 17:31:10 +00:00
Fan Zhang
670410c04e
Use a SwitchPreference for auto-rotate instead
...
- Change the UI to SwitchPreference
- Remove old string used by DropDownPreference
- Attach listener to monitor setting change
Change-Id: If42cceb74296814311eb0eff8e26b4a48a1c4d29
Fix: 35959797
Test: robotests
2017-05-06 10:42:37 -07:00
Fan Zhang
e1c68df27e
Use framework pref layout for SwitchPreference
...
Test: manual
Change-Id: Id9add8d5669cbb34e93c9bfd2e25e75d9cc56a56
2017-05-06 09:43:25 -07:00
Roozbeh Pournader
16db0413f1
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev am: 869d246021
...
am: 6b06aa1099
Change-Id: I3db0d2e88659b4cd1822a368845b9179521a69e6
2017-05-06 01:41:43 +00:00
Roozbeh Pournader
6b06aa1099
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
...
am: 869d246021
Change-Id: Idb17d5f38526c926ddf2d0ca55d30f806c52d574
2017-05-06 01:39:29 +00:00
TreeHugger Robot
869d246021
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
2017-05-06 01:34:47 +00:00
TreeHugger Robot
52836c2191
Merge "Tether screen cleanup"
2017-05-05 22:27:58 +00:00
Suprabh Shukla
3dea2a9654
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev am: 43083b4332
...
am: 3cadb80e8d
Change-Id: I6503c03ce91af9c3059135160abcdebe8d6fd6b8
2017-05-05 21:02:10 +00:00
Suprabh Shukla
3cadb80e8d
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
...
am: 43083b4332
Change-Id: I0df3898794b7bc7d5f31a33dbe4363e7502edb5c
2017-05-05 20:56:10 +00:00
TreeHugger Robot
43083b4332
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
2017-05-05 20:48:50 +00:00
TreeHugger Robot
4ae7816fb6
Merge "Revert "Remove custom layout for expandpreference.""
2017-05-05 20:41:49 +00:00
Fan Zhang
cdca63c4c7
Remove summary template in sleep timeout setting.
...
The template causes incorrect display in search, and it's not
needded by anyone in code.
Bug: 36101902
Test: rerun robotests
Change-Id: Ib399e15c799e08d377b124e88eda0b8f13494ed3
2017-05-05 13:40:36 -07:00
Roozbeh Pournader
15bebece94
Fix bidi direction of dialog and bidi-wrap service name
...
Previously, the name of the service being in a different direction
from the locale could cause bidi artifacts.
Now, we explicitly set the direction of the dialog to the locale, and
bidi-wrap the service name.
Test: Manual
Change-Id: I563299866b24a4ce90fa2d09781aa269d8de2edd
Fixes: 37761152
2017-05-05 13:40:05 -07:00
TreeHugger Robot
658599328e
Merge "Change the logic for showing "App info" vs "show more""
2017-05-05 18:36:42 +00:00