Fan Zhang
7a56184063
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am: 5d3f6d566b
...
am: 16afefd509
Change-Id: Id24c066d913dcab8532b42211dad25e61e2dc0bd
2017-07-10 21:36:10 +00:00
Fan Zhang
16afefd509
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev
...
am: 5d3f6d566b
Change-Id: Ifd5f8aae85864e2a264ea76e28700cf82a0bfac5
2017-07-10 21:31:39 +00:00
Ajay Nadathur
8c6910e9d5
Update notification redaction interstitial according to spec
...
bug: 38395294
Test: Manually tested and verified
Change-Id: Iddd53af604c65bb8e40c081f9538535bd3043ad4
2017-07-10 14:24:42 -07:00
TreeHugger Robot
f74878dca3
Merge "Import translations. DO NOT MERGE"
2017-07-10 20:52:21 +00:00
Rajeev Kumar
af8f6beebb
Get rid of unused IconPreferenceScreen
...
Change-Id: Ia1e0f3caf80da27c895cbf85320129b7540d8b41
2017-07-10 13:46:50 -07:00
Fan Zhang
e67630ab16
Support multi line title for switch and edittext preferences
...
Change-Id: I898288a1e8c9d3bedae3f5f3269d4aa0fd2308f6
Fix: 63509156
Test: visual
2017-07-10 19:57:58 +00:00
Christine Franks
250595ae11
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev am: 8dc795d64b
...
am: 1be5af80ec
Change-Id: Ibb0cfea8177fed936bd809ccb0a4e953cd9ea401
2017-07-10 14:13:02 +00:00
Christine Franks
1be5af80ec
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
...
am: 8dc795d64b
Change-Id: Ia2ed1750a996d56255f5eecb42b2607d65c5e8d0
2017-07-10 13:57:38 +00:00
Christine Franks
8dc795d64b
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
2017-07-10 13:51:39 +00:00
Doris Ling
b35886fca9
Merge "Increase suggestion/condition card width." into oc-dr1-dev am: fbd8d21588
...
am: 67fed2400d
Change-Id: Ie0e8d40f3e21e2458e65c18b1e2c87c257cdffb5
2017-07-07 23:43:42 +00:00
Doris Ling
67fed2400d
Merge "Increase suggestion/condition card width." into oc-dr1-dev
...
am: fbd8d21588
Change-Id: I309c769f4ee929c3f8c4c9e83b1db8e86f9745f1
2017-07-07 23:41:15 +00:00
TreeHugger Robot
fbd8d21588
Merge "Increase suggestion/condition card width." into oc-dr1-dev
2017-07-07 23:35:08 +00:00
Andrew Sapperstein
0d2b782c28
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
...
am: 604df3cc55
Change-Id: If9edeb0e771349bec9a0d3d23d8d9331a4ee13a6
2017-07-07 22:48:45 +00:00
TreeHugger Robot
604df3cc55
Merge "Duplicate ambient display setting in battery settings." into oc-dr1-dev
2017-07-07 22:46:05 +00:00
TreeHugger Robot
ef1fae4778
Merge "Duplicate ambient display setting in battery settings."
2017-07-07 22:40:23 +00:00
Ajay Kumar Nadathur Sreenivasan
39e041b0f2
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev am: 56787e3e54
...
am: 3fafe7cf22
Change-Id: I87972bf9236e2be10b8d36bb9c9ba37cf41932b9
2017-07-07 21:36:16 +00:00
Ajay Kumar Nadathur Sreenivasan
3fafe7cf22
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
...
am: 56787e3e54
Change-Id: Ic30a63d3043a04aeeac04d65a747897b91e1831b
2017-07-07 21:33:47 +00:00
Ajay Kumar Nadathur Sreenivasan
56787e3e54
Merge "Overlapping text over fingerprint animation" into oc-dr1-dev
2017-07-07 21:29:07 +00:00
Andrew Sapperstein
512dc80a42
Duplicate ambient display setting in battery settings.
...
Also fixed a bug where ambient display was duplicated
in search results.
Change-Id: I71e8d9ff12e59ad7b9eb309d1093df1ba67abaae
Merged-In: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 20:10:09 +00:00
Andrew Sapperstein
fedae393ef
Duplicate ambient display setting in battery settings.
...
Also fixed a bug where ambient display was duplicated
in search results.
Change-Id: Iacdb53c70e90f8240da1ed9acec7e382ed1df5de
Fixes: 62298578
Test: robotests
2017-07-07 13:07:54 -07:00
Ajay Nadathur
715713d524
Overlapping text over fingerprint animation
...
bug: 63122688
Test: Manually tested and verified using smallest & largest display
settings
Change-Id: I03a6ab380c8d611b69f0b817788ff1f34b47e19d
2017-07-07 12:10:45 -07:00
Stephen Chen
16d59cbdd4
Change words in wifi settings toggle to lowercase.
...
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: If0e653fd7268e5e14f360a043cdc039a7846bb4a
2017-07-07 11:31:55 -07:00
Stephen Chen
cb3dfb91e8
Adjust UX for toggles when active scorer is not set.
...
This change fixes two issues: when wakeup is not available, update the
number of items to show above the fold in wifi preferences. When scorer
is not set, grey out wakeup toggle and set summary to reflect the
status.
Bug: 62410973
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Merged-In: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
Change-Id: I5f4131c6a86eab6c0fb03ea2b5101ba107a9189f
2017-07-07 11:06:20 -07:00
Andrew Sapperstein
1bc4a459fb
Merge "Search bar polish" into oc-dr1-dev am: d10a1af258
...
am: e0c01c6605
Change-Id: I39bae9af6032e392bfcb96eaab1af281bc705273
2017-07-07 18:04:37 +00:00
Andrew Sapperstein
e0c01c6605
Merge "Search bar polish" into oc-dr1-dev
...
am: d10a1af258
Change-Id: Ia09442652744696c2902356b66367d46e7f20534
2017-07-07 17:47:19 +00:00
TreeHugger Robot
d10a1af258
Merge "Search bar polish" into oc-dr1-dev
2017-07-07 17:39:11 +00:00
Adrian Roos
d33ec4d62f
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev am: 6d8f0b57af
...
am: cfa37bb121
Change-Id: Ie089ee289db78126aba7196e7c1277ab557df61a
2017-07-07 17:05:39 +00:00
Adrian Roos
cfa37bb121
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
...
am: 6d8f0b57af
Change-Id: Ic25e07b765b3d732f410643eba7e854168092e86
2017-07-07 16:57:56 +00:00
TreeHugger Robot
6d8f0b57af
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
2017-07-07 16:52:44 +00:00
TreeHugger Robot
e371dcf55a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-07-07 15:45:55 +00:00
Adrian Roos
6953a80804
AOD Settings: Add battery usage warning
...
Change-Id: I14946046c1541e8092ed2b492867730713e3e1ed
Fixes: 33279975
Test: Open Settings > Display. Verify that always on strings contain the increased battery usage warning.
2017-07-07 16:30:04 +02:00
Bill Yi
f6da721f4f
Import translations. DO NOT MERGE
...
Change-Id: I6c862c42b058adf710c961f7c42d108fbf8caf01
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-07 03:12:06 -07:00
Bill Yi
556bf129c9
Import translations. DO NOT MERGE
...
Change-Id: Ie9a5c1d5f9795c7ca3120f792300ec3d4e3cc8b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-07 03:01:25 -07:00
TreeHugger Robot
13f417c980
Merge "Change strings for settings toggles when scorer is unset or unsupported."
2017-07-07 04:00:34 +00:00
Doris Ling
2f33a4a897
Merge "Merge "Reduce spacing in condition cards." into oc-dr1-dev am: 494f82e9b0" into oc-dr1-dev-plus-aosp
...
am: 7091fa4882
Change-Id: I73573bcae13c54e0903c6e0a2d81a4802d39a9d9
2017-07-07 03:35:19 +00:00
Andrew Sapperstein
c2684dd56b
Merge "Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev am: 4545d636ec" into oc-dr1-dev-plus-aosp
...
am: 0ee38fa7eb
Change-Id: I95f9a51aee9542cb2ff99043fd305760e276f108
2017-07-07 03:33:25 +00:00
Doris Ling
d53a828660
Merge "Update the gesture video container background color." into oc-dr1-dev am: c2002db8cc
...
am: 40822c1800
Change-Id: Id3fee0ce04f5d599c38ccea00e85c5f1bbfa1445
2017-07-07 03:31:35 +00:00
Doris Ling
2e215c5117
Merge "Reduce spacing in condition cards." into oc-dr1-dev
...
am: 494f82e9b0
Change-Id: I28903bbc7667f0a0bad065b090076ec73db4947f
2017-07-07 03:01:37 +00:00
Andrew Sapperstein
0fb7d3b5a2
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
...
am: 4545d636ec
Change-Id: I49fcb529e64cd1d66c85bc42f67514559140467b
2017-07-07 03:00:49 +00:00
Doris Ling
40822c1800
Merge "Update the gesture video container background color." into oc-dr1-dev
...
am: c2002db8cc
Change-Id: Ia99dd8d0d9ae926d4fe09c7911c4bc10e60e397d
2017-07-07 02:59:44 +00:00
TreeHugger Robot
494f82e9b0
Merge "Reduce spacing in condition cards." into oc-dr1-dev
2017-07-07 02:17:15 +00:00
TreeHugger Robot
4545d636ec
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
2017-07-07 02:02:51 +00:00
Christine Franks
8767dd7461
Prevent clipping of SeekBar thumb
...
Bug: 63406092
Test: manual - purely a UI change
Change-Id: I1fbf7cba6d3c172a7e04de36a665dcf78b629f00
2017-07-06 18:41:46 -07:00
Stephen Chen
b4d72297ed
Change strings for settings toggles when scorer is unset or unsupported.
...
Bug: 62343859
Test: make RunSettingsRoboTests -j40
Change-Id: I22cba1b22af0defc3b53ce42ef2b5bb02b6fef49
2017-07-06 18:29:57 -07:00
TreeHugger Robot
c2002db8cc
Merge "Update the gesture video container background color." into oc-dr1-dev
2017-07-07 01:26:48 +00:00
Andrew Sapperstein
a22768cc1e
Search bar polish
...
Updated main page text color, text size, and search bar height.
Also updated results page text size.
Change-Id: Ic4a390136b854741a73e99431b8dd9452871dd2c
Fixes: 63397599
Fixes: 63394285
Test: robotests and manual
2017-07-06 16:37:00 -07:00
Doris Ling
b91e454050
Reduce spacing in condition cards.
...
- decrease space between title and summary by 12dp.
- decrease space below button by 7dp.
Change-Id: I9caa0507b89367960fb94bf4af07cdd5dd1dbedf
Fix: 63394014
Test: Visual
2017-07-06 16:15:37 -07:00
Doris Ling
e435fd7104
Increase suggestion/condition card width.
...
- decrease the padding for the suggestion/condition container so that
the card width matches that of the search box above.
Change-Id: I24aca5290ae5f7f457b95dbd51e5b8420327c863
Fix: 63395021
Test: visual
2017-07-06 15:33:55 -07:00
Daniel Nishi
b41f08ce10
Merge "Update the Storage icons." into oc-dr1-dev am: fa47cebd55
...
am: 5f27569478
Change-Id: Ibd5bf197507154c7c45b875ab46350c70b6f3ee8
2017-07-06 22:30:55 +00:00
TreeHugger Robot
e663befae4
Merge "App header cleanup"
2017-07-06 22:22:52 +00:00