Commit Graph

11932 Commits

Author SHA1 Message Date
Matthew Fritze
5569e3a33f Merge "Remove Language and Input duplicates" into oc-dev
am: 6f4a6a737d

Change-Id: Id6639a9dc08c1a27cf1bc4ed7969cc54a4bd2df2
2017-05-19 00:49:41 +00:00
TreeHugger Robot
6f4a6a737d Merge "Remove Language and Input duplicates" into oc-dev 2017-05-19 00:41:04 +00:00
Daniel Nishi
af1a66202f Merge "Make Storage settings title be "Storage"." into oc-dev
am: c7299663e7

Change-Id: I2873188fb073261695d79719c99617a355f17acc
2017-05-18 22:07:24 +00:00
Daniel Nishi
c7299663e7 Merge "Make Storage settings title be "Storage"." into oc-dev 2017-05-18 21:57:22 +00:00
TreeHugger Robot
6253e0710b Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-18 20:05:21 +00:00
jackqdyulei
3ab2ca5cc9 Merge "Add screen usage string for battery settings" into oc-dev
am: 28cf04d994

Change-Id: Ie60e5de8164bfc16fa29ca16b63caa08812db52f
2017-05-18 19:25:57 +00:00
TreeHugger Robot
28cf04d994 Merge "Add screen usage string for battery settings" into oc-dev 2017-05-18 19:10:16 +00:00
Daniel Nishi
12dbce00c1 Fix storage summary background colors.
This changes the donut background color to a lighter blue and changes
the overall background to be a grey. Both of these colors match the
Battery implementation.

Bug: 35245772
Test: Manual
Change-Id: I8e12afe4434a0e2428384fc496cab5c05dc998ee
2017-05-18 11:36:10 -07:00
Daniel Nishi
0d03b88e91 Make Storage settings title be "Storage".
This more closely reflects the idea that the top level setting title
should match the actual screen title.

Change-Id: Ie7ab1756d799c182cad74041995768037bba710f
Fixes: 37923462
Test: Manual
2017-05-18 11:02:10 -07:00
Matthew Fritze
b97a1bffa8 Remove Language and Input duplicates
Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: Ifeb2a2d34a3efded3f0a9ba02ac76fd6f8ffd087
Merged-In: I8bc0776131fcac5a6edf7e8271bc53252c2fc719
2017-05-18 17:36:59 +00:00
Matthew Fritze
145c364479 Merge "Update no search results icon and move image to top of page" into oc-dev
am: fc4db3bd80

Change-Id: I6f387cf748a9e916e4ffd3312016b0a82e126ee2
2017-05-18 17:18:30 +00:00
TreeHugger Robot
fc4db3bd80 Merge "Update no search results icon and move image to top of page" into oc-dev 2017-05-18 17:11:29 +00:00
Bill Yi
63c87dabb6 Import translations. DO NOT MERGE
Change-Id: I79790dae43f96a35c56970f27acb47ba689f731e
Auto-generated-cl: translation import
2017-05-17 22:58:00 -07:00
Matthew Fritze
b4f2f81f27 Update no search results icon and move image to top of page
Change-Id: Ib57bdc49095091ff6e432be922da676806ee3e2f
Fixes: 36597112
Test: search for "aaa" and observe image
2017-05-17 16:24:27 -07:00
jackqdyulei
7548f1fa77 Add screen usage string for battery settings
In advanced battery page we still use "Used for"

Bug: 38328647
Test: Build & Screenshot
Change-Id: Ic194bfed45a76c811c431a13b5554f5bc978bca5
2017-05-17 13:14:45 -07:00
Matthew Fritze
a939959838 Merge "Remove duplicates from sound settings" into oc-dev
am: 3abeba07d3

Change-Id: Ief8e333082ef6d8064a51fc54b052e1476880a55
2017-05-17 18:51:14 +00:00
Matthew Fritze
af054e63e0 Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev
am: 4bd0f411ce

Change-Id: I680a407f9955e74b66e5c87af6b8a8d4335c530d
2017-05-17 18:50:28 +00:00
TreeHugger Robot
3abeba07d3 Merge "Remove duplicates from sound settings" into oc-dev 2017-05-17 18:29:54 +00:00
TreeHugger Robot
4bd0f411ce Merge "Remove Backup and Reset duplicates from Settings search" into oc-dev 2017-05-17 18:28:35 +00:00
Matthew Fritze
70db53a8d5 Merge "Remove Legal Information duplicate from Settings search" into oc-dev
am: 915f0cea5b

