Commit Graph

1627 Commits

Author SHA1 Message Date
Jason Monk
84f544a2ae resolve merge conflicts of 167f6cc to nyc-mr1-dev-plus-aosp
Change-Id: Ida721b92e461811fdca7bc556de0f56cb348fcbc
2016-06-08 15:28:48 -04:00
Jason Monk
167f6cc87c Merge \"Remove PreferenceActivity\" into nyc-dev
am: 7f7092c705

Change-Id: I1d7431bd7bf4654f2fbfe8c43344e22d28b5b2f7
2016-06-08 19:15:42 +00:00
Jason Monk
b7e4380cd2 Remove PreferenceActivity
Its broken and isn't worth maintaining, instead port the few things
using it over to SettingsPreferenceActivity with wrapping blank
Activities like the rest of Settings.

Change-Id: Ic82f0dcb63ed9b4078f7da6a79c0c52f0130e8d1
Fixes: 28779941
2016-06-08 09:48:58 -04:00
Makoto Onuki
26db302e41 Fix RTL layout am: 3a87050921
am: a8a8167ebb

* commit 'a8a8167ebb0f89962fbe31aa77e3af2aa50258ec':
  Fix RTL layout

Change-Id: Ifdcaf3aefbcb0e143960d6cdbb184a2f285de343
2016-06-03 15:42:45 +00:00
Makoto Onuki
a8a8167ebb Fix RTL layout
am: 3a87050921

* commit '3a87050921f78e0882893bc343e49b8bb1b34975':
  Fix RTL layout

Change-Id: Ic758b78742843261a92f9f87bc2f602223955e8e
2016-06-03 15:33:57 +00:00
Makoto Onuki
3a87050921 Fix RTL layout
Bug 29072224

Change-Id: I414d868b4256e034850a873511bf34d9430842dc
2016-06-02 17:52:17 -07:00
Tony Mak
2abfd032d5 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev am: ffb10f8156
am: caeb93ceda

* commit 'caeb93ceda8bb07c015025a00714241a78a42976':
  Fix RTL issue in Trusted Credentail page

Change-Id: I603af8b3455cba99ee8bde3c9dce805b59c10c51
2016-06-01 09:48:27 +00:00
Tony Mak
0b86c6bcc6 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: I0d5504ccca59ee03b7ad8efbd26128f394721b82
2016-06-01 09:44:06 +00:00
Tony Mak
caeb93ceda Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev
am: ffb10f8156

* commit 'ffb10f8156b42261340362ee440002dd7f0a5c5b':
  Fix RTL issue in Trusted Credentail page

Change-Id: Ib91896687a2c5297ae9f1454b0b7729e2dd670a7
2016-06-01 09:44:06 +00:00
Tony Mak
ffb10f8156 Merge "Fix RTL issue in Trusted Credentail page" into nyc-dev 2016-06-01 09:36:51 +00:00
Tony Mak
fe0ce01da7 Fix RTL issue in Trusted Credentail page
Two changes are required to fix the issue.
1. The width of the textview needed to be wrap_content in order
   to resolve the random issue. I guess it is a framework bug, but
   anyway the UI looks the same after the change
2. textAlignment="viewStart" is needed to make the textview RTL
3. Clean up: Change the RelativeLayout to a vertical LinearLayout

Bug: 28757193
Change-Id: I1142d4dd31eb86b80f5a2316c1c7825df287b609
2016-05-31 19:53:49 +00:00
Andrew Sapperstein
59358568d0 Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev
am: 9ca09c020e

* commit '9ca09c020e561832cd2e4b5abd43c839c461c240':
  Remove the last vestiges of #ff009587.

Change-Id: Iac6ec5047f88b277d313b98c19c4eac4ddce626f
2016-05-31 18:43:59 +00:00
Andrew Sapperstein
9ca09c020e Merge "Remove the last vestiges of #ff009587." into nyc-mr1-dev 2016-05-31 18:38:07 +00:00
Anna Galusza
92f200b09c Merge "Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740" into nyc-mr1-dev
am: bab65d9fc4

