Udam Saini
88e7aa173f
Merge "Uses recycler view to add a line at the top in the intro" into nyc-dev am: e0a235cf07
...
am: d84ac5f20d
* commit 'd84ac5f20d9620998dda4ee6a7667f3adb4bb35e':
Uses recycler view to add a line at the top in the intro
2016-03-14 18:18:53 +00:00
Udam Saini
512ed6ef79
Merge "Adjusts layout on encryption interstitial." into nyc-dev am: 6ea990a7e0
...
am: b279d383b5
* commit 'b279d383b55f89f5985627c917b749e3af108dff':
Adjusts layout on encryption interstitial.
2016-03-14 18:18:53 +00:00
Udam Saini
d84ac5f20d
Merge "Uses recycler view to add a line at the top in the intro" into nyc-dev
...
am: e0a235cf07
* commit 'e0a235cf071446f07e09253f3a4e44c49441897a':
Uses recycler view to add a line at the top in the intro
2016-03-14 18:14:04 +00:00
Udam Saini
b279d383b5
Merge "Adjusts layout on encryption interstitial." into nyc-dev
...
am: 6ea990a7e0
* commit '6ea990a7e037a8082575d15a0e00be8255d0b3c3':
Adjusts layout on encryption interstitial.
2016-03-14 18:14:04 +00:00
Udam Saini
e0a235cf07
Merge "Uses recycler view to add a line at the top in the intro" into nyc-dev
2016-03-14 17:42:16 +00:00
Udam Saini
6ea990a7e0
Merge "Adjusts layout on encryption interstitial." into nyc-dev
2016-03-14 17:42:08 +00:00
Geoff Mendal
0bd0bb04b2
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 920745e780
.
Change-Id: Ib5e8de4dc7c0583c77f355ba038e6952a99b3988
2016-03-14 16:27:44 +00:00
Geoff Mendal
ffdeb16f53
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 1ab931d399
.
Change-Id: Ic1fbd72c07ac43c95690f5718dedf60506146550
2016-03-14 16:27:20 +00:00
Geoff Mendal
920745e780
Import translations. DO NOT MERGE
...
Change-Id: If2ae5423dae2e4f4c9128fea6f37f5483ba754a5
Auto-generated-cl: translation import
2016-03-14 07:42:45 -07:00
Geoff Mendal
1ab931d399
Import translations. DO NOT MERGE
...
Change-Id: I7ce7d26b21ad0f9dece6073bcb2c214c265f2b78
Auto-generated-cl: translation import
2016-03-14 06:32:59 -07:00
Mihai Nita
1cf4931211
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev am: 42734c1551
...
am: 1705a15e29
* commit '1705a15e29a41273d3275cddcd4da4cabc3af6f3':
Settings: change "Language & input" to -> "Languages & input"
2016-03-12 00:15:37 +00:00
pkanwar
7d80a39212
Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev am: 856e72d3d5
...
am: 2377d3c6b0
* commit '2377d3c6b08de5c5f8faedcef6c53f1e5be25988':
Remove band preference in WiFi settings. Bug: b/25743379
2016-03-12 00:15:37 +00:00
Mihai Nita
1705a15e29
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev
...
am: 42734c1551
* commit '42734c1551dfac552376efad685f0215724ab518':
Settings: change "Language & input" to -> "Languages & input"
2016-03-12 00:07:07 +00:00
pkanwar
2377d3c6b0
Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev
...
am: 856e72d3d5
* commit '856e72d3d507d3f644a3fd6410b18d4b68b15953':
Remove band preference in WiFi settings. Bug: b/25743379
2016-03-12 00:07:06 +00:00
Udam Saini
01c581b9bd
Adjusts layout on encryption interstitial.
...
This adds extra spacing needed now that there is a divider between
the description and the first selected item. Also adds icons for
the encryption interstitial.
bug:27306696
Change-Id: I0952d543ad121b0dfee5c052a67ca042d381f930
2016-03-11 15:36:36 -08:00
Mihai Niță
42734c1551
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev
2016-03-11 22:05:18 +00:00
Mihai Nita
d3062b90c1
Settings: change "Language & input" to -> "Languages & input"
...
Because now the user can select more than one locale.
Bug: 26849449
Change-Id: I7927fb53012444afafe327e7103ada8ae9808dac
2016-03-11 12:42:59 -08:00
Pankaj Kanwar
856e72d3d5
Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev
2016-03-11 20:38:11 +00:00
Udam Saini
fd17eb4315
Uses recycler view to add a line at the top in the intro
...
Also, adjusts the divider insets as appropriate for settings and setup
wizard.
bug:27591940
Change-Id: I7aeefd6d1bfe94c97f686e81bc045d31e878655f
2016-03-11 10:43:06 -08:00
Bill Yi
57ab609aab
Merge "Import translations. DO NOT MERGE" into nyc-dev
2016-03-11 18:10:28 +00:00
Bill Yi
00ffc901fc
Merge "Import translations. DO NOT MERGE"
2016-03-11 18:10:15 +00:00
Anna Galusza
b243071676
Merge "Update preview border. Bug: 27396174" into nyc-dev am: c4d7bc85dc
...
am: 33d21803cb
* commit '33d21803cb8501b0b5cd343a07ad0b4c7951eb3b':
Update preview border. Bug: 27396174
2016-03-11 17:55:07 +00:00
Anna Galusza
33d21803cb
Merge "Update preview border. Bug: 27396174" into nyc-dev
...
am: c4d7bc85dc
* commit 'c4d7bc85dc21a3acae5e7d5c4303cdaad6e3e76a':
Update preview border. Bug: 27396174
2016-03-11 17:53:03 +00:00
pkanwar
fae7e6cd97
Remove band preference in WiFi settings.
...
Bug: b/25743379
Change-Id: Iddea166e0e0925fffb70de80978501945e8999a7
2016-03-11 08:28:18 -08:00
Bill Yi
64140661e9
Import translations. DO NOT MERGE
...
Change-Id: I097e4b41363cc85bf5698ee2d84d3ba502967113
Auto-generated-cl: translation import
2016-03-11 00:37:29 -08:00
Bill Yi
d73e24569f
Import translations. DO NOT MERGE
...
Change-Id: Icb88765e3fe02efc0ce82869c7216f68918b623e
Auto-generated-cl: translation import
2016-03-10 23:45:58 -08:00
Anna Galusza
d658c0f6af
Update preview border.
...
Bug: 27396174
Change-Id: I23d24246eb7a571db4548965c77428532da0b59a
2016-03-10 13:14:30 -08:00
Jason Monk
5c34ccada7
Merge "Set condition secondary text to 70% alpha." into nyc-dev am: 6f691f21d2
...
am: ed8e2a6b6c
* commit 'ed8e2a6b6c972d7607fd7757c8076259818ffb46':
Set condition secondary text to 70% alpha.
2016-03-10 21:01:38 +00:00
Jason Monk
ed8e2a6b6c
Merge "Set condition secondary text to 70% alpha." into nyc-dev
...
am: 6f691f21d2
* commit '6f691f21d21cc17411efd4114cc2bc432bb57fbf':
Set condition secondary text to 70% alpha.
2016-03-10 20:59:01 +00:00
Jason Monk
6f691f21d2
Merge "Set condition secondary text to 70% alpha." into nyc-dev
2016-03-10 20:46:58 +00:00
Jason Monk
4cf3540a8f
Set condition secondary text to 70% alpha.
...
Bug: 27556219
Change-Id: I2e8953cb20a43ebcce03c92f1a7c35c1843bc958
2016-03-10 15:44:58 -05:00
Jason Monk
28e96a3c60
Merge "Fix large bluetooth item" into nyc-dev am: 37c04d869e
...
am: bf4fc490ea
* commit 'bf4fc490ea9045a9fce7c094bd6b83d42403e461':
Fix large bluetooth item
2016-03-10 20:37:41 +00:00
Jason Monk
941661ae5b
Merge "Rename more to other networks" into nyc-dev am: 0d44cc192b
...
am: ebd0b1f070
* commit 'ebd0b1f07075d1d84f9caee05bedbba4df34ffab':
Rename more to other networks
2016-03-10 20:37:41 +00:00
Jason Monk
bf4fc490ea
Merge "Fix large bluetooth item" into nyc-dev
...
am: 37c04d869e
* commit '37c04d869e6e424ae37cb340ddc3b18741378644':
Fix large bluetooth item
2016-03-10 20:35:02 +00:00
Jason Monk
ebd0b1f070
Merge "Rename more to other networks" into nyc-dev
...
am: 0d44cc192b
* commit '0d44cc192bd49e6775d6e70beebea7c0b21a9a21':
Rename more to other networks
2016-03-10 20:35:02 +00:00
Jason Monk
37c04d869e
Merge "Fix large bluetooth item" into nyc-dev
2016-03-10 20:30:37 +00:00
Jason Monk
0d44cc192b
Merge "Rename more to other networks" into nyc-dev
2016-03-10 20:29:46 +00:00
Jason Monk
a2950d9344
Fix large bluetooth item
...
Bug: 27587071
Change-Id: I562b5b248da738440108ebeba32757b58355dbce
2016-03-10 15:26:06 -05:00
Jason Monk
34ed8a243b
Rename more to other networks
...
Bug: 26780911
Change-Id: I42e1a322966b7920a281153889f44052450714b5
2016-03-10 15:21:04 -05:00
Udam Saini
5997ddf7e8
Merge "Change a tap & hold to touch & hold." into nyc-dev am: 87427a9cdd
...
am: 25c612de01
* commit '25c612de01c9fd01bb97b47b9667f0317bfa3f48':
Change a tap & hold to touch & hold.
2016-03-10 19:00:10 +00:00
Udam Saini
25c612de01
Merge "Change a tap & hold to touch & hold." into nyc-dev
...
am: 87427a9cdd
* commit '87427a9cdde901a9fafe50accbd5ad11c9a09387':
Change a tap & hold to touch & hold.
2016-03-10 18:55:24 +00:00
Abodunrinwa Toki
9555476f44
Merge "Fix work challenge background size." into nyc-dev am: 1abf436466
...
am: 539d035dd1
* commit '539d035dd110e03135168360db21e384b75815d3':
Fix work challenge background size.
2016-03-10 18:50:18 +00:00
Abodunrinwa Toki
539d035dd1
Merge "Fix work challenge background size." into nyc-dev
...
am: 1abf436466
* commit '1abf436466c276037a3cb1e79b3836f33864c531':
Fix work challenge background size.
2016-03-10 18:48:12 +00:00
Udam Saini
87427a9cdd
Merge "Change a tap & hold to touch & hold." into nyc-dev
2016-03-10 18:46:41 +00:00
Abodunrinwa Toki
1abf436466
Merge "Fix work challenge background size." into nyc-dev
2016-03-10 18:42:03 +00:00
Sudheer Shanka
8d76aaf345
Merge "Adjust restricted lock positions as per new design." into nyc-dev am: 1749d518b7
...
am: ace7191046
* commit 'ace7191046ccd4f51cdbdd72000898f67f50e3a4':
Adjust restricted lock positions as per new design.
2016-03-10 16:09:13 +00:00
Sudheer Shanka
ace7191046
Merge "Adjust restricted lock positions as per new design." into nyc-dev
...
am: 1749d518b7
* commit '1749d518b705a4e0b387b0cd14f02ad9ab05e5a5':
Adjust restricted lock positions as per new design.
2016-03-10 16:05:09 +00:00
Sudheer Shanka
1749d518b7
Merge "Adjust restricted lock positions as per new design." into nyc-dev
2016-03-10 15:58:15 +00:00
Sudheer Shanka
115d15763d
Adjust restricted lock positions as per new design.
...
Bug: 27263531
Change-Id: I7e38a9e3356ca43ed936de1e6f8190eba4d4773e
2016-03-10 07:54:36 -08:00
Udam Saini
38130b2078
Change a tap & hold to touch & hold.
...
There were ux concerns with tap and hold being unclear compared to touch
and hold. One instance of this was forgotten from an earlier checkin.
bug:26562712
Change-Id: I643d1435d66e62987a8c94e0110f70f6ea4078b9
2016-03-09 19:27:57 -08:00