Commit Graph

13086 Commits

Author SHA1 Message Date
Doris Ling
df055c8655 Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Fix: 63393599
Test: visual
Change-Id: I4317781c93e23c6d019928b9fe9af16177f81c07
Merged-In: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:50:48 -07:00
Kevin Chyn
1e21688600 Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev am: 7bde506ed1
am: bab6e592bc

Change-Id: I2e4fd1b07be1de6565dd2842211392d8f6cb3e36
2017-07-11 22:40:16 +00:00
Kevin Chyn
bab6e592bc Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev
am: 7bde506ed1

Change-Id: I638df735c2716cc243a471687d176be6613e8bce
2017-07-11 22:36:47 +00:00
TreeHugger Robot
7bde506ed1 Merge "Assist gesture title should not be translated, remove unused strings" into oc-dr1-dev 2017-07-11 22:32:19 +00:00
Doris Ling
78e08f0f0a Update spacing and background color for condition/suggestion.
- changed suggestion/condition and searchbox background color to
  #F2F2F2
- changed condition card background color to #F8F8F8
- removed Suggestion header
- reduced space above condition header/footer by 9dp

Bug: 63393599
Test: make RunSettingsRoboTests
Change-Id: I268934e3a573b542480c0b21dbab68b7217295b5
2017-07-11 15:22:53 -07:00
Stephen Chen
e549e732bd Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev
am: 89fdea9807

Change-Id: Iddc9c6e474847f2aa54a0f695d34201a84596985
2017-07-11 20:27:39 +00:00
TreeHugger Robot
89fdea9807 Merge "Adjust UX for toggles when active scorer is not set." into oc-dr1-dev 2017-07-11 20:21:01 +00:00
Kevin Chyn
599d4b93f3 Assist gesture title should not be translated, remove unused strings
Bug: 63441962

Test: manual && make -j RunSettingsRoboTests
Change-Id: I8b50ad378828f30f31dbfd648c9fac62af5d9da7
2017-07-11 13:17:37 -07:00
Fan Zhang
a30c941361 Merge "Use preference theme from SettingsLib" 2017-07-11 19:20:59 +00:00
Rajeev Kumar
ff3834f4d4 Merge "Add custom attributes to DonutView." 2017-07-11 19:02:17 +00:00
Rajeev Kumar
eaceb1906e Add custom attributes to DonutView.
Note: These changes are required for Data balance UI.
Bug: 62349208
Test: Manual
Change-Id: I50f304580f681dc1461fb82d84ce0fede21b4b87
2017-07-11 10:32:27 -07:00
TreeHugger Robot
70a48e66eb Merge "Use a grey shade under progress spinner in wifi settings" 2017-07-11 17:24:43 +00:00
TreeHugger Robot
740405a044 Merge "Add special lock screen prompt strings for strong auth." 2017-07-11 12:04:38 +00:00
Charles He
4c96d9b203 Add special lock screen prompt strings for strong auth.
Due to incorrect strings, we temporarily disabled the prompt strings for
strong auth and instead used the generic ones as a short-term fix. In
this CL, we correct the strong auth prompt strings and add them back to
the lock screen UI. The new strings are in line with those in keyguard.

Bug: 36511626
Test: manual
Test: make RunSettingsRoboTests
Change-Id: Ifba689db37cc7d331eb1a774814f6b6235977ff9
2017-07-11 10:49:59 +01:00
TreeHugger Robot
75bcd075f2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-11 04:01:24 +00:00
Kevin Chyn
c10561bda2 Merge "Remove unnecessary keywords" into oc-dr1-dev am: 9cf03c3884
am: b5b7ef69bf

Change-Id: I8abf3025eb9b08283b19af3caba6100c46957ae0
2017-07-11 03:37:34 +00:00
Kevin Chyn
b5b7ef69bf Merge "Remove unnecessary keywords" into oc-dr1-dev
am: 9cf03c3884

Change-Id: I71026b6b9fa79608afd466cfce56e4be203c610d
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

Change-Id: Ifbdfc7d44f36fbeb421e45cd27963f51f62e3dbb
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

Change-Id: I1650614a64463f537edb752d58bc0c05ddf3d5b6
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
Bill Yi
85550c537b Import translations. DO NOT MERGE
Change-Id: I827ed97b3afd80dd3e834b3cf686c6b1d4a65d25
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-10 16:23:41 -07: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
f559395603 Use preference theme from SettingsLib
Bug: 36663882
Test: rerun robotests
Change-Id: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
2017-07-10 14:56:49 -07:00
Fan Zhang
62a3220efb Use a grey shade under progress spinner in wifi settings
Change-Id: I1c3fa3a05fe66924989607d73e77ca2616a898e6
Fix: 62545533
Test: visual
2017-07-10 14:46:29 -07:00
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