* commit 'bab65d9fc41836624bf385898ad21ca14d2f72fe':
  Change Nav bar style to use system nav (new style for Nexus N+) Bug: 27612740

Change-Id: Icb6c321b7382fe3816cde21e9db72b07f7ba0084
2016-05-31 16:45:39 +00:00
Anna Galusza
6b1e9dbea4 Change Nav bar style to use system nav (new style for Nexus N+)
Bug: 27612740

Change-Id: I309cf8252285130a0e1d2c03ca664706e73cce16
2016-05-27 18:21:54 -07:00
Julia Reynolds
af2e6d69a6 Importance slider updates.
am: 9782079130

* commit '9782079130fb6dd3a83bedde31afa4df6a03b63c':
  Importance slider updates.

Change-Id: I267f2237a759b9f86a1b507b1d627ce5367c6cfe
2016-05-27 15:18:08 +00:00
Julia Reynolds
9782079130 Importance slider updates.
Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-27 10:00:46 -04:00
Bart Sears
72167fe650 Revert "Importance slider updates."
This reverts commit 373a9e2fcf.

Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
2016-05-27 04:47:02 +00:00
Roozbeh Pournader
e0adabcd87 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
am: 24aa3b01af

* commit '24aa3b01af017c0d020a4e31ff88203f20140ce3':
  Force dashboard summary to single-line and ellipsize it

Change-Id: I16fb9f03066017c946fa787ca5b0214e1b9f64de
2016-05-27 04:05:46 +00:00
Julia Reynolds
b0f0d299cf Merge "Importance slider updates." into nyc-dev
am: 7c2c025e4f

* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
  Importance slider updates.

Change-Id: Ieb897d94383c401154fde35dc9bf94ca57ce1ca6
2016-05-27 04:04:31 +00:00
Bart Sears
690f712595 Revert "Importance slider updates."
This reverts commit 373a9e2fcf.

Change-Id: I3279163eb052f93cf6b87710c17cfa0c2eae56ba
2016-05-27 03:09:53 +00:00
Roozbeh Pournader
8208d69e34 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev am: 24aa3b01af
am: 49d704c228

* commit '49d704c228cfbae65546523db4a6fee3cdbbf5ea':
  Force dashboard summary to single-line and ellipsize it

Change-Id: I59c98ac0e5d79f4bfb00d2dbffb1d773a5d5d4f5
2016-05-27 00:30:00 +00:00
Julia Reynolds
034fb9184e Merge "Importance slider updates." into nyc-dev am: 7c2c025e4f
am: fe77548afc

* commit 'fe77548afc37b88fbba44febc18d276137b4c762':
  Importance slider updates.

Change-Id: I76c14c4dd5c50d790ec56e24932738e8b0601ccf
2016-05-27 00:27:40 +00:00
Roozbeh Pournader
49d704c228 Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev
am: 24aa3b01af

* commit '24aa3b01af017c0d020a4e31ff88203f20140ce3':
  Force dashboard summary to single-line and ellipsize it

Change-Id: If6a43255eb932c479031826caef353138bd35525
2016-05-27 00:20:42 +00:00
Andrew Sapperstein
517f14f3d8 Remove the last vestiges of #ff009587.
It was very close the proper colorAccent, so just use that everywhere.
This change updates the Memory Settings page and the running processes
page.

BUG: 28987891
Change-Id: I3895ae9b596125d7e4bda0d02f0686c87a75ead6
2016-05-26 17:18:38 -07:00
Roozbeh Pournader
24aa3b01af Merge "Force dashboard summary to single-line and ellipsize it" into nyc-dev 2016-05-27 00:11:47 +00:00
Roozbeh Pournader
5272b1cfd6 Force dashboard summary to single-line and ellipsize it
Previously, the summary could become multiline. In rare combinations
of text and screen width, to indicate to the user that the text is
cut, we now ellipsize it too. Finally, since the ellipsis can get
too close to the end of the line, we add a padding equal to the left
margin of the icon.

