Commit Graph

12563 Commits

Author SHA1 Message Date
Doris Ling
e8d37d9d75 Merge "Add background color to suggestion/condition view." into oc-dr1-dev
am: edad87c4b0

Change-Id: I612dbb1e3347e2052eec5df9b10b43d679b8585b
2017-07-17 22:24:53 +00:00
TreeHugger Robot
edad87c4b0 Merge "Add background color to suggestion/condition view." into oc-dr1-dev 2017-07-17 22:18:31 +00:00
Kevin Chyn
14f8431a9f Merge "Fix assist gesture keyword" into oc-dr1-dev
am: 4b4ad6efc2

Change-Id: I03ffaa0f14257d64293434c9fc12a389c83ceed0
2017-07-15 04:14:21 +00:00
TreeHugger Robot
4b4ad6efc2 Merge "Fix assist gesture keyword" into oc-dr1-dev 2017-07-15 04:11:04 +00:00
Doris Ling
fb64a7f74c Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev
am: ef8e2db876

Change-Id: I4f7ea7436b684cc29cc8f922523b15cd89182250
2017-07-15 01:12:53 +00:00
TreeHugger Robot
ef8e2db876 Merge "Update spacing in suggestion/condition header and footer." into oc-dr1-dev 2017-07-15 01:05:41 +00:00
Kevin Chyn
431ce43357 Fix assist gesture keyword
Bug: 63544783

Test: make -j RunSettingsRoboTests
Change-Id: Ief33fa9c556cc5a328401573459c7cbdd0053260
2017-07-14 16:10:12 -07:00
Doris Ling
1b6685f4a4 Add background color to suggestion/condition view.
- also remove "new_ui" from the condition tile and suggestion tile
layout file name.

Change-Id: I2a1fe4ea2ed69768f6e7c464608039c9c962c9f1
Fix: 63674319
Test: visual
2017-07-14 15:34:42 -07:00
Doris Ling
546a7a468d Merge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev
am: cccd78ee69

Change-Id: Iadd785980f64eab3b350354092f0be0d62ac06a1
2017-07-14 21:05:01 +00:00
TreeHugger Robot
cccd78ee69 Merge "Fix left aligned "Wi-Fi" category title in data usage page." into oc-dr1-dev 2017-07-14 20:51:09 +00:00
Doris Ling
0018f1680f Update spacing in suggestion/condition header and footer.
Adjust the top/bottom padding for the header and footer so that the
content is center-aligned.

Change-Id: I01c0baf770abf3a8767a016a758ee1794403598b
Fix: 63670820
Test: Visual
2017-07-14 12:31:12 -07:00
Doris Ling
b94727de0c Fix left aligned "Wi-Fi" category title in data usage page.
Set thee category title text view to align at the start position.

Change-Id: I9a297588e2f742d20b0d07bd6979e0378e41cb71
Merged-In: Iff5fbc595ec16396043d64a1ceb0fa81e874ea48
Merged-In: I9f0f51a9d070191f5bf8f3315fef4d997d6213c3
Fix: 63399239
Test: visual
2017-07-14 11:41:35 -07:00
Lei Yu
8a954ee7a6 Merge "Extend char limit for dialog title" into oc-dr1-dev
am: 241fecbd79

Change-Id: Icfc611300d9f4b0b1b95291fac950ed0924dbbf2
2017-07-13 21:49:11 +00:00
Lei Yu
241fecbd79 Merge "Extend char limit for dialog title" into oc-dr1-dev 2017-07-13 21:33:27 +00:00
Fan Zhang
303c330068 Merge "UI refresh on bluetooth list page" into oc-dr1-dev
am: c0ca084622

Change-Id: I92846eec6bcbb67862b8ad1cf6447623a2dc3ab0
2017-07-13 20:17:28 +00:00
TreeHugger Robot
c0ca084622 Merge "UI refresh on bluetooth list page" into oc-dr1-dev 2017-07-13 20:05:25 +00:00
Fan Zhang
7b9568c10d UI refresh on bluetooth list page
- xml layout clean up
- add "Device name" preference, tapping will bring up rename dialog
- Remove tap target from original device_name pref

Merged-In: I6e9764dbb6c51f94be6d6a61d5a6401141407409
Change-Id: I9cb67cc557a9b932d7cf795a8d4a6fb5215c4365
Fix: 62890841
Fix: 62891178
Test: robotests
2017-07-13 11:08:18 -07:00
jackqdyulei
a5084d35dc Extend char limit for dialog title
Bug: 63396701
Test: Build
Change-Id: I6f873e42c52e66bab54de087ac7a478a9d6ce4f9
2017-07-13 10:25:39 -07:00
Bill Yi
76a81a9803 Import translations. DO NOT MERGE
Change-Id: Id689260565e4f98a7f6b4aa08668e5b102d28b1e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-13 07:56:00 -07:00
Ajay Nadathur
4aaa52d1d6 Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev
am: d1bac25518

Change-Id: Ib5269308dfd159b0bf535421ae9bc65628aee3e6
2017-07-12 20:07:19 +00:00
TreeHugger Robot
d1bac25518 Merge "Remove next button from FingerprintEnroll screen" into oc-dr1-dev 2017-07-12 20:03:14 +00:00
Doris Ling
a674aa69c2 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev
am: 91ca9f60e9

Change-Id: I65e88eb8e4d65641beace03ab8f0782efa00db62
2017-07-12 03:13:51 +00:00
TreeHugger Robot
91ca9f60e9 Merge "Update spacing and background color for condition/suggestion." into oc-dr1-dev 2017-07-12 02:58:28 +00:00
Ajay Nadathur
43a49fca4d Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev
am: 482b7feaa7

Change-Id: I662ed360a3fa3031679ad91cb3280893694b60bd
2017-07-12 02:05:58 +00:00
TreeHugger Robot
482b7feaa7 Merge "Add another fingerprint button not visible in landscape mode" into oc-dr1-dev 2017-07-12 01:57:26 +00:00
Ajay Nadathur
ba313c0347 Remove next button from FingerprintEnroll screen
bug: 63515466
Test: Manually tested and verified that next button is removed
Change-Id: Ib43363c763fba2f92cb4774e1b961ab8647f5040
2017-07-11 18:49:53 -07:00
Ajay Nadathur
5eca3a64ea Add another fingerprint button not visible in landscape mode
bug:63067568
Test: Manually tested and verified
Change-Id: I172bbf4c4db6cebb2cc96874f3d8d29e859b07d1
2017-07-11 16:58:12 -07:00
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
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
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
TreeHugger Robot
75bcd075f2 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-11 04:01:24 +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
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
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
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
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
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
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