Commit Graph

12610 Commits

Author SHA1 Message Date
Fan Zhang
4748098d10 Update condition tile action button text color
am: 951decebb4

Change-Id: I6dba9ab81515f3e80254a1e59a0ae95132bc02f3
2017-07-27 22:10:35 +00:00
Fan Zhang
951decebb4 Update condition tile action button text color
Text color needs to be darker for accessibility reasons.

Change-Id: I3ff37f36281d70dd180c0747a707b597139157c2
Fix: 64068145
Test: visual
2017-07-27 19:29:36 +00:00
Ryusuke Sawa
775c1c8eb5 Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f
am: 6b46a9df49

Change-Id: I80fff447ce87a40d7180b9e25cb53888f681b469
2017-07-27 18:26:18 +00:00
Ryusuke Sawa
b0e008841f Merge "Show Error dialog when WPS is interrupted"
am: fd7dec5d4a

Change-Id: I5ff4247745eba606c22481466f2b9a49e1c604d3
2017-07-27 18:21:19 +00:00
Julia Reynolds
698ce72bc2 Merge "Revert string change" into oc-dr1-dev
am: 4b8f2c9ad5

Change-Id: I0dbd3d1d3efd494ef592ee1fca201bedbcea881a
2017-07-27 12:43:21 +00:00
TreeHugger Robot
4b8f2c9ad5 Merge "Revert string change" into oc-dr1-dev 2017-07-27 12:36:55 +00:00
Ryusuke Sawa
a15be47bd5 Show Error dialog when WPS is interrupted
When WPS searching is interruptd by turning Wi-Fi off,
Error dialog should be displayed.

Bug: 29883134
Test: manual - tap WPS Push Button and turn Airplane mode on

Change-Id: Ie6667c6b7d09540af21b015e0d5b991d818d2c77
2017-07-27 10:53:31 +09:00
jackqdyulei
75e89dfede Merge "Set minLines for battery header text" into oc-dr1-dev
am: 02560caa92

Change-Id: I0bc848b91594cb0adfd2900ce2678f6acc6ef66e
2017-07-27 01:08:43 +00:00
jackqdyulei
dbe6bd3984 Set minLines for battery header text
So the header won't grow/shrink when the text changes.

Bug: 64065456
Test: Build
Change-Id: I96bb00e81d677b1efd55afbfe5f23024d6afd71b
2017-07-26 11:24:54 -07:00
Bill Yi
d5390dac46 Import translations. DO NOT MERGE
Change-Id: If2e8b93c86f4499c112549d060696e4b272eb5ce
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 07:32:24 -07:00
Doris Ling
f8bb8a9792 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev
am: 0e9711ab92

Change-Id: I80aee4e13aff91ac66309df438511826a2b75187
2017-07-26 02:08:44 +00:00
TreeHugger Robot
0e9711ab92 Merge "Add divider line below "see all apps" preference" into oc-dr1-dev 2017-07-26 02:02:32 +00:00
Fan Zhang
f854a08c3e Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
am: 6ef56e43ee

Change-Id: I8778464bb80ff791b1e127bdca420065252fd76f
2017-07-25 21:30:26 +00:00
Julia Reynolds
e7f99fb9e3 Revert string change
Test: manual
Change-Id: I3f38ac68ae6b9fc225c92bdfcc0f79859ff8dfa1
Fixes: 63906381
2017-07-25 14:46:10 -04:00
Fan Zhang
a4a3833a08 Fix search indexing for encryption_and_credential page
- Rewrite search index provider to include all possible keys through
  getXmlResourcesToIndex()
- Add isPageSearchEnabled() to disable all keys if user is not admin
- Add getNonIndexableKeys to suppress unrelated keys based on current
  device state

Change-Id: I2c6943483789bf4c9f3931d344cf279fec0edaee
Fix: 37650170
Test: robotests
2017-07-24 12:34:34 -07:00
TreeHugger Robot
4d7111b0e9 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-22 16:25:35 +00:00
Bill Yi
555a55210a Import translations. DO NOT MERGE
Change-Id: I0dbb4c3f5c88953469428df5ac70973d18e253ba
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-22 03:57:25 -07:00
Andrew Sapperstein
80a5336b25 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev
am: 59a66d9b77