Bug: 28872122
Change-Id: I27226e5de7781cf096508ddbef4f9095961ce028
2016-05-26 16:48:12 -07:00
Julia Reynolds
fe77548afc Merge "Importance slider updates." into nyc-dev
am: 7c2c025e4f

* commit '7c2c025e4ff6b91ab3ab1e78e278a12a8051c542':
  Importance slider updates.

Change-Id: Ief2d1785b756e6dad315e286a28115b044174daf
2016-05-26 17:37:02 +00:00
Julia Reynolds
373a9e2fcf Importance slider updates.
Icon & tint.

Bug: 28911161
Change-Id: Ic56270c8803557863f914ee0eaf6801f1341387d
2016-05-26 11:08:16 -04:00
Maurice Lam
433671278f Merge "Update button styles in fingerprint setup" into nyc-mr1-dev
am: 92d90a9df0

* commit '92d90a9df0c1c19a6682f105c3f48c4d0f8ac130':
  Update button styles in fingerprint setup

Change-Id: I4f825bf184213205d0a54fa9fe26274be1a31ede
2016-05-26 00:09:05 +00:00
Maurice Lam
92d90a9df0 Merge "Update button styles in fingerprint setup" into nyc-mr1-dev 2016-05-25 23:56:37 +00:00
Maurice Lam
558c82ffd8 Update button styles in fingerprint setup
Bug: 28888250
Change-Id: I2f9e7b4c886f27deac6b42860452a3fa0006facd
2016-05-25 15:25:13 -07:00
Andrew Sapperstein
4a8586cfe6 Merge "More theming fixes." into nyc-mr1-dev
am: 9341ac980e

* commit '9341ac980e29e6a692c4c3a61096fabbd35c9902':
  More theming fixes.

Change-Id: Id18687881ca1529f10266c58dbc8f16a42b62c33
2016-05-25 19:54:34 +00:00
Andrew Sapperstein
7232e4f7ee More theming fixes.
Updated the importance seekbar to use colorAccent instead of a hardcoded
color.

Refactored the various gear icons to all use ic_settings (a rename of
ic_bt_config). Deleted the png version (ic_sysbar_quicksettings).

Cleaned up the add icon. Now there are two vector drawables (one white,
one tinted with the accent color). Deleted the existing pngs and updated
the usages to use one of the two vector drawables. Deleted the theme
attr for ic_menu_add that had no usages.

BUG: 28760785

Change-Id: Icd5561d5b3f5ddee8aab78a3da7daa2dca0e30e3
2016-05-25 10:55:11 -07:00
Andrew Sapperstein
38972c3809 Merge "Refactor Settings theme colors." into nyc-mr1-dev
am: 076731b825

* commit '076731b8258bb9ed40cfef55c77c69f71fc86331':
  Refactor Settings theme colors.

Change-Id: I520678bf558b33476b705fb7d48a54ecd9b1b5fc
2016-05-24 21:25:50 +00:00
Andrew Sapperstein
8dd11327b6 Refactor Settings theme colors.
Introduces stock colors (primary_color, primary_dark_color, etc) to allow
overriding the colors via resource overlays.

Creates new colorSecondary attribute and updates switches to use theme
attributes for foreground/background colors rather than hardcoded values.

Some other mild color cleanup to make things more straightforward.

BUG: 28760785
Change-Id: I4deba962357217bdb2e08c08e8f83b9b57a683d4
2016-05-24 12:49:17 -07:00
Maurice Lam
534d856458 Merge "Update margins to match specs" into nyc-mr1-dev
am: 3b15d6234d

* commit '3b15d6234dc9097869030c1e5e2b26a9b34d1f19':
  Update margins to match specs

Change-Id: Iceacbab85dd0697708ddfad1b95b9faccae11a2d
2016-05-24 00:54:11 +00:00
Maurice Lam
3b15d6234d Merge "Update margins to match specs" into nyc-mr1-dev 2016-05-24 00:45:15 +00:00
Maurice Lam
b357e4a81a Update margins to match specs
- Update settings to use GLIF versions for margins and styles
- Removed learn more link from AOSP Fingerprint intro screen because
  it won't have a link to show.