Change-Id: I508afeb3b832ffc444fa5dafe4836fc0ae202eb0
2017-05-17 17:26:07 +00:00
TreeHugger Robot
915f0cea5b Merge "Remove Legal Information duplicate from Settings search" into oc-dev 2017-05-17 17:17:14 +00:00
Matthew Fritze
f8b8ecebea Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev
am: bcb2565e05

Change-Id: I8a89b5a7676a9fb9961e4275c417a425baa5938e
2017-05-17 04:46:15 +00:00
TreeHugger Robot
bcb2565e05 Merge "Revert "Replace dynamic summary text for SettingPref"" into oc-dev 2017-05-17 04:34:02 +00:00
Matthew Fritze
8061aaef62 Revert "Replace dynamic summary text for SettingPref"
This reverts commit 03dfa50996.

Change-Id: I1f7188b35ad657f3d9721bab3bbdec697d3c1ae3
Bug: 36101902
Fixes: 38352100
2017-05-17 02:56:28 +00:00
Matthew Fritze
06976317cb Remove duplicates from sound settings
Duplicates include:
- Do not disturb preferences
- Block Visual Disturbances
- Emergency broadcasts

Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3de430b80fd11d7937d3bec908fbbaa6a176e785
2017-05-16 15:58:54 -07:00
Matthew Fritze
6fe35bb031 Remove Backup and Reset duplicates from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: I3539f9581939255d94ccf04134278414fbe9c72b
2017-05-16 15:43:21 -07:00
Matthew Fritze
2e89758b01 Remove Legal Information duplicate from Settings search
Bug: 33701673
Test: make RunSettingsRoboTests
Change-Id: Icee65b7a683ad80cd587e22a575b4abc4b009d8f
2017-05-16 15:39:03 -07:00
TreeHugger Robot
e11a4d4e86 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-05-16 18:29:40 +00:00
Bill Yi
dcdc60bab8 Import translations. DO NOT MERGE
Change-Id: Ia166bd3b3e8acd794f43e415b15edbb579c54573
Auto-generated-cl: translation import
2017-05-16 01:42:58 -07:00
Matthew Fritze
1f21e7f325 Merge "Replace dynamic summary text for SettingPref" into oc-dev
am: 49b86b5c6a

Change-Id: Icb21526f03242d310824d20a21c82bd2f76893f2
2017-05-16 00:12:07 +00:00
TreeHugger Robot
49b86b5c6a Merge "Replace dynamic summary text for SettingPref" into oc-dev 2017-05-15 23:46:18 +00:00
Bill Yi
3b2d98c714 Import translations. DO NOT MERGE
Change-Id: I2906d6bf999dccdec191f285f73e04fe52f4c2a4
Auto-generated-cl: translation import
2017-05-12 17:11:09 -07:00
Julia Reynolds
237eb88434 Merge "Notification settings, importance and pre-O apps" into oc-dev
am: 6393e1752f

Change-Id: Ibb9015ad5a77d18a41997712d969ab7bc68f7fad
2017-05-12 12:20:36 +00:00
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

Change-Id: I7e651b05a13d9c9149149d4161da440a9a0f31d6
2017-05-12 06:48:04 +00:00
Matthew Fritze
01f5f5d5c9 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev
am: b38c1e5353

Change-Id: Ia8323363dabd6937a33c6b53ea6755c904e776d4
2017-05-12 06:46:32 +00:00
Chris Wren
aebf049b4f Merge "add a global control for badging" into oc-dev
am: 1425b91bac

Change-Id: Iaf8eb302360f077b1629a170675ebc3f5e794fa6
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

Change-Id: I868f67c90626a39c3c0dd2f4107ab9bd755bb40c
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

Change-Id: I20c3fc6dc977145a9f9938c470ea69a393061000
2017-05-11 00:19:46 +00:00
Daniel Nishi
4bff3e9841 Merge "Fix the top summary layout." into oc-dev
am: 154824f124

Change-Id: I5f062c3d6d6df40c0e78f353f608c7efa7137c9f
2017-05-11 00:19:20 +00:00
Daniel Nishi
a3349519d5 Merge "Add the badged icon for Movies & TV." into oc-dev
am: 9a5bac7d5a

Change-Id: I59cea940381aa360be456c44afb36c58964c3065
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