Fan Zhang
1f0b09c924
Merge "Layout tweak for app action buttons" into oc-mr1-dev
...
am: 48d54ff2f6
Change-Id: Ieb1c678c66781341c5ab703ed66412508006afe3
2017-07-31 19:27:13 +00:00
TreeHugger Robot
48d54ff2f6
Merge "Layout tweak for app action buttons" into oc-mr1-dev
2017-07-31 18:57:09 +00:00
Ajay Nadathur
40c652b221
Merge "Change vision settings suggestion title" into oc-mr1-dev
...
am: 9b89fb0080
Change-Id: I76719d69ebf0fa79e047da425de297422693f512
2017-07-31 18:30:57 +00:00
Ajay Nadathur
9b89fb0080
Merge "Change vision settings suggestion title" into oc-mr1-dev
2017-07-31 18:19:12 +00:00
Maurice Lam
d3c2026aae
Merge "Align screen lock options to view start" into oc-dr1-dev am: 5e2e0df356
...
am: 7c5fc6737c
Change-Id: Ic27b1772351d5e893b2c8ebd3ada4fe2a2bb1e20
2017-07-31 17:44:35 +00:00
Maurice Lam
7c5fc6737c
Merge "Align screen lock options to view start" into oc-dr1-dev
...
am: 5e2e0df356
Change-Id: I5e4e5714d6e881ad25771da7fca5c27996f68617
2017-07-31 17:41:13 +00:00
Maurice Lam
5faa5ab6ea
Merge "Align screen lock options to view start" into oc-dr1-dev
...
am: 5e2e0df356
Change-Id: I38de58cc51e58c831e513a7dae13f06f3db0fce3
2017-07-31 17:41:12 +00:00
Maurice Lam
5e2e0df356
Merge "Align screen lock options to view start" into oc-dr1-dev
2017-07-31 17:35:07 +00:00
Pankaj Kanwar
99dc2bf58e
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
...
am: 492c9f4d16
Change-Id: I3d05092be28d9fc527e882464e117837242143b3
2017-07-31 17:13:22 +00:00
Pankaj Kanwar
492c9f4d16
Merge "Add string needed to support carrier wifi in UI." into oc-mr1-dev
2017-07-31 17:09:00 +00:00
Fan Zhang
e0dee98e12
Merge "Update search bar's navup content description" into oc-dr1-dev am: b79d38f2f3
...
am: 4d5172bfeb
Change-Id: I8fec7ef3502df99ccf08731ad7a5547f13e643ea
2017-07-29 00:20:50 +00:00
Fan Zhang
d58a499c02
Merge "Update search bar's navup content description" into oc-dr1-dev
...
am: b79d38f2f3
Change-Id: Idf6df51c8c2b4f765b370f70c8f427a261d4d1bb
2017-07-29 00:16:23 +00:00
Fan Zhang
4d5172bfeb
Merge "Update search bar's navup content description" into oc-dr1-dev
...
am: b79d38f2f3
Change-Id: I774c5a2d4e456cfcb1fb4d37a5fd6373336400e5
2017-07-29 00:16:22 +00:00
Fan Zhang
b79d38f2f3
Merge "Update search bar's navup content description" into oc-dr1-dev
2017-07-29 00:10:10 +00:00
pkanwar
186c9b4525
Add string needed to support carrier wifi in UI.
...
Add strings which will be used to indicate to the user in the wifi
picker and wifi config that they are connecting/connected to carrier
wifi.
Bug:30988281
Test: manual
Change-Id: I6f3b6a047bb28fddf81ed967c89fac5824d34f9f
2017-07-28 23:00:32 +00:00
Fan Zhang
fd6d4bf1c8
Layout tweak for app action buttons
...
Now shadow is no longer cropped when pressing button
Change-Id: I6ac8588abb75ca23912f62808a57e8402857e18b
Fixes: 62550425
Test: visual
(cherry picked from commit ee308b950f )
2017-07-28 22:55:59 +00:00
Ajay Nadathur
5224edfb92
Change vision settings suggestion title
...
bug: 63867327
Test: Manually tested and verified
Change-Id: I358508534d0ef77c99851430f979b61702519313
2017-07-28 22:01:09 +00:00
Maurice Lam
9136effad6
Align screen lock options to view start
...
Test: Manual
Bug: 63715610
Change-Id: If723a200ee402dcd7204e20e2a02cb151935d1fd
2017-07-28 18:39:09 +00:00
Ajay Nadathur
4f27a4de98
Merge "Update text for lock screen notifications" into oc-mr1-dev
...
am: d2352cdd08
Change-Id: Id8f23cc08b481405c82318972107e283035816a7
2017-07-28 17:51:03 +00:00
Ajay Nadathur
d2352cdd08
Merge "Update text for lock screen notifications" into oc-mr1-dev
2017-07-28 17:45:00 +00:00
Fan Zhang
ca9ddd45fe
Update search bar's navup content description
...
It should read "Search settings"
Change-Id: I1a55f905949341b290ea5f224171592cf5021e31
Fix: 64140213
Test: talkback
2017-07-28 10:23:00 -07:00
Bill Yi
8432802275
Import translations. DO NOT MERGE
...
Change-Id: If9cb3de5de1845431f075d5ca6c7935d49e0e6f7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 03:27:50 -07:00
Bill Yi
129ed98650
Import translations. DO NOT MERGE
...
Change-Id: Ie25fb80dbf73c1681c72adf0cfac13c319f952b7
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-28 03:08:41 -07:00
Fan Zhang
f01de6015f
Update condition tile action button text color am: 951decebb4
...
am: a5dc1d2470
Change-Id: I618f6c9795b4c5c1b728f1acdc2681ce4686d910
2017-07-27 22:16:58 +00:00
Fan Zhang
a5dc1d2470
Update condition tile action button text color
...
am: 951decebb4
Change-Id: Ie7d0b97ebb61654ad6ea0570ee033a7a037a2b09
2017-07-27 22:10:35 +00:00
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
653ef15253
Merge "Show Error dialog when WPS is interrupted" am: fd7dec5d4a am: b0e008841f am: 6b46a9df49
...
am: 775c1c8eb5
Change-Id: Ib66a063ebbee94370f69be336d82706da39be427
2017-07-27 18:28:17 +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
81eb0697da
Merge "Revert string change" into oc-dr1-dev am: 4b8f2c9ad5
...
am: d6ab7dee09
Change-Id: Ic8517b370329586cad908283d94928f1b8c3c308
2017-07-27 12:45:50 +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
Julia Reynolds
d6ab7dee09
Merge "Revert string change" into oc-dr1-dev
...
am: 4b8f2c9ad5
Change-Id: I7460c5c8ad88e7a504b8b246fbbf50d2757f3df6
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
220b1f163a
Merge "Set minLines for battery header text" into oc-dr1-dev am: 02560caa92
...
am: 063e87c689
Change-Id: I641556b2baa47690a616dc0e4fec91070a8e4565
2017-07-27 01:33:28 +00: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
Ajay Nadathur
cfc78d7d7c
Update text for lock screen notifications
...
bug: 62844951
Test: Manually tested
Change-Id: Ie6a85c87252f073cb6dec8f3812024cfade49e1e
2017-07-27 00:38:14 +00:00
jackqdyulei
063e87c689
Merge "Set minLines for battery header text" into oc-dr1-dev
...
am: 02560caa92
Change-Id: I2a4d3ed816a7bb938b5613154b8a4bc8f3114142
2017-07-27 00:05:53 +00:00
TreeHugger Robot
975d9a18f1
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-07-26 19:39:46 +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
0d07e5e3f3
Import translations. DO NOT MERGE
...
Change-Id: I0dd55f8bfcdc12a551f396cdd6b84072c78bb88e
Auto-generated-cl: translation import
Exempt-From-Owner-Approval: translation import
2017-07-26 08:07:49 -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
Fan Zhang
c2c42de513
Merge "Update misc strings" into oc-mr1-dev
...
am: 34d30267e3
Change-Id: I2d6e173a84ca7c58c6be4785fcd787a052839199
2017-07-26 05:02:56 +00:00
TreeHugger Robot
34d30267e3
Merge "Update misc strings" into oc-mr1-dev
2017-07-26 04:59:29 +00: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
3bc97152d1
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev am: 6ef56e43ee
...
am: 2f84a358d9
Change-Id: I727693edc69b0adfb862efce87834fc78657600e
2017-07-25 21:39:00 +00:00
Fan Zhang
2f84a358d9
Merge "Fix search indexing for encryption_and_credential page" into oc-dr1-dev
...
am: 6ef56e43ee
Change-Id: I162d479851065017806cb82a16eb8fba7ad5aca7
2017-07-25 21:30:57 +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