Kevin Chyn
c10561bda2
Merge "Remove unnecessary keywords" into oc-dr1-dev am: 9cf03c3884
...
am: b5b7ef69bf
2017-07-11 03:37:34 +00:00
Kevin Chyn
b5b7ef69bf
Merge "Remove unnecessary keywords" into oc-dr1-dev
...
am: 9cf03c3884
2017-07-11 03:35:06 +00:00
TreeHugger Robot
9cf03c3884
Merge "Remove unnecessary keywords" into oc-dr1-dev
2017-07-11 03:31:06 +00:00
Kevin Chyn
dde95f663a
Remove unnecessary keywords
...
Fixes: 63544783
Test: make -j RunSettingsRoboTests && manual
Change-Id: I6f6cb8aff365174edb7cd22f18cbc1b7e7ba5b4a
2017-07-11 03:23:21 +00:00
TreeHugger Robot
cd3e5bf6c8
Merge "Search cleanu-np: remove useless summary from some settings"
2017-07-11 00:25:50 +00:00
TreeHugger Robot
ce9e90a740
Merge "Entity header layout cleanup"
2017-07-11 00:21:41 +00:00
Ajay Nadathur
bd013f0099
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev am: 73ae54a63a
...
am: 6465041095
2017-07-11 00:08:51 +00:00
Ajay Nadathur
6465041095
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
...
am: 73ae54a63a
2017-07-11 00:05:53 +00:00
TreeHugger Robot
73ae54a63a
Merge "Update notification redaction interstitial according to spec" into oc-dr1-dev
2017-07-11 00:00:08 +00:00
Rajeev Kumar
58878fcb33
Merge "Get rid of unused IconPreferenceScreen"
2017-07-10 23:11:54 +00:00
Fan Zhang
1befb49813
Search cleanu-np: remove useless summary from some settings
...
Change-Id: Ie5c953f594bf1d364c0aa1a99f9363756ac5802f
Fix: 63014636
Test: robotests
2017-07-10 15:36:58 -07:00
Fan Zhang
64cac99448
Entity header layout cleanup
...
Change-Id: I866231e3a6cb506e3aa1c03f2cbead1049270999
Fix: 63339943
Test: visual
2017-07-10 15:13:17 -07:00
Fan Zhang
7a56184063
Merge "Support multi line title for switch and edittext preferences" into oc-dr1-dev am: 5d3f6d566b
...
am: 16afefd509
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
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
2017-07-10 14:13:02 +00:00
Christine Franks
1be5af80ec
Merge "Prevent clipping of SeekBar thumb" into oc-dr1-dev
...
am: 8dc795d64b
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
2017-07-07 23:43:42 +00:00
Doris Ling
67fed2400d
Merge "Increase suggestion/condition card width." into oc-dr1-dev
...
am: fbd8d21588
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
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
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
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
Andrew Sapperstein
1bc4a459fb
Merge "Search bar polish" into oc-dr1-dev am: d10a1af258
...
am: e0c01c6605
2017-07-07 18:04:37 +00:00
Andrew Sapperstein
e0c01c6605
Merge "Search bar polish" into oc-dr1-dev
...
am: d10a1af258
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
2017-07-07 17:05:39 +00:00
Adrian Roos
cfa37bb121
Merge "AOD Settings: Add battery usage warning" into oc-dr1-dev
...
am: 6d8f0b57af
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
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
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
2017-07-07 03:31:35 +00:00
Doris Ling
2e215c5117
Merge "Reduce spacing in condition cards." into oc-dr1-dev
...
am: 494f82e9b0
2017-07-07 03:01:37 +00:00
Andrew Sapperstein
0fb7d3b5a2
Merge "Use config_headlineFontFamily for password screens." into oc-dr1-dev
...
am: 4545d636ec
2017-07-07 03:00:49 +00:00
