OSDN Git Service
Udam Saini [Thu, 17 Mar 2016 20:06:47 +0000 (20:06 +0000)]
Merge "Sets the divider style to either for fingerprint." into nyc-dev
am:
4c173cb
* commit '
4c173cb46effd9d932ebdfb9c1c634edb5bee19d':
Sets the divider style to either for fingerprint.
Udam Saini [Thu, 17 Mar 2016 19:59:52 +0000 (19:59 +0000)]
Merge "Sets the divider style to either for fingerprint." into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Fix build" into nyc-dev
am:
7c80241
* commit '
7c802419fd99445442cb7499757dbcadda18fee0':
Fix build
Mahaver Chopra [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Title text and input bar should be white" into nyc-dev
am:
bef02df
* commit '
bef02df556fd4ea09c416025b67e6769b25a6c4a':
Title text and input bar should be white
Mahaver Chopra [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
am:
78a4bcd
* commit '
78a4bcd4196450d245adebec15aaae2be2778493':
Work Profile Security Challenge: Finalised strings
Julia Reynolds [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Fix crash adding an account." into nyc-dev
am:
f6fb21c
* commit '
f6fb21c44d1b138c28bdd057c7b83e35f62a432b':
Fix crash adding an account.
Jason Monk [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
am:
e580f94
* commit '
e580f940795da75b920753c75fd4ec43a8db8957':
Fix battery history detail up
Fix clickability of conditionals
Try to recycle prefs in battery summary
Don't use animations for security settings
Fix Settings home lifecycle
Robin Lee [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
vpn: check fragment is visible before adding prefs
am:
37b179f
* commit '
37b179fa8cdde8e00a745cbf030bcb1836e921c4':
vpn: check fragment is visible before adding prefs
Daichi Hirono [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev
am:
23f4261
* commit '
23f4261e3da25d61db73ba8404da9608ba19ccb0':
Use CheckableLinearLayout for Use USB for dialog's item.
Yohei Yukawa [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Stop using a deprecated constructor of InputMethodSettings.
am:
143a686
* commit '
143a6869476a4be5962d4bba3b222d078f46b9a0':
Stop using a deprecated constructor of InputMethodSettings.
Meng Wang [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
am:
2ccf1fd
* commit '
2ccf1fd7c90b75f1cbf9a4639af926d16d50ca2e':
Show ICCID in SIM status, if CarrierConfigManager allows.
Robin Lee [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
am:
d0979a5
* commit '
d0979a540b158485a7766e3466589f6cf171d2a7':
Show "no vpns added" for empty vpn screen
Christopher Tate [Thu, 17 Mar 2016 18:19:23 +0000 (18:19 +0000)]
Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev
am:
8b90b39
* commit '
8b90b39c5e222abecd57cc89ccfbca36f52fc38f':
Don't crash if the backup transport supplies bogus intents
Julia Reynolds [Thu, 17 Mar 2016 18:07:48 +0000 (18:07 +0000)]
Merge "Fix build" into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 17:58:15 +0000 (13:58 -0400)]
Fix build
Bug:
27709695
Change-Id: I2020a33aa0a305e025d7d004df4b23838bb42992
Mahaver Chopra [Thu, 17 Mar 2016 17:49:34 +0000 (17:49 +0000)]
Merge "Title text and input bar should be white" into nyc-dev
Mahaver Chopra [Thu, 17 Mar 2016 17:48:35 +0000 (17:48 +0000)]
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 17:30:17 +0000 (17:30 +0000)]
Merge "Fix crash adding an account." into nyc-dev
Julia Reynolds [Thu, 17 Mar 2016 16:56:30 +0000 (12:56 -0400)]
Fix crash adding an account.
Bug:
27709695
Change-Id: I66b69d71ed346e8d6f0d8493e6dd415d81f41ac1
Jason Monk [Thu, 17 Mar 2016 13:30:14 +0000 (13:30 +0000)]
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
* changes:
Fix battery history detail up
Fix clickability of conditionals
Try to recycle prefs in battery summary
Don't use animations for security settings
Fix Settings home lifecycle
Robin Lee [Thu, 17 Mar 2016 10:20:29 +0000 (10:20 +0000)]
vpn: check fragment is visible before adding prefs
As VPN settings listens to network events it may get woken up again
while it's in the background.
Bug:
23596799
Change-Id: If6e07493da447d7ded324ff86b6e7d57c5c615e3
Daichi Hirono [Thu, 17 Mar 2016 10:05:49 +0000 (10:05 +0000)]
Merge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev
Daichi Hirono [Thu, 17 Mar 2016 06:57:36 +0000 (15:57 +0900)]
Use CheckableLinearLayout for Use USB for dialog's item.
The root of "Use USB for" dialog's item is CheckableLinearLayout, which
defers the check state to direct children. However previously we had
CheckedTextView not just under CheckableLinearLayout. The structure
looks like:
Root CheckableLinearLayout -> LinearLayout -> CheckedTextView
The CL replaces the second child LinearLayout with CheckableLinearLayout
so that we can defer the state to CheckedTextView.
BUG=
27708922
Change-Id: If0491235eac0a82bcb07e31856aa6b9535930fb2
Yohei Yukawa [Thu, 17 Mar 2016 03:50:28 +0000 (20:50 -0700)]
Stop using a deprecated constructor of InputMethodSettings.
This is a follow up CL to my previous CL [1], which added a new
constructor to InputMethodSettings to support File-Based
Encryption (FBE).
Settings app is the only remaining package that depends on the previous
constructor. To completely deprecate the previous one, this CL lets the
caller switch to the new constructor.
Note that this CL does not change the initial parameters of
InputMethodSettings. In other words this is a mechanical code
clean-up.
[1] I9c6f9bb3d51174198e5f73588637f87ea0d90e11
5db2f16f15549c490c9541602a96f42bef984acb
Bug:
26279466
Change-Id: I09cba4066b95c4a9e89a3e4f83d75b97882502dc
Meng Wang [Wed, 16 Mar 2016 23:24:40 +0000 (23:24 +0000)]
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
Robin Lee [Wed, 16 Mar 2016 21:30:53 +0000 (21:30 +0000)]
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
Chris Tate [Wed, 16 Mar 2016 21:14:39 +0000 (21:14 +0000)]
Merge "Don't crash if the backup transport supplies bogus intents" into nyc-dev
Christopher Tate [Wed, 16 Mar 2016 20:45:03 +0000 (13:45 -0700)]
Don't crash if the backup transport supplies bogus intents
Preflight the (activity) intents supplied by the transport so that when
clicked, they don't crash the Preference that called startActivity().
Bug
27689847
Change-Id: I7cbdd6077ac74500ecdf9607310727af56d55a3c
Jason Monk [Wed, 16 Mar 2016 20:29:26 +0000 (16:29 -0400)]
Fix battery history detail up
Bug:
27476391
Change-Id: I21f2bbbf4306d36ffa1c4825ecaebd45dca50171
Robin Lee [Wed, 16 Mar 2016 12:39:00 +0000 (12:39 +0000)]
Show "no vpns added" for empty vpn screen
Removed the left-alignment on restricted empty views which was
inherited from Bluetooth settings but inconsistent with normal
settings fragments.
Bug:
22685111
Change-Id: I3a36c47d523392b8925031d4cac2ab3ef681e360
Jason Monk [Wed, 16 Mar 2016 20:25:09 +0000 (16:25 -0400)]
Fix clickability of conditionals
Bug:
27700081
Change-Id: If991419541dd021197ea641f8b2caee5cc16af36
Jason Monk [Wed, 16 Mar 2016 19:52:35 +0000 (15:52 -0400)]
Try to recycle prefs in battery summary
Bug:
27404159
Change-Id: I5a71413f22e14b8300b6821da661a613392a06e0
Jason Monk [Wed, 16 Mar 2016 19:13:19 +0000 (15:13 -0400)]
Don't use animations for security settings
Bug:
27419463
Change-Id: I85a8ff3a7720fcaa33f4883b4fd4e569bcae3be2
Sudheer Shanka [Wed, 16 Mar 2016 18:55:02 +0000 (18:55 +0000)]
Merge "Don\'t set useAdminDisabledSummary when there is already a summary." into nyc-dev
am:
24ec9e8
* commit '
24ec9e872cac073fa7b21137dd50ec95cadc9823':
Don't set useAdminDisabledSummary when there is already a summary.
Sudheer Shanka [Wed, 16 Mar 2016 18:49:26 +0000 (18:49 +0000)]
Merge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev
Sudheer Shanka [Wed, 16 Mar 2016 18:42:58 +0000 (11:42 -0700)]
Don't set useAdminDisabledSummary when there is already a summary.
Bug:
27155568
Change-Id: If2a7bf127307731b2e2258dc6389caed13950f79
Jason Monk [Wed, 16 Mar 2016 18:27:12 +0000 (14:27 -0400)]
Fix Settings home lifecycle
Bug:
27330440
Bug:
26268813
Change-Id: Ibb3729c9872be2488db3741ec72ba5a43e66db5f
Mahaver Chopra [Wed, 16 Mar 2016 17:21:45 +0000 (17:21 +0000)]
Title text and input bar should be white
Bug:
27147209
Change-Id: I428ae98ef60db22d50305df39d8d16e63bd5e14f
Mahaver Chopra [Wed, 16 Mar 2016 17:15:22 +0000 (17:15 +0000)]
Work Profile Security Challenge: Finalised strings
Bug:
25601630
Change-Id: I388fba7dc08196faed35f2e990d558d22a6bbaa4
Julia Reynolds [Wed, 16 Mar 2016 17:14:12 +0000 (17:14 +0000)]
Merge "String and accessibility changes." into nyc-dev
am:
bfde3fd
* commit '
bfde3fd0852364e957e1f98279ff19272df21894':
String and accessibility changes.
Julia Reynolds [Wed, 16 Mar 2016 17:04:15 +0000 (17:04 +0000)]
Merge "String and accessibility changes." into nyc-dev
Geoff Mendal [Wed, 16 Mar 2016 15:44:11 +0000 (15:44 +0000)]
Import translations. DO NOT MERGE
am:
0af50ae -s ours
* commit '
0af50ae5810a36adb2df39773dcd43891969f06f':
Import translations. DO NOT MERGE
Julia Reynolds [Wed, 16 Mar 2016 15:40:54 +0000 (11:40 -0400)]
String and accessibility changes.
Bug:
27490367
Bug:
27491350
Bug:
27655047
Bug:
24573668
Change-Id: I972d15666b206fd4f94fc55bec77b8cfbc6b7e04
Geoff Mendal [Wed, 16 Mar 2016 14:43:55 +0000 (07:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I37a8ba55bb9cd820668fc367e1d2ba8ee07b09ee
Auto-generated-cl: translation import
Carsten Hauge [Wed, 16 Mar 2016 14:08:30 +0000 (14:08 +0000)]
Merge "Add Up button in Status settings"
am:
aca67a3
* commit '
aca67a3c43e9a88cc9abff6a2db1ac9d21856b5c':
Add Up button in Status settings
Jason Monk [Wed, 16 Mar 2016 14:01:24 +0000 (14:01 +0000)]
Merge "Add Up button in Status settings"
Carsten Hauge [Fri, 14 Mar 2014 13:41:55 +0000 (14:41 +0100)]
Add Up button in Status settings
The Up button should be added in Status settings
(Settings > About phone > Status) to provide consistent navigation
with other screen like Legal information.
Change-Id: I914df08cc4034d78d345a0958b1820e8933f85e7
Daichi Hirono [Wed, 16 Mar 2016 02:04:32 +0000 (02:04 +0000)]
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev
am:
1a1ad649c2
* commit '
1a1ad649c20b94204daaae23ffd060ba52025216':
Fix description of MTP option in the "Use USB for" dialog.
Daichi Hirono [Wed, 16 Mar 2016 01:59:44 +0000 (01:59 +0000)]
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev
Adrian Roos [Tue, 15 Mar 2016 23:46:16 +0000 (23:46 +0000)]
Merge "Fix NotificationLockscreenPreference" into nyc-dev
am:
af0d3952c8
* commit '
af0d3952c803ac1e654b4f49c2829dadf9a5ef06':
Fix NotificationLockscreenPreference
Adrian Roos [Tue, 15 Mar 2016 23:43:21 +0000 (23:43 +0000)]
Merge "Fix NotificationLockscreenPreference" into nyc-dev
Sudheer Shanka [Tue, 15 Mar 2016 23:39:17 +0000 (23:39 +0000)]
Merge "Update user capabilities in onResume." into nyc-dev
am:
f6c5128763
* commit '
f6c5128763c3bbcd71c3a58020132929099e844a':
Update user capabilities in onResume.
Sudheer Shanka [Tue, 15 Mar 2016 23:32:26 +0000 (23:32 +0000)]
Merge "Update user capabilities in onResume." into nyc-dev
Prathmesh Prabhu [Tue, 15 Mar 2016 21:00:33 +0000 (21:00 +0000)]
Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev
am:
023f7033ef
* commit '
023f7033ef114c8f3e57d0178ae2583289f5709a':
settings: Fix more NPEs when bluetooth is missing.
mariagpuyol [Tue, 15 Mar 2016 21:00:32 +0000 (21:00 +0000)]
Merge "Dialog for emergency info" into nyc-dev
am:
82c512dbd6
* commit '
82c512dbd6072d21d00677a96cd015d20d1a952d':
Dialog for emergency info
Prathmesh Prabhu [Tue, 15 Mar 2016 20:54:44 +0000 (20:54 +0000)]
Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev
Maria Garcia Puyol [Tue, 15 Mar 2016 20:52:17 +0000 (20:52 +0000)]
Merge "Dialog for emergency info" into nyc-dev
Udam Saini [Tue, 15 Mar 2016 00:47:37 +0000 (17:47 -0700)]
Sets the divider style to either for fingerprint.
This keeps the divider style to match the rest of settings.
bug:
27619572
Change-Id: Ieef37adae119311106d47321b7f3495446d5da7d
Anna Galusza [Tue, 15 Mar 2016 17:50:09 +0000 (17:50 +0000)]
Change magnification strings and accessibility traversal order in preview pane. Bug:
27499075 Bug:
27326035
am:
a1a11d1944
* commit '
a1a11d1944af1bdc0ec6005d363652743edf1f50':
Change magnification strings and accessibility traversal order in preview pane. Bug:
27499075 Bug:
27326035
Anna Galusza [Tue, 15 Mar 2016 00:02:38 +0000 (17:02 -0700)]
Change magnification strings and accessibility traversal order in preview pane.
Bug:
27499075
Bug:
27326035
Change-Id: I03ff9574d845a1c2573aa6f4f2462851c56b3c04
Anna Galusza [Tue, 15 Mar 2016 17:22:31 +0000 (17:22 +0000)]
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
* commit '
b740f34f72dee83c52a7c5539bb9fb3bf3ad079a':
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
Anna Galusza [Tue, 15 Mar 2016 17:09:34 +0000 (17:09 +0000)]
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
Jason Monk [Tue, 15 Mar 2016 15:43:25 +0000 (15:43 +0000)]
Merge "Fix data usage" into nyc-dev
am:
0ee49040b3
* commit '
0ee49040b3271e5297d9a7848978bc62a894c714':
Fix data usage
Jason Monk [Tue, 15 Mar 2016 15:39:19 +0000 (15:39 +0000)]
Merge "Fix data usage" into nyc-dev
Jason Monk [Tue, 15 Mar 2016 15:36:06 +0000 (11:36 -0400)]
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
Geoff Mendal [Tue, 15 Mar 2016 13:33:19 +0000 (13:33 +0000)]
Import translations. DO NOT MERGE
am:
0f246eb0ec -s ours
* commit '
0f246eb0eced98101046d785452bdfd9c6dbcffa':
Import translations. DO NOT MERGE
Geoff Mendal [Tue, 15 Mar 2016 13:27:03 +0000 (06:27 -0700)]
Import translations. DO NOT MERGE
Change-Id: I69ad76180b5179f67a07536afc785d01ac28f92c
Auto-generated-cl: translation import
Adrian Roos [Tue, 15 Mar 2016 06:08:34 +0000 (23:08 -0700)]
Fix NotificationLockscreenPreference
Remote-Input-on-Lockscreen setting was inverted.
Bug:
27638447
Change-Id: I4ca17854dae7c6a47e4fe22be2e862e96742f457
Daichi Hirono [Tue, 15 Mar 2016 02:20:36 +0000 (11:20 +0900)]
Fix description of MTP option in the "Use USB for" dialog.
BUG=
27150127
Change-Id: Ib5bdd6394ae2a8a64b95ddfc07ccf7bfd0c8f335
pkanwar [Tue, 15 Mar 2016 01:20:20 +0000 (01:20 +0000)]
Remove band preference in WiFi settings. Bug: b/
25743379
am:
68d1ca6de5
* commit '
68d1ca6de59b6ff53b49a7684c61bb6f38a65824':
Remove band preference in WiFi settings. Bug: b/
25743379
Meng Wang [Mon, 14 Mar 2016 17:03:30 +0000 (10:03 -0700)]
Show ICCID in SIM status, if CarrierConfigManager allows.
Bug:
27574058
Change-Id: I5c08d31b5e8ea3c3ad79361e660256b070ff7284
Sudheer Shanka [Tue, 15 Mar 2016 00:23:13 +0000 (17:23 -0700)]
Update user capabilities in onResume.
Bug:
27641648
Change-Id: I85a6362a20885defa450760a3fbb16e124630434
pkanwar [Mon, 14 Mar 2016 21:00:45 +0000 (14:00 -0700)]
Remove band preference in WiFi settings.
Bug: b/
25743379
Change-Id: Id330e2bb59a4a03479603a90c206662d3e3c5068
Udam Saini [Mon, 14 Mar 2016 18:14:04 +0000 (18:14 +0000)]
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
Udam Saini [Mon, 14 Mar 2016 18:14:04 +0000 (18:14 +0000)]
Merge "Adjusts layout on encryption interstitial." into nyc-dev
am:
6ea990a7e0
* commit '
6ea990a7e037a8082575d15a0e00be8255d0b3c3':
Adjusts layout on encryption interstitial.
Udam Saini [Mon, 14 Mar 2016 17:42:15 +0000 (17:42 +0000)]
Merge "Uses recycler view to add a line at the top in the intro" into nyc-dev
Udam Saini [Mon, 14 Mar 2016 17:42:08 +0000 (17:42 +0000)]
Merge "Adjusts layout on encryption interstitial." into nyc-dev
Geoff Mendal [Mon, 14 Mar 2016 16:34:52 +0000 (16:34 +0000)]
Revert "Import translations. DO NOT MERGE"
am:
0bd0bb04b2 -s ours
* commit '
0bd0bb04b2a39767d5a2dc1f6c4abfb53954cc5d':
Revert "Import translations. DO NOT MERGE"
Geoff Mendal [Mon, 14 Mar 2016 16:27:44 +0000 (16:27 +0000)]
Revert "Import translations. DO NOT MERGE"
This reverts commit
920745e7804c690249401d5b44875cd00b76b83c.
Change-Id: Ib5e8de4dc7c0583c77f355ba038e6952a99b3988
Geoff Mendal [Mon, 14 Mar 2016 14:48:38 +0000 (14:48 +0000)]
Import translations. DO NOT MERGE
am:
920745e780 -s ours
* commit '
920745e7804c690249401d5b44875cd00b76b83c':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 14 Mar 2016 14:42:45 +0000 (07:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: If2ae5423dae2e4f4c9128fea6f37f5483ba754a5
Auto-generated-cl: translation import
mariagpuyol [Sat, 12 Mar 2016 02:54:19 +0000 (18:54 -0800)]
Dialog for emergency info
Bug:
27621394
Change-Id: I894f5526d05c84eec81e9fe87a105f466195073d
Mihai Nita [Sat, 12 Mar 2016 00:07:07 +0000 (00:07 +0000)]
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev
am:
42734c1551
* commit '
42734c1551dfac552376efad685f0215724ab518':
Settings: change "Language & input" to -> "Languages & input"
Paul Lawrence [Sat, 12 Mar 2016 00:07:06 +0000 (00:07 +0000)]
Merge "Don\'t show secure startup options and strings when file encrypted" into nyc-dev
am:
0ca47e2c55
* commit '
0ca47e2c5506d286469f29c25e5d45a45623e20f':
Don't show secure startup options and strings when file encrypted
pkanwar [Sat, 12 Mar 2016 00:07:06 +0000 (00:07 +0000)]
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
Udam Saini [Thu, 10 Mar 2016 01:25:39 +0000 (17:25 -0800)]
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
Mihai Niță [Fri, 11 Mar 2016 22:05:18 +0000 (22:05 +0000)]
Merge "Settings: change "Language & input" to -> "Languages & input"" into nyc-dev
Paul Lawrence [Fri, 11 Mar 2016 21:49:16 +0000 (21:49 +0000)]
Merge "Don't show secure startup options and strings when file encrypted" into nyc-dev
Prathmesh Prabhu [Fri, 11 Mar 2016 21:27:17 +0000 (13:27 -0800)]
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
Paul Lawrence [Thu, 10 Mar 2016 21:54:56 +0000 (13:54 -0800)]
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
Mihai Nita [Tue, 8 Mar 2016 22:46:23 +0000 (14:46 -0800)]
Settings: change "Language & input" to -> "Languages & input"
Because now the user can select more than one locale.
Bug:
26849449
Change-Id: I7927fb53012444afafe327e7103ada8ae9808dac
Pankaj Kanwar [Fri, 11 Mar 2016 20:38:10 +0000 (20:38 +0000)]
Merge "Remove band preference in WiFi settings. Bug: b/
25743379" into nyc-dev
Udam Saini [Thu, 10 Mar 2016 22:19:27 +0000 (14:19 -0800)]
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
Bill Yi [Fri, 11 Mar 2016 18:16:08 +0000 (18:16 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
am:
57ab609aab -s ours
* commit '
57ab609aab9781dfb23824e4e05b60e1b00d4843':
Import translations. DO NOT MERGE
Bill Yi [Fri, 11 Mar 2016 18:10:28 +0000 (18:10 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-dev
Anna Galusza [Fri, 11 Mar 2016 17:53:03 +0000 (17:53 +0000)]
Merge "Update preview border. Bug:
27396174" into nyc-dev
am:
c4d7bc85dc
* commit '
c4d7bc85dc21a3acae5e7d5c4303cdaad6e3e76a':
Update preview border. Bug:
27396174
Anna Galusza [Fri, 11 Mar 2016 17:46:34 +0000 (17:46 +0000)]
Merge "Update preview border. Bug:
27396174" into nyc-dev
pkanwar [Fri, 11 Mar 2016 02:12:17 +0000 (18:12 -0800)]
Remove band preference in WiFi settings.
Bug: b/
25743379
Change-Id: Iddea166e0e0925fffb70de80978501945e8999a7
Bill Yi [Fri, 11 Mar 2016 08:37:29 +0000 (00:37 -0800)]
Import translations. DO NOT MERGE
Change-Id: I097e4b41363cc85bf5698ee2d84d3ba502967113
Auto-generated-cl: translation import
Udam Saini [Thu, 10 Mar 2016 23:12:07 +0000 (23:12 +0000)]
Merge "Prevent settings from being announced on wifi dialog." into nyc-dev
am:
dccc582d26
* commit '
dccc582d268df33cdcc2fafef8522b7617538e19':
Prevent settings from being announced on wifi dialog.