Jeff Sharkey
a806b7a61c
Follow framework refactoring.
...
Bug: 27531029
Change-Id: Iad76ba8ae7aab361f4f3147d9ac268bc480267e7
2016-03-17 11:34:05 -06:00
Julia Reynolds
f6fb21c44d
Merge "Fix crash adding an account." into nyc-dev
2016-03-17 17:30:17 +00:00
Julia Reynolds
8cedc7cae0
Fix crash adding an account.
...
Bug: 27709695
Change-Id: I66b69d71ed346e8d6f0d8493e6dd415d81f41ac1
2016-03-17 12:56:30 -04:00
Jason Monk
e580f94079
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
2016-03-17 13:30:14 +00:00
Robin Lee
37b179fa8c
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
2016-03-17 10:26:51 +00:00
Daichi Hirono
23f4261e3d
Merge "Use CheckableLinearLayout for Use USB for dialog's item." into nyc-dev
2016-03-17 10:05:49 +00:00
Daichi Hirono
9300eb1b14
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
2016-03-17 15:57:36 +09:00
Yohei Yukawa
143a686947
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
2016-03-16 20:50:28 -07:00
Meng Wang
2ccf1fd7c9
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
2016-03-16 23:24:40 +00:00
Robin Lee
d0979a540b
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
2016-03-16 21:30:54 +00:00
Chris Tate
8b90b39c5e
Merge "Don't crash if the backup transport supplies bogus intents" into nyc-dev
2016-03-16 21:14:39 +00:00
Christopher Tate
4a6c259179
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
2016-03-16 13:45:03 -07:00
Jason Monk
045e518b55
Fix battery history detail up
...
Bug: 27476391
Change-Id: I21f2bbbf4306d36ffa1c4825ecaebd45dca50171
2016-03-16 16:29:26 -04:00
Robin Lee
eb034eb65e
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
2016-03-16 20:28:52 +00:00
Jason Monk
ef6671b0b7
Fix clickability of conditionals
...
Bug: 27700081
Change-Id: If991419541dd021197ea641f8b2caee5cc16af36
2016-03-16 16:25:09 -04:00
Jason Monk
0d6a574100
Try to recycle prefs in battery summary
...
Bug: 27404159
Change-Id: I5a71413f22e14b8300b6821da661a613392a06e0
2016-03-16 15:52:35 -04:00
Jason Monk
30ab199536
Don't use animations for security settings
...
Bug: 27419463
Change-Id: I85a8ff3a7720fcaa33f4883b4fd4e569bcae3be2
2016-03-16 15:13:19 -04:00
Sudheer Shanka
f440bad9a2
Merge "Don\'t set useAdminDisabledSummary when there is already a summary." into nyc-dev am: 24ec9e8
...
am: 5dfe728
2016-03-16 18:58:29 +00:00
Sudheer Shanka
5dfe72854f
Merge "Don\'t set useAdminDisabledSummary when there is already a summary." into nyc-dev
...
am: 24ec9e8
2016-03-16 18:55:02 +00:00
Sudheer Shanka
24ec9e872c
Merge "Don't set useAdminDisabledSummary when there is already a summary." into nyc-dev
2016-03-16 18:49:26 +00:00
Sudheer Shanka
b3dc3f2983
Don't set useAdminDisabledSummary when there is already a summary.
...
Bug: 27155568
Change-Id: If2a7bf127307731b2e2258dc6389caed13950f79
2016-03-16 11:42:58 -07:00
Jason Monk
d11cca0168
Fix Settings home lifecycle
...
Bug: 27330440
Bug: 26268813
Change-Id: Ibb3729c9872be2488db3741ec72ba5a43e66db5f
2016-03-16 14:27:12 -04:00
Mahaver Chopra
c63ef946d4
Title text and input bar should be white
...
Bug: 27147209
Change-Id: I428ae98ef60db22d50305df39d8d16e63bd5e14f
2016-03-16 17:42:24 +00:00
Mahaver Chopra
8b06553a27
Work Profile Security Challenge: Finalised strings
...
Bug: 25601630
Change-Id: I388fba7dc08196faed35f2e990d558d22a6bbaa4
2016-03-16 17:28:58 +00:00
Julia Reynolds
6af2af0fd7
Merge "String and accessibility changes." into nyc-dev am: bfde3fd
...
am: 9adb7bd
2016-03-16 17:18:35 +00:00
Julia Reynolds
9adb7bd370
Merge "String and accessibility changes." into nyc-dev
...
am: bfde3fd
2016-03-16 17:14:12 +00:00
Julia Reynolds
bfde3fd085
Merge "String and accessibility changes." into nyc-dev
2016-03-16 17:04:15 +00:00
Geoff Mendal
24391e2009
Import translations. DO NOT MERGE am: 0af50ae -s ours
...
am: 632ea87
2016-03-16 15:46:32 +00:00
Geoff Mendal
632ea87dbd
Import translations. DO NOT MERGE
...
am: 0af50ae
2016-03-16 15:44:11 +00:00
Julia Reynolds
017ae508a0
String and accessibility changes.
...
Bug: 27490367
Bug: 27491350
Bug: 27655047
Bug: 24573668
Change-Id: I972d15666b206fd4f94fc55bec77b8cfbc6b7e04
2016-03-16 11:40:54 -04:00
Geoff Mendal
0af50ae581
Import translations. DO NOT MERGE
...
Change-Id: I37a8ba55bb9cd820668fc367e1d2ba8ee07b09ee
Auto-generated-cl: translation import
2016-03-16 07:43:55 -07:00
Carsten Hauge
3bd5c56143
Merge "Add Up button in Status settings" am: aca67a3
...
am: 9141fb3
2016-03-16 14:11:01 +00:00
Carsten Hauge
9141fb30c3
Merge "Add Up button in Status settings"
...
am: aca67a3
2016-03-16 14:08:30 +00:00
Jason Monk
aca67a3c43
Merge "Add Up button in Status settings"
2016-03-16 14:01:24 +00:00
Geoff Mendal
0ab1b3f3ed
Import translations. DO NOT MERGE
...
Change-Id: I3dc791a428e410cde328132cc8e4f0d3db70f008
Auto-generated-cl: translation import
2016-03-16 06:34:18 -07:00
Carsten Hauge
ce42dfb33d
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
2016-03-16 14:48:32 +09:00
Daichi Hirono
cc675b1afd
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev am: 1a1ad649c2
...
am: da475c53d3
2016-03-16 02:07:05 +00:00
Daichi Hirono
da475c53d3
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev
...
am: 1a1ad649c2
2016-03-16 02:04:32 +00:00
Daichi Hirono
1a1ad649c2
Merge "Fix description of MTP option in the "Use USB for" dialog." into nyc-dev
2016-03-16 01:59:44 +00:00
Adrian Roos
091a921a49
Merge "Fix NotificationLockscreenPreference" into nyc-dev am: af0d3952c8
...
am: a7737f6df9
2016-03-15 23:49:07 +00:00
Adrian Roos
a7737f6df9
Merge "Fix NotificationLockscreenPreference" into nyc-dev
...
am: af0d3952c8
2016-03-15 23:46:16 +00:00
Adrian Roos
af0d3952c8
Merge "Fix NotificationLockscreenPreference" into nyc-dev
2016-03-15 23:43:21 +00:00
Sudheer Shanka
6e95a2991c
Merge "Update user capabilities in onResume." into nyc-dev am: f6c5128763
...
am: 5d5cb14e3d
2016-03-15 23:41:37 +00:00
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
Prathmesh Prabhu
273b5d7af2
Merge "settings: Fix more NPEs when bluetooth is missing." into nyc-dev am: 023f7033ef
...
am: fe87ed9d40
2016-03-15 21:05:53 +00:00
mariagpuyol
ba2e8e5516
Merge "Dialog for emergency info" into nyc-dev am: 82c512dbd6
...
am: 6bfdd3a973
2016-03-15 21:05:53 +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