Bug: 28885476
Change-Id: I5d2fd730a1bca2c5da8626da066da3a3f03b4428
2016-05-23 14:51:22 -07:00
Daniel Nishi
f16b8be7b4 Merge "Materialize the button bar in the Deletion Helper." into nyc-mr1-dev
am: 64b25588b7

* commit '64b25588b7aa1f377ffb1585c1a9f07c1705b7f0':
  Materialize the button bar in the Deletion Helper.

Change-Id: Iece17635fc4c7a0ffd112381068b39a84bc3daeb
2016-05-23 20:28:56 +00:00
Daniel Nishi
5af567eca7 Materialize the button bar in the Deletion Helper.
Older Android style buttons were used for the bottom button bar.
By changing them to use the buttonBarBottomStyle, they are updated
to flat buttons. The bottom button bar for settings preference
fragments now more closely tracks the Material Design spec as seen
here in [0].

The other Settings views which use the button bar buttons are the
Redaction settings and WiFi network picker in some contexts. These
should be unaffected as they are based on the SettingsActivity,
rather than the SettingsFragment, and inflate a different view.

[0] https://material-design.storage.googleapis.com/publish/material_v_8/material_ext_publish/0B7WCemMG6e0VaDdZWXpLXzNicjg/components_buttons_usage6.png

Bug: 28845586
Change-Id: I9ea55aa2fe1e76f8f952880675501cbb0f76719d
2016-05-20 16:34:59 -07:00
Fan Zhang
9821904876 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev
am: de188186d8

* commit 'de188186d877b178c82c7f6e6d674e13d99ccdfa':
  Display disclaimer dialog before starting support.

Change-Id: Ic5e6246e312d66ea178aec8986e5e293d49b08c6
2016-05-19 20:45:14 +00:00
TreeHugger Robot
de188186d8 Merge "Display disclaimer dialog before starting support." into nyc-mr1-dev 2016-05-19 20:41:18 +00:00
Fan Zhang
a2bd32b397 Display disclaimer dialog before starting support.
Bug: 28656426
Bug: 28141203
Change-Id: I4fc0d922170badcf5f215fe906fb616c11cf8270
2016-05-19 12:15:38 -07:00
Pankaj Kanwar
2a0f73ab89 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev am: 4dd2fdf90b
am: edb9f49afe

* commit 'edb9f49afeabec1c1df7e1509c4f2f5567cc075a':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I78d24c405566eaa5da282bbb2042d0c6f0d3cf40
2016-05-17 22:36:03 +00:00
pkanwar
edb9f49afe Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
am: 4dd2fdf90b

* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I92577a0d913f0b8436df28708dc6d84c5c82c01a
2016-05-17 22:31:17 +00:00
pkanwar
23e8435899 Merge "Choose Bluetooth Device window cant\'t fill screen" into nyc-dev
am: 4dd2fdf90b

* commit '4dd2fdf90b97b64931cbb1c7ca69b38cef58662e':
  Choose Bluetooth Device window cant't fill screen

Change-Id: I3134f37ab8e0ac3e7367d26141c4a882051e8652
2016-05-17 22:31:15 +00:00
Pankaj Kanwar
4dd2fdf90b Merge "Choose Bluetooth Device window cant't fill screen" into nyc-dev 2016-05-17 22:16:49 +00:00
pkanwar
956597eaf8 Choose Bluetooth Device window cant't fill screen
b/28684861: fixed the layout file to ensure that the separators cover
the entire screen.

Change-Id: I4471a1da901c9a4c0830ff0dfc943cd087ee1702
2016-05-17 12:03:42 -07:00
Shweta Chahar
b30db5ebd9 Merge "Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element." into nyc-dev am: 1cb87b2af5
am: b34112820a

* commit 'b34112820a7dcee3a85a8e7163b194f614a9e840':
  Modify the TTS engine preference UI so that the radio button and the TTS engine name are a single focusable element.

Change-Id: Ie097c2500e58c7cf6472b3f8962c59f376f8b6bf
2016-05-17 14:34:55 +00:00