Julia Reynolds
6393e1752f
Merge "Notification settings, importance and pre-O apps" into oc-dev
2017-05-12 12:14:11 +00:00
Amin Shaikh
c3666f1c35
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
am: dfa9bb8914
2017-05-12 06:48:04 +00:00
Matthew Fritze
01f5f5d5c9
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
...
am: b38c1e5353
2017-05-12 06:46:32 +00:00
Chris Wren
aebf049b4f
Merge "add a global control for badging" into oc-dev
...
am: 1425b91bac
2017-05-12 05:57:49 +00:00
TreeHugger Robot
b747be0769
Merge changes from topic 'onarevert' into oc-dev
...
* changes:
Update "Open networks available" setting.
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
2017-05-12 04:40:27 +00:00
TreeHugger Robot
b38c1e5353
Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
2017-05-12 02:04:38 +00:00
Chris Wren
485e75e063
add a global control for badging
...
Bug: 36021111
Test: make RunSettingsRoboTests
Change-Id: I7ffd2ade4c927d261e302ddadfae486040d62824
2017-05-11 17:22:32 -04:00
Matthew Fritze
03dfa50996
Replace dynamic summary text for SettingPref
...
All SettingPrefs that have dynamic summaries are replaced
by placeholder text. Changes are for:
- Battery Saver "Turn on automatically"
- Notification "Dock speaker plays"
- Notification "Emergency tone"
Bug: 36101902
Test: make RunSettingsRoboTests
Change-Id: Ic2556055c155989015dbef6b507d3e3b45b779b5
2017-05-11 12:11:05 -07:00
Julia Reynolds
2f0547c783
Notification settings, importance and pre-O apps
...
- Show pre-O settings for the misc channel, should the app still have it
(versus the full channel settings)
- Fix the importance summmary text in various places
- Update the color of the blocked description text
- Fix what fields appear/disappear based on blocked status and importance
Fixes: 38177887
Bug: 38120923
Fixes: 38012300
Fixes: 37923612
Test: manual, with an O app, a pre O app that has channels, and a pre-O
app with no channels
Change-Id: I42965b81b795e8fb427f857c7766fe5480a99f2e
2017-05-11 14:48:17 -04:00
Matthew Fritze
e2cb72fa7f
Remove dynamic summaries for "On the lockscreen"
...
Bug:36101902
Test: make RunSettingsRoboTests
Change-Id: Ie004f07f4c543a99c2b2ad1e5d7c8b2ef49246d5
2017-05-11 08:54:31 -07:00
TreeHugger Robot
f1730bee90
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-11 00:30:32 +00:00
Roozbeh Pournader
3a32750ee6
Merge "Set textDirection of app name to locale direction" into oc-dev
...
am: 319250b1eb
2017-05-11 00:21:06 +00:00
Alison Cichowlas
16bc088c4e
Merge "Notifications settings updates to match spec: - change badge language & remove summary - change caps on sound text" into oc-dev
...
am: b9a2d6a6e3
2017-05-11 00:19:46 +00:00
Daniel Nishi
4bff3e9841
Merge "Fix the top summary layout." into oc-dev
...
am: 154824f124
2017-05-11 00:19:20 +00:00
Daniel Nishi
a3349519d5
Merge "Add the badged icon for Movies & TV." into oc-dev
...
am: 9a5bac7d5a
2017-05-11 00:18:53 +00:00
Roozbeh Pournader
319250b1eb
Merge "Set textDirection of app name to locale direction" into oc-dev
2017-05-10 23:23:46 +00:00
Bill Yi
dfdad31e93
Import translations. DO NOT MERGE
...
Change-Id: I4a7428ff3dd2681fabcade2cd507c5ac06b78ad5
Auto-generated-cl: translation import
2017-05-10 13:48:13 -07:00
Roozbeh Pournader
e1e45d02c1
Set textDirection of app name to locale direction
...
Test: Manual
Fixes: 37347408
Change-Id: Icc01f3fdcf584c839cbbff151696171fb3c33c90
2017-05-10 12:56:20 -07:00
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
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
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
1b628ea972
Merge "Update setting icon paddings to align with actionbar title" into oc-dev
...
am: 8ff8b5e95b
2017-05-10 03:02:21 +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
Amin Shaikh
dfa9bb8914
Revert "Update "Open networks available" toggle to instead open notification channel preferences."
...
This reverts commit 2c4b42c0b7
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
Bill Yi
d8f1255323
Import translations. DO NOT MERGE
...
Change-Id: I52f644bcc6958725b0a600a46a7b27b1b8b000d7
Auto-generated-cl: translation import
2017-05-09 04:07:09 -07:00
Fan Zhang
b3afa6e84f
Merge "Remove placeholder summary text in auto-rotate preference" into oc-dev
...
am: ce7f36c799
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
df2ecdf3f0
Merge "Fix PrefCategory layout to align text with actionbar title" into oc-dev
...
am: 2dbc30dc58
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
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
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
f7ba1e7209
Merge "Remove summary template in sleep timeout setting." into oc-dev
...
am: 014ff46fa6
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
Roozbeh Pournader
6b06aa1099
Merge "Fix bidi direction of dialog and bidi-wrap service name" into oc-dev
...
am: 869d246021
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
Suprabh Shukla
3cadb80e8d
Merge "Adding SecureTouchListener to DeviceAdminAdd" into oc-dev
...
am: 43083b4332
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
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
2dcbda8004
Merge "Import translations. DO NOT MERGE" into oc-dev
2017-05-05 11:58:06 +00:00
Bill Yi
566095ecf9
Import translations. DO NOT MERGE
...
Change-Id: I7a4ac37a8286e8f977d70b26a11ee83105b611cf
Auto-generated-cl: translation import
2017-05-04 23:26:52 -07:00