Change-Id: I7513463a50ddef4f49d8d7ab06ed8fd9e19d3a52
2017-07-22 00:32:32 +00:00
TreeHugger Robot
59a66d9b77 Merge "Add help uri for process stats summary and apps." into oc-dr1-dev 2017-07-22 00:28:31 +00:00
Andrew Sapperstein
64590ec7a6 Add help uri for process stats summary and apps.
Bug: 62903521
Test: manual
Change-Id: I55cdb061d79232676d4064677bd7f5936700e8b7
2017-07-21 15:01:55 -07:00
Antony Sargent
62b7527da5 Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev
am: a6ac4890ed

Change-Id: I55b589590c90eb232bf70ec8b0256ee4da6013fe
2017-07-21 20:11:53 +00:00
TreeHugger Robot
a6ac4890ed Merge "Switch to using gray icon for Bluetooth imaging devices" into oc-dr1-dev 2017-07-21 20:03:41 +00:00
Fan Zhang
8df2cef10d Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev
am: e09338a208

Change-Id: I5db6cec4b7976e338d9e49689f1530cbbb6a1259
2017-07-21 18:23:56 +00:00
Fan Zhang
e09338a208 Merge "Add shadow to searchbar when user scrolls vertically" into oc-dr1-dev 2017-07-21 18:18:44 +00:00
Julia Reynolds
6ad9f3267b Zen settings screen update
am: 56b748d686

Change-Id: Ida9de16ee3a52fd1d06764e560411401c976ac5d
2017-07-21 16:21:25 +00:00
Julia Reynolds
56b748d686 Zen settings screen update
- Remove app attribution
- Change visual disturbances label

Change-Id: Id2f7a16817a3b044db4374bf45a54706b8c42eff
Fixes: 63905920
Fixes: 63906381
Test: manual
2017-07-21 09:11:14 -04:00
Fan Zhang
ee8d574c26 Add shadow to searchbar when user scrolls vertically
Bug: 63528057
Test: robotests

Change-Id: Ib85676d78b43be38aab1eacd0820d0755a601f60
(cherry picked from commit e651ddf9e6)
2017-07-21 01:34:46 +00:00
Doris Ling
6f44ea54ae Add divider line below "see all apps" preference
- and increase the tile limit by 1 to accomodate the divider.

Change-Id: I94cbf47fd987a6ff4c4fabcc3124fae1f0438876
Fix: 63906012
Test: make RunSettingsRoboTests
(cherry picked from commit 6cd558e595)
2017-07-20 17:21:11 -07:00
TreeHugger Robot
acd97be0b8 Merge "Import translations. DO NOT MERGE" into oc-dr1-dev 2017-07-20 21:17:34 +00:00
Antony Sargent
64fab6f4cd Switch to using gray icon for Bluetooth imaging devices
All the other Bluetooth icons were switched to gray at some point in the
past, but we must have missed this one.

Bug: 63858978
Test: make RunSettingsRoboTests
Change-Id: I2ebefa42f3ecff8ae6d58f4bdb22dce39ae4dbd4
2017-07-20 09:54:29 -07:00
Julia Reynolds
2ab6e2ef9e Merge "Zen priority settings update" into oc-dr1-dev
am: 9dec71f7d7

Change-Id: I1170215a15609f1ca5b4da0eeff0ecc112d9fbf3
2017-07-20 14:24:03 +00:00
Julia Reynolds
9dec71f7d7 Merge "Zen priority settings update" into oc-dr1-dev 2017-07-20 14:19:33 +00:00
Bill Yi
606f83bd74 Import translations. DO NOT MERGE
Change-Id: I1dad650eb3d6c49c1b1b8b6873a2f8a0ffe89a9c
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-19 23:13:29 -07:00
Daniel Nishi
fcb660acbf Merge "Align the version number text view." into oc-dr1-dev
am: aead86058d

Change-Id: Ibe17bfc8b0e24d1094f8c43ffe98a3319abee074
2017-07-18 17:22:30 +00:00
Daniel Nishi
aead86058d Merge "Align the version number text view." into oc-dr1-dev 2017-07-18 17:14:48 +00:00
Julia Reynolds
78f612b823 Zen priority settings update
Reordering & adding summary

Change-Id: Icc3388410bdea9960c1e2c8609b7c3a979dc99d7
Fixes: 63712680
Test: RunSettingsRoboTests
2017-07-18 10:50:14 -04:00
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
Daniel Nishi
68b16775ae Align the version number text view.
Change-Id: I942b6b8f381332021bf6062afa5e0c7ae5e0bab7
Fixes: 63671892
Test: Manual
2017-07-17 15:15:10 -07: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