Commit Graph

2162 Commits

Author SHA1 Message Date
Fan Zhang
8d62516e89 Merge "Misc fixes for notification" into oc-dev
am: e3f322dfc7

Change-Id: I0847813623ad35b38eafc73a69f02d45208e8d32
2017-06-19 14:47:34 +00:00
Fan Zhang
470e79a286 Misc fixes for notification
- Tweak alignment for footer preference icon and text
- Hide app info button from app notification settings header

Merged-In: I10803e78fe4f30c2d84ec795c343ed660aab7762
Change-Id: Ia95fc30025c042635ad6467c7fde51991b0c47d9
Fix: 62138362
Fix: 62708686
Test: visual and runtest --path AppNotificationSettingsTest.java
2017-06-16 15:27:51 -07:00
Andrew Sapperstein
b5fb71acc6 Merge "Revert "Initial search bar implementation."" into oc-dev
am: dfc1983601

Change-Id: I6c143b18b53857accac23d7c64f807c6987609a5
2017-06-06 19:10:43 +00:00
TreeHugger Robot
dfc1983601 Merge "Revert "Initial search bar implementation."" into oc-dev 2017-06-06 19:04:26 +00:00
Andrew Sapperstein
93adcee630 Merge "Revert "Add search bar to SearchActivity."" into oc-dev
am: 37f87b6c64

Change-Id: Icbdb586e3e1a35c004298f50a57812e50ee73eea
2017-06-06 19:00:04 +00:00
TreeHugger Robot
37f87b6c64 Merge "Revert "Add search bar to SearchActivity."" into oc-dev 2017-06-06 18:42:25 +00:00
Andrew Sapperstein
a0e816d9d3 Revert "Initial search bar implementation."
This reverts commit 14934599dd.

Bug: 37477506
Change-Id: I510b9a71dd3f19a3d2194da1f4d8f8060d0a4935
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
2017-06-06 17:30:17 +00:00
Andrew Sapperstein
61353aa4fd Revert "Add search bar to SearchActivity."
This reverts commit fac61b71e5.

Bug: 37477506
Change-Id: I1ee66999fbb28b03feb5a51c7146f31a71c1252a
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-06 17:29:41 +00:00
Lei Yu
f2379e2ed3 Merge "Refine the ProgressCategory" into oc-dev
am: 5f4f1b81af

Change-Id: I2b0fda608b8fe33eaa8ba6e7580c3becc1ebad71
2017-06-02 17:13:55 +00:00
Lei Yu
5f4f1b81af Merge "Refine the ProgressCategory" into oc-dev 2017-06-02 17:08:45 +00:00
jackqdyulei
d5e20e14af Refine the ProgressCategory
1. Make the progressbar align with settings gear
2. Make text vertical center

Bug: 37190885
Test: Screenshot
Change-Id: Ib69b949179a0e097b78717cbe93c39aa0064ea9e
2017-06-01 15:48:56 -07:00
Andrew Sapperstein
0a35757003 Merge "Add search bar to SearchActivity." into oc-dev
am: fbc9035bcd

Change-Id: I63823bc03fe97fe683c9775b1b28f5cc770ae4e7
2017-06-01 22:17:44 +00:00
TreeHugger Robot
fbc9035bcd Merge "Add search bar to SearchActivity." into oc-dev 2017-06-01 22:02:32 +00:00
Andrew Sapperstein
9448f68171 Merge "Initial search bar implementation." into oc-dev
am: 91fe76263f

Change-Id: I7e6921134a239e136aaf6380ab4d7993e943435a
2017-06-01 20:01:49 +00:00
Andrew Sapperstein
91fe76263f Merge "Initial search bar implementation." into oc-dev 2017-06-01 19:52:07 +00:00
Andrew Sapperstein
fac61b71e5 Add search bar to SearchActivity.
Styling doesn't look exactly right yet but there's a bar.
Creates an ItemDecoration to add a spacer above the first view.

Removes the action bar and replaces it with a SearchView
inside of a CardView.

Remaining work: pixel pushing

Bug: 37477506
Test: make RunSettingsRoboTests
Change-Id: Ibf38c3c2725551bc4cd90e98d0020ec49c2eab2b
Merged-In: I4a0f0c91c51ff5820b61a596520d80a3337c3466
2017-06-01 11:02:56 -07:00
Andrew Sapperstein
14934599dd Initial search bar implementation.
Replaces the default Toolbar in SettingsActivity with one that looks
like a search bar. It uses a Toolbar inside a CardView with some custom
styling.

Since the search bar is a floating element, the new toolbar lives in the
content frame of the dashboard. A FrameLayout is used to provide the
layering that is desired.

Since the search bar is on top, an additional spacer view is added to
the list of items in the dashboard. Its color changes based on what
the first view is so that it always matches.

Adds android-support-v7-cardview as a dependency (and reorders the
other deps to be in alphabetical order).

Remaining work (in future CLs):
- remove search menu option?
- clean up initial window
- remove the line between the header and the first condition
       when there's a condition

Change-Id: I627b406735c8e2280ac08f44ca32f7098621a830
Merged-In: Id7477b90fbaf30eb5cac1ee244c847bddb95b3fd
Bug: 37477506
Test: make RunSettingsRoboTests
2017-05-31 14:03:26 -07:00
Hugo Benichi
5716f6cc7e Merge "Wifi details page: sign-in uses primary color" into oc-dev
am: 0c5573a0e3

