Udam Saini
512ed6ef79
Merge "Adjusts layout on encryption interstitial." into nyc-dev am: 6ea990a7e0
...
am: b279d383b5
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
2016-03-14 18:14:04 +00:00
Udam Saini
b279d383b5
Merge "Adjusts layout on encryption interstitial." into nyc-dev
...
am: 6ea990a7e0
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
47eb9c90af
Revert "Import translations. DO NOT MERGE" am: 0bd0bb04b2 -s ours
...
am: 4e4326fc14
2016-03-14 16:36:58 +00:00
Geoff Mendal
4e4326fc14
Revert "Import translations. DO NOT MERGE"
...
am: 0bd0bb04b2
2016-03-14 16:34:52 +00:00
Geoff Mendal
0bd0bb04b2
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 920745e780
2016-03-14 16:27:44 +00:00
Geoff Mendal
5fec9de5ae
Merge "Revert "Import translations. DO NOT MERGE""
2016-03-14 16:27:30 +00:00
Geoff Mendal
ffdeb16f53
Revert "Import translations. DO NOT MERGE"
...
This reverts commit 1ab931d399
2016-03-14 16:27:20 +00:00
Geoff Mendal
cfd21bd13e
Import translations. DO NOT MERGE am: 920745e780 -s ours
...
am: 8384d50f9c
2016-03-14 14:50:29 +00:00
Geoff Mendal
8384d50f9c
Import translations. DO NOT MERGE
...
am: 920745e780
2016-03-14 14:48:38 +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
mariagpuyol
ae49edbdfd
Dialog for emergency info
...
Bug:27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
2016-03-11 21:06:23 -08:00
Mihai Nita
1cf4931211
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev am: 42734c1551
...
am: 1705a15e29
2016-03-12 00:15:37 +00:00
Paul Lawrence
00fbae46f4
Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev am: 0ca47e2c55
...
am: bd34670f3b
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
2016-03-12 00:15:37 +00:00
Mihai Nita
1705a15e29
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev
...
am: 42734c1551
2016-03-12 00:07:07 +00:00
Paul Lawrence
bd34670f3b
Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev
...
am: 0ca47e2c55
2016-03-12 00:07:06 +00:00
pkanwar
2377d3c6b0
Merge "Remove band preference in WiFi settings. Bug: b/25743379" into nyc-dev
...
am: 856e72d3d5
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
Paul Lawrence
0ca47e2c55
Merge "Don't show secure startup options and strings when file encrypted" into nyc-dev
2016-03-11 21:49:16 +00:00
Prathmesh Prabhu
8d763c0302
settings: Fix more NPEs when bluetooth is missing.
...
Fix a couple NPEs in the settings app when device doesn't support
bluetooth.
BUG:27600761
Change-Id: I356f5e7f321e8230f85ec74da9e405449431846b
2016-03-11 21:35:58 +00:00
Paul Lawrence
23c2acfd4c
Don't show secure startup options and strings when file encrypted
...
File encryption is secure by default, so we don't need to warn.
Bug: 27433949
Bug: 27435082
Change-Id: I3e856256188e6a7dcd58cabbde043395c314999e
2016-03-11 13:28:39 -08: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
Bill Yi
466eb1a829
Merge "Import translations. DO NOT MERGE" into nyc-dev am: 57ab609aab -s ours
...
am: e7de9ec52d
2016-03-11 19:07:25 +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
e7de9ec52d
Merge "Import translations. DO NOT MERGE" into nyc-dev
...
am: 57ab609aab
2016-03-11 18:16:08 +00: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
2016-03-11 17:55:07 +00:00
Anna Galusza
33d21803cb
Merge "Update preview border. Bug: 27396174" into nyc-dev
...
am: c4d7bc85dc
2016-03-11 17:53:03 +00:00
Anna Galusza
c4d7bc85dc
Merge "Update preview border. Bug: 27396174" into nyc-dev
2016-03-11 17:46:35 +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
Udam Saini
c74525390f
Merge "Prevent settings from being announced on wifi dialog." into nyc-dev am: dccc582d26
...
am: 4efdb256b8
2016-03-10 23:14:52 +00:00
Udam Saini
4efdb256b8
Merge "Prevent settings from being announced on wifi dialog." into nyc-dev
...
am: dccc582d26
2016-03-10 23:12:07 +00:00
Udam Saini
dccc582d26
Merge "Prevent settings from being announced on wifi dialog." into nyc-dev
2016-03-10 23:01:09 +00: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
2016-03-10 21:01:38 +00:00
Jason Monk
ed8e2a6b6c
Merge "Set condition secondary text to 70% alpha." into nyc-dev
...
am: 6f691f21d2
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
2016-03-10 20:37:41 +00:00
Jason Monk
941661ae5b
Merge "Rename more to other networks" into nyc-dev am: 0d44cc192b
...
am: ebd0b1f070
2016-03-10 20:37:41 +00:00
Jason Monk
bf4fc490ea
Merge "Fix large bluetooth item" into nyc-dev
...
am: 37c04d869e
2016-03-10 20:35:02 +00:00
