OSDN Git Service
Mahaver Chopra [Mon, 21 Mar 2016 11:17:58 +0000 (11:17 +0000)]
Merge "User should confirm device lock before un-unifying" into nyc-dev
am:
ad1b7f6
* commit '
ad1b7f611310513b7dac74ffaff929c745126f44':
User should confirm device lock before un-unifying
Clara Bayarri [Mon, 21 Mar 2016 11:12:20 +0000 (11:12 +0000)]
Merge "User should confirm device lock before un-unifying" into nyc-dev
Geoff Mendal [Sat, 19 Mar 2016 03:21:56 +0000 (03:21 +0000)]
Import translations. DO NOT MERGE
am:
5f96b25 -s ours
* commit '
5f96b25dae8092ed5173ae89948515f1c2848f6f':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 19 Mar 2016 03:17:38 +0000 (04:17 +0100)]
Import translations. DO NOT MERGE
Change-Id: I2683d49e5f8a7beaa6eb6ee88265cda4fae9a2ca
Auto-generated-cl: translation import
Anna Galusza [Fri, 18 Mar 2016 21:41:30 +0000 (21:41 +0000)]
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791" into nyc-dev
am:
e9b5d59
* commit '
e9b5d5980bb6b6fab60c1224375201dc31fafc8b':
Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791
Anna Galusza [Fri, 18 Mar 2016 21:32:52 +0000 (21:32 +0000)]
Merge "Stops black screen from being displayed on changing Vision Settings in SUW. Bug:
27328791" into nyc-dev
Mahaver Chopra [Fri, 18 Mar 2016 19:08:05 +0000 (19:08 +0000)]
User should confirm device lock before un-unifying
User should confirm device lock before un-unifying
Move Use the same lock toggle the first option
When Unifying Title while confirming device password is of profile.
Bug:
26815727
Bug:
27523804
Bug:
27547551
Change-Id: I44857f7dcff3d68486e7e4d2ae8565b56d7c91b7
Tony Mak [Fri, 18 Mar 2016 18:54:45 +0000 (18:54 +0000)]
Merge "Should read specific user\'s password restriction" into nyc-dev
am:
2bfbcfa
* commit '
2bfbcfae13afd00b7e7e28031a9bda5f7de753f8':
Should read specific user's password restriction
Tony Mak [Fri, 18 Mar 2016 18:54:45 +0000 (18:54 +0000)]
Clear mHasResult if the result is dispatched
am:
b27d5b2
* commit '
b27d5b2007020e9911aaab57161bced168d3b99c':
Clear mHasResult if the result is dispatched
Tony Mak [Fri, 18 Mar 2016 18:51:58 +0000 (18:51 +0000)]
Merge "Should read specific user's password restriction" into nyc-dev
Tony Mak [Fri, 18 Mar 2016 18:24:13 +0000 (18:24 +0000)]
Clear mHasResult if the result is dispatched
The bug is because we dispatch the result again in setListener.
We should reset mHasResult if the result is dispatched already.
This bug is actually not work-challenge specific, I can reproduce it
in the setting to change screen lock.
Bug:
27242673
Change-Id: I29d2769a16c53d7103dafe1811bc808d634a8d85
Jason Monk [Fri, 18 Mar 2016 18:19:47 +0000 (18:19 +0000)]
Merge "Fix bluetooth device forgetting" into nyc-dev
am:
b56d3a6
* commit '
b56d3a6c33f9d548247cbf8ed4894a3f4227b0e5':
Fix bluetooth device forgetting
Jason Monk [Fri, 18 Mar 2016 18:13:47 +0000 (18:13 +0000)]
Merge "Fix bluetooth device forgetting" into nyc-dev
Jason Monk [Fri, 18 Mar 2016 18:11:25 +0000 (14:11 -0400)]
Fix bluetooth device forgetting
Bug:
27476922
Change-Id: I8c5b7076a04185371311fb4ff1c1ba0df0df19dc
Anna Galusza [Fri, 18 Mar 2016 17:18:36 +0000 (10:18 -0700)]
Stops black screen from being displayed on changing Vision Settings in SUW.
Bug:
27328791
Change-Id: Ied247c3a31dfc50c0113667e63aea4a0c771f7bc
mariagpuyol [Fri, 18 Mar 2016 15:43:57 +0000 (15:43 +0000)]
Merge "Remove emergency info subtitle" into nyc-dev
am:
db15d8e
* commit '
db15d8e21b54d9a0e57c2e5dca756cc306ee78ff':
Remove emergency info subtitle
Maria Garcia Puyol [Fri, 18 Mar 2016 15:37:58 +0000 (15:37 +0000)]
Merge "Remove emergency info subtitle" into nyc-dev
Abodunrinwa Toki [Fri, 18 Mar 2016 15:37:08 +0000 (15:37 +0000)]
Merge "Work challenge background: Fix top padding" into nyc-dev
am:
4873230
* commit '
487323032638e733d9cec4608838b7727b99232f':
Work challenge background: Fix top padding
Abodunrinwa Toki [Fri, 18 Mar 2016 15:30:01 +0000 (15:30 +0000)]
Merge "Work challenge background: Fix top padding" into nyc-dev
mariagpuyol [Fri, 18 Mar 2016 15:11:04 +0000 (08:11 -0700)]
Remove emergency info subtitle
Bug:
27621394
Change-Id: I9f2dfd1fd4926cb454cc8e4b7e3f100aa724aa76
Maria Garcia Puyol [Fri, 18 Mar 2016 15:09:53 +0000 (15:09 +0000)]
Merge "Revert "Dialog for emergency info"" into nyc-dev
am:
c35b08b
* commit '
c35b08b4b3de8daebbc6974715dbc4a0d4a91c1e':
Revert "Dialog for emergency info"
Maria Garcia Puyol [Fri, 18 Mar 2016 15:06:02 +0000 (15:06 +0000)]
Merge "Revert "Dialog for emergency info"" into nyc-dev
Tony Mak [Fri, 18 Mar 2016 13:48:16 +0000 (13:48 +0000)]
Should read specific user's password restriction
Bug:
27330307
Bug:
27543548
Change-Id: I385d190bdd8138f7189c657498f6a55bf84668ea
Philip P. Moltmann [Fri, 18 Mar 2016 14:32:43 +0000 (14:32 +0000)]
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
am:
47a9d4f
* commit '
47a9d4f70c21cb8b19af5699fb9522668dc0fb6a':
Correctly compose activity name of add-printer and print-settings activity
Ricky Wai [Fri, 18 Mar 2016 14:26:26 +0000 (14:26 +0000)]
Fix location settings crash when work profile is disabled
am:
3bd4771
* commit '
3bd4771ccb6f05c30cf7de6b2092f4f580821b56':
Fix location settings crash when work profile is disabled
Ricky Wai [Fri, 18 Mar 2016 14:26:26 +0000 (14:26 +0000)]
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
am:
ff99bae
* commit '
ff99bae74452e62249da336744637d8517448e5c':
Do not connect to KeyChainService when user is not started
Philip P. Moltmann [Fri, 18 Mar 2016 14:26:25 +0000 (14:26 +0000)]
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
Ricky Wai [Fri, 11 Mar 2016 09:06:02 +0000 (09:06 +0000)]
Fix location settings crash when work profile is disabled
Bug:
27402597
Change-Id: Iab5f999b67e9f81977142648f90cf31acb8b5f69
Ricky Wai [Fri, 18 Mar 2016 14:16:27 +0000 (14:16 +0000)]
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
Ricky Wai [Fri, 11 Mar 2016 07:09:24 +0000 (07:09 +0000)]
Do not connect to KeyChainService when user is not started
Bug:
27418671
Change-Id: Id1bca405e8b0ebea79726f623aaa0c59bce0331c
Maria Garcia Puyol [Thu, 17 Mar 2016 22:52:44 +0000 (22:52 +0000)]
Revert "Dialog for emergency info"
This reverts commit
ae49edbdfd79c3ccc2ae135690a35f4d57c8aaed.
Change-Id: I01a4b5966b380d967588bd0411e80d6bcd431fd1
Jeff Sharkey [Thu, 17 Mar 2016 22:14:09 +0000 (22:14 +0000)]
Merge "Follow framework refactoring." into nyc-dev
am:
297ce9a
* commit '
297ce9aaf396ab35f28d6c84ad0b3f040494aaf9':
Follow framework refactoring.
Jeff Sharkey [Thu, 17 Mar 2016 22:00:21 +0000 (22:00 +0000)]
Merge "Follow framework refactoring." into nyc-dev
Sudheer Shanka [Thu, 17 Mar 2016 21:49:50 +0000 (21:49 +0000)]
Merge "Fix string typo." into nyc-dev
am:
d0145cc
* commit '
d0145cc87a0eb2210022793f9d8aaf7f0462fcf9':
Fix string typo.
Xiaohui Chen [Thu, 17 Mar 2016 21:42:23 +0000 (21:42 +0000)]
Merge "fix build for ag/887244" into nyc-dev
am:
e7359ee
* commit '
e7359eee4c3dad9a5acf98ff61c9801dd13d2e8c':
fix build for ag/887244
Sudheer Shanka [Thu, 17 Mar 2016 21:41:42 +0000 (21:41 +0000)]
Merge "Fix string typo." into nyc-dev
Mahaver Chopra [Thu, 17 Mar 2016 21:37:19 +0000 (21:37 +0000)]
Merge "fix build for ag/887244" into nyc-dev
Anna Galusza [Thu, 17 Mar 2016 21:27:42 +0000 (21:27 +0000)]
Merge "Add divider below summary text on A11y SUW hub. Bug:
27066012" into nyc-dev
am:
a6b76bc
* commit '
a6b76bc4071c2946d0e809e72552cb1909b264ae':
Add divider below summary text on A11y SUW hub. Bug:
27066012
Anna Galusza [Thu, 17 Mar 2016 21:20:33 +0000 (21:20 +0000)]
Merge "Add divider below summary text on A11y SUW hub. Bug:
27066012" into nyc-dev
Anna Galusza [Thu, 17 Mar 2016 19:55:14 +0000 (12:55 -0700)]
Add divider below summary text on A11y SUW hub.
Bug:
27066012
Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
Xiaohui Chen [Thu, 17 Mar 2016 20:38:01 +0000 (13:38 -0700)]
fix build for ag/887244
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
Sudheer Shanka [Thu, 17 Mar 2016 20:18:32 +0000 (13:18 -0700)]
Fix string typo.
Bug:
27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
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
Abodunrinwa Toki [Thu, 17 Mar 2016 18:48:05 +0000 (18:48 +0000)]
Work challenge background: Fix top padding
Bug:
27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
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
Jeff Sharkey [Thu, 17 Mar 2016 17:04:55 +0000 (11:04 -0600)]
Follow framework refactoring.
Bug:
27531029
Change-Id: Iad76ba8ae7aab361f4f3147d9ac268bc480267e7
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