Change-Id: I9e67f7a6d957a062d549f12133fd8f42bc83d187
2017-05-31 00:27:43 +00:00
Hugo Benichi
0c5573a0e3 Merge "Wifi details page: sign-in uses primary color" into oc-dev 2017-05-31 00:16:43 +00:00
Hugo Benichi
484140ba6e Wifi details page: sign-in uses primary color
Test: tested with nearby captive portals
Bug: 36203355
Bug: 36656914
Change-Id: I726f1226862150ba6875c20f919df91ca8043335
2017-05-29 22:22:27 +09:00
Christine Franks
f51db28428 Merge "Align settings seekbar to match other preferences" into oc-dev
am: 532a88dcd0

Change-Id: I32e55dbc14a1da1237d7cee061b832524954c56f
2017-05-26 20:18:28 +00:00
Christine Franks
e85452fc7f Align settings seekbar to match other preferences
Change preference_widget_seekbar_settings start padding to 56dp
to match the updated standard.

Bug: 62104638
Test: manual - verify layout of night display intensity and a11y
TTS sliders.

Change-Id: I3eba7e04f7e6a2a4484e89cac3526dd23275b299
2017-05-26 10:50:06 -07:00
Daniel Nishi
4525f9387a Merge "Fix storage summary background colors." into oc-dev
am: 8b8f27cd06

Change-Id: I821d4a44c69bae33e3ae9854f23ed87e51139951
2017-05-23 17:41:21 +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
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
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
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
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
Roozbeh Pournader
319250b1eb Merge "Set textDirection of app name to locale direction" into oc-dev 2017-05-10 23:23:46 +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
Daniel Nishi
154824f124 Merge "Fix the top summary layout." into oc-dev 2017-05-10 17:59:38 +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
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
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

Change-Id: I0359be4c3f7dbc6093d74b56beb7b11f71dbb1d0
2017-05-08 23:08:31 +00: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
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
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
Daniel Nishi
88c721116b Merge "Tweak spacing for horizontal preferences." into oc-dev
am: b4937f4556

Change-Id: Ida558c9499e49a1498e4469140dc099ef754e093
2017-05-02 17:06:36 +00:00
Fan Zhang
0e4c59f7f6 Tweak spacing for horizontal preferences.
- Add minHeight to horizontal preference so they are not clustered
together.
- Wrap app_data_usage's into different categories so they don't rely on
SpacePreference to draw space and dividers.

Change-Id: Ieed90a39d48494d1207680483968b5733bdfb344
Fix: 37750568
Test: visual
(cherry picked from commit 9c93c28b5a)
2017-05-01 20:12:55 +00:00
Julia Reynolds
afebbacc12 Merge "App & channel notification settings updates" into oc-dev
am: 8e305ee536

Change-Id: I49e3c39f7796048335f19da176d6dec276051e79
2017-04-27 15:24:02 +00:00
Julia Reynolds
8e305ee536 Merge "App & channel notification settings updates" into oc-dev 2017-04-27 15:11:38 +00:00
Fan Zhang
c02cbe698b Merge "No autofill password when in PIN settings" into oc-dev
am: 3decc865dc

Change-Id: I927cb611ea6e426bf7a85d949aaae698639eac32
2017-04-26 21:10:23 +00:00
TreeHugger Robot
3decc865dc Merge "No autofill password when in PIN settings" into oc-dev 2017-04-26 21:05:04 +00:00
jackqdyulei
303672f1d3 Merge "Move battery stats loading to AsyncLoader." into oc-dev
am: d0ea1386ad

Change-Id: Ic9e7b20ab191224061a7c43f2292978daa43582e
2017-04-25 21:55:10 +00:00
TreeHugger Robot
d0ea1386ad Merge "Move battery stats loading to AsyncLoader." into oc-dev 2017-04-25 21:44:06 +00:00
jackqdyulei
106dc459e0 Move battery stats loading to AsyncLoader.
It takes 3-4 seconds to load the battery settings page in Ryu. Main
reason is that it takes too long to init BatteryStatsHelper.

This cl moves loading code to AsyncLoader, and we will refresh ui once
the loading part is finished.

Following cl will add animation for the battery header to make it not
so janky

Bug: 37196170
Test: RunSettingsRoboTest
Change-Id: I40dfdde4a072e28a56c8fdf0ec6d671b5109fc6d
2017-04-25 13:26:17 -07:00
Fan Zhang
7d04b2dab0 Merge changes I4ae01109,Ib45289c3 into oc-dev
am: eda3e8c3d9

Change-Id: I897373ce37fd8352edb27ef954b1dc7792ea7026
2017-04-25 20:22:45 +00:00
TreeHugger Robot
eda3e8c3d9 Merge changes I4ae01109,Ib45289c3 into oc-dev
* changes:
  Remove shadow below app info header.
  Fix ANR in installed app details.
2017-04-25 20:16:20 +00:00
Stephen Chen
ae7d423c74 Merge "Make connected Wi-Fi message multiline to avoid cutoff." into oc-dev
am: 6c85dbaea2

Change-Id: Ie4e338759eb5e926297aa2691161dbf7fe16199c
2017-04-25 18:53:07 +00:00