Commit Graph

12043 Commits

Author SHA1 Message Date
Julia Reynolds
5b1bc2acad Merge "Notification settings, importance and pre-O apps" into oc-dev am: 6393e1752f
am: 237eb88434

Change-Id: Ie8c6262c35b79259974ffe069b37b2e6d2507b50
2017-05-12 12:28:35 +00: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
1383a9e882 Revert "Update "Open networks available" toggle to instead open notification channel preferences." am: dfa9bb8914
am: c3666f1c35

Change-Id: I1a7446265677c35ef6d000a77383916d584a3a72
2017-05-12 09:00:24 +00:00
Matthew Fritze
031bb4e3a5 Merge "Remove dynamic summaries for "On the lockscreen"" into oc-dev am: b38c1e5353
am: 01f5f5d5c9

Change-Id: I2eebd4c6d7b7452d419d02df2dc378bc6847901b
2017-05-12 08:59:41 +00:00
Chris Wren
fed86ddf91 Merge "add a global control for badging" into oc-dev am: 1425b91bac
am: aebf049b4f

Change-Id: I68417e74c7a46cf6283529f17a5f3f9d5547354a
2017-05-12 08:59: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
TreeHugger Robot
631120f1ad Merge "Add bluetooth visible item" 2017-05-11 23:45:29 +00:00
TreeHugger Robot
eb9c9fb569 Merge "Refactor choose lock password scrolling" 2017-05-11 22:41:15 +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
Maurice Lam
c41e408aea Refactor choose lock password scrolling
Replace the negative margin + inset background hack with a overriding
call to requestRectangleOnScreen, which will also make a best effort
to show all the password requirements if there are multiple of them.

Bug: 38236574
Test: Added ScrollToParentEditTextTest
Change-Id: Id570652b64434b2d0b25c231540375d93884aaa9
2017-05-11 19:26:12 +00: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
jackqdyulei
ae86781edd Add bluetooth visible item
Show "Visible as [Device name]". Also remove the menuitem for
changing device name.

This cl creates a preference controller to handle the logic for
device name preference.

Bug: 35876447
Test: RunSettingsRoboTests

Change-Id: I9ab6c9d2df5b053d15b8ff887073ef82616243a4
2017-05-11 11:12:25 -07:00
Bill Yi
57fa84ccfd Import translations. DO NOT MERGE
Change-Id: I7847ecf70524ecfc31bc2a661d7d4630b5e980b3
Auto-generated-cl: translation import
2017-05-11 11:10:10 -07: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
Roozbeh Pournader
d0f3d716a3 Merge "Set textDirection of app name to locale direction" into oc-dev am: 319250b1eb
am: 3a32750ee6

Change-Id: Ic6c6e8eb3e1bf0d5597e0d9e83b327265c847b3b
2017-05-11 01:04:05 +00:00
Alison Cichowlas
74dd8bd3fb 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
2017-05-11 00:53:19 +00:00
Daniel Nishi
123afeae2d Merge "Fix the top summary layout." into oc-dev am: 154824f124
am: 4bff3e9841

Change-Id: I5b63fe9eca62a4c3a06206ebc1dfcd63e5b080bc
2017-05-11 00:52:43 +00:00
Daniel Nishi
2c00b770eb Merge "Add the badged icon for Movies & TV." into oc-dev am: 9a5bac7d5a
am: a3349519d5

Change-Id: I0024eee4c96f8193d3a8eb94b6199d344c5c6f5d
2017-05-11 00:52:07 +00: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
Lei Yu
7932d5a66f Merge "Expose mac address in bluetooth main page" 2017-05-10 20:42:03 +00: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
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