Sudheer Shanka
5d5cb14e3d
Merge "Update user capabilities in onResume." into nyc-dev
...
am: f6c5128763
2016-03-15 23:39:17 +00:00
Sudheer Shanka
f6c5128763
Merge "Update user capabilities in onResume." into nyc-dev
2016-03-15 23:32:26 +00:00
Anna Galusza
a9a252ee96
Fix padding on Font size and Display size preview screens.
...
Bug: 27675989
Change-Id: Iecdc3e8a9aee4fd82a59337f14cbf4bd91587709
2016-03-15 21:48:04 +00:00
Prathmesh Prabhu
fe87ed9d40
Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev
...
am: 023f7033ef
2016-03-15 21:00:33 +00:00
mariagpuyol
6bfdd3a973
Merge "Dialog for emergency info" into nyc-dev
...
am: 82c512dbd6
2016-03-15 21:00:32 +00:00
Prathmesh Prabhu
023f7033ef
Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev
2016-03-15 20:54:44 +00:00
Maria Garcia Puyol
82c512dbd6
Merge "Dialog for emergency info" into nyc-dev
2016-03-15 20:52:17 +00:00
Udam Saini
0cf2502c10
Sets the divider style to either for fingerprint.
...
This keeps the divider style to match the rest of settings.
bug:27619572
Change-Id: Ieef37adae119311106d47321b7f3495446d5da7d
2016-03-15 13:44:05 -07:00
Anna Galusza
396c52c917
Change magnification strings and accessibility traversal order in preview pane. Bug: 27499075 Bug: 27326035
...
am: a1a11d1944
2016-03-15 17:50:09 +00:00
Anna Galusza
a1a11d1944
Change magnification strings and accessibility traversal order in preview pane.
...
Bug: 27499075
Bug: 27326035
Change-Id: I03ff9574d845a1c2573aa6f4f2462851c56b3c04
2016-03-15 10:22:33 -07:00
Anna Galusza
fc9a20425a
Merge "Add screen for turning TalkBack on and off and remove intent to launch TB tutorial from SUW. Also fix how Fragments are displayed (Fragment Views were being inflated incorrectly causing bugs like the one where TB would still see the hub elements on child screens) and remove ripple from non-selectable text. Bug: 27203716 Bug: 27218687 Bug: 27066012 Bug: 27587193" into nyc-dev
...
am: b740f34f72
2016-03-15 17:22:31 +00:00
Anna Galusza
b740f34f72
Merge "Add screen for turning TalkBack on and off and remove intent to launch TB tutorial from SUW. Also fix how Fragments are displayed (Fragment Views were being inflated incorrectly causing bugs like the one where TB would still see the hub elements on child screens) and remove ripple from non-selectable text. Bug: 27203716 Bug: 27218687 Bug: 27066012 Bug: 27587193" into nyc-dev
2016-03-15 17:09:34 +00:00
Jason Monk
d200425210
Merge "Fix data usage" into nyc-dev
...
am: 0ee49040b3
2016-03-15 15:43:25 +00:00
Jason Monk
0ee49040b3
Merge "Fix data usage" into nyc-dev
2016-03-15 15:39:19 +00:00
Jason Monk
5ce4345dff
Fix data usage
...
- Fix int conversion (evidently a month doesn't fit in an int
- Remove gaps because they don't make sense for data usage
Bug: 27632250
Change-Id: I87c2c05960b6ee489289e94eb12de9d52de1f3aa
2016-03-15 11:36:06 -04:00
Geoff Mendal
0a73833f10
Import translations. DO NOT MERGE
...
am: 0f246eb0ec
2016-03-15 13:33:19 +00:00
Geoff Mendal
0f246eb0ec
Import translations. DO NOT MERGE
...
Change-Id: I69ad76180b5179f67a07536afc785d01ac28f92c
Auto-generated-cl: translation import
2016-03-15 06:27:03 -07:00
Adrian Roos
e6d60877b2
Fix NotificationLockscreenPreference
...
Remote-Input-on-Lockscreen setting was inverted.
Bug: 27638447
Change-Id: I4ca17854dae7c6a47e4fe22be2e862e96742f457
2016-03-14 23:08:40 -07:00
Daichi Hirono
a7dfcac8d7
Fix description of MTP option in the "Use USB for" dialog.
...
BUG=27150127
Change-Id: Ib5bdd6394ae2a8a64b95ddfc07ccf7bfd0c8f335
2016-03-15 11:20:36 +09:00
pkanwar
53145acbe7
Remove band preference in WiFi settings. Bug: b/25743379
...
am: 68d1ca6de5
2016-03-15 01:20:20 +00:00
Meng Wang
dcd0bf72b8
Show ICCID in SIM status, if CarrierConfigManager allows.
...
Bug: 27574058
Change-Id: I5c08d31b5e8ea3c3ad79361e660256b070ff7284
2016-03-14 17:42:48 -07:00
Sudheer Shanka
aa524ae581
Update user capabilities in onResume.
...
Bug: 27641648
Change-Id: I85a6362a20885defa450760a3fbb16e124630434
2016-03-14 17:23:13 -07:00
pkanwar
68d1ca6de5
Remove band preference in WiFi settings.
...
Bug: b/25743379
Change-Id: Id330e2bb59a4a03479603a90c206662d3e3c5068
2016-03-14 21:05:56 +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
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
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
mariagpuyol
ae49edbdfd
Dialog for emergency info
...
Bug:27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
2016-03-11 21:06:23 -08: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
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
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
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
