Abodunrinwa Toki
153ce15c31
Merge "Work challenge background: Fix top padding" into nyc-dev
...
am: 4873230
2016-03-18 15:37:08 +00:00
Abodunrinwa Toki
4873230326
Merge "Work challenge background: Fix top padding" into nyc-dev
2016-03-18 15:30:01 +00:00
Maria Garcia Puyol
2aca50b657
Merge "Revert "Dialog for emergency info"" into nyc-dev
...
am: c35b08b
2016-03-18 15:09:53 +00:00
Maria Garcia Puyol
c35b08b4b3
Merge "Revert "Dialog for emergency info"" into nyc-dev
2016-03-18 15:06:02 +00:00
Philip P. Moltmann
f9f4429f80
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
...
am: 47a9d4f
2016-03-18 14:32:43 +00:00
Ricky Wai
b8e660b62f
Fix location settings crash when work profile is disabled
...
am: 3bd4771
2016-03-18 14:26:26 +00:00
Ricky Wai
89d419eb37
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
...
am: ff99bae
2016-03-18 14:26:26 +00:00
Philip P. Moltmann
47a9d4f70c
Merge "Correctly compose activity name of add-printer and print-settings activity" into nyc-dev
2016-03-18 14:26:25 +00:00
Ricky Wai
3bd4771ccb
Fix location settings crash when work profile is disabled
...
Bug: 27402597
Change-Id: Iab5f999b67e9f81977142648f90cf31acb8b5f69
2016-03-18 14:18:45 +00:00
Ricky Wai
ff99bae744
Merge "Do not connect to KeyChainService when user is not started" into nyc-dev
2016-03-18 14:16:27 +00:00
Ricky Wai
78fb3d3e42
Do not connect to KeyChainService when user is not started
...
Bug: 27418671
2016-03-18 14:15:11 +00:00
Maria Garcia Puyol
da497f26d7
Revert "Dialog for emergency info"
...
This reverts commit ae49edbdfd
2016-03-17 22:52:44 +00:00
Jeff Sharkey
2758b99e9d
Merge "Follow framework refactoring." into nyc-dev
...
am: 297ce9a
2016-03-17 22:14:09 +00:00
Jeff Sharkey
297ce9aaf3
Merge "Follow framework refactoring." into nyc-dev
2016-03-17 22:00:22 +00:00
Sudheer Shanka
feed83f7a3
Merge "Fix string typo." into nyc-dev
...
am: d0145cc
2016-03-17 21:49:50 +00:00
Xiaohui Chen
a4da11246f
Merge "fix build for ag/887244" into nyc-dev
...
am: e7359ee
2016-03-17 21:42:23 +00:00
Sudheer Shanka
d0145cc87a
Merge "Fix string typo." into nyc-dev
2016-03-17 21:41:43 +00:00
Mahaver Chopra
e7359eee4c
Merge "fix build for ag/887244" into nyc-dev
2016-03-17 21:37:20 +00:00
Anna Galusza
a7df8a7c1b
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
...
am: a6b76bc
2016-03-17 21:27:42 +00:00
Anna Galusza
a6b76bc407
Merge "Add divider below summary text on A11y SUW hub. Bug: 27066012" into nyc-dev
2016-03-17 21:20:34 +00:00
Anna Galusza
6a2a53e94d
Add divider below summary text on A11y SUW hub.
...
Bug: 27066012
Change-Id: Ic545a50ec2a0b5b7a40152ea818bd15673c629d2
2016-03-17 14:20:02 -07:00
Xiaohui Chen
e4649dde7f
fix build for ag/887244
...
Change-Id: Iaa57eff6d1c9117d3ed55420712e7c6db6d2aa88
2016-03-17 20:41:03 +00:00
Sudheer Shanka
9a958bae30
Fix string typo.
...
Bug: 27627894
Change-Id: I6039acd69363a3827e42e5efda23123af6dfd1c1
2016-03-17 13:18:32 -07:00
Udam Saini
2607f5516c
Merge "Sets the divider style to either for fingerprint." into nyc-dev
...
am: 4c173cb
2016-03-17 20:06:47 +00:00
Udam Saini
4c173cb46e
Merge "Sets the divider style to either for fingerprint." into nyc-dev
2016-03-17 19:59:53 +00:00
Abodunrinwa Toki
af700ec6e0
Work challenge background: Fix top padding
...
Bug: 27693796
Change-Id: Iafda9dfed2b87c3618c155d4434d5895547f6fe0
2016-03-17 18:48:05 +00:00
Julia Reynolds
f9c21c28a3
Merge "Fix build" into nyc-dev
...
am: 7c80241
2016-03-17 18:19:23 +00:00
Mahaver Chopra
36e4e7ac10
Merge "Title text and input bar should be white" into nyc-dev
...
am: bef02df
2016-03-17 18:19:23 +00:00
Mahaver Chopra
0ed1e25a22
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
...
am: 78a4bcd
2016-03-17 18:19:23 +00:00
Julia Reynolds
1e148a3094
Merge "Fix crash adding an account." into nyc-dev
...
am: f6fb21c
2016-03-17 18:19:23 +00:00
Jason Monk
8dd1b68b6f
Merge changes I21f2bbbf,If9914195,I5a71413f,I85a8ff3a,Ibb3729c9 into nyc-dev
...
am: e580f94
2016-03-17 18:19:23 +00:00
Robin Lee
64de61e683
vpn: check fragment is visible before adding prefs
...
am: 37b179f
2016-03-17 18:19:23 +00:00
Daichi Hirono
9ed9d94ab5
Merge "Use CheckableLinearLayout for Use USB for dialog\'s item." into nyc-dev
...
am: 23f4261
2016-03-17 18:19:23 +00:00
Yohei Yukawa
9452632d23
Stop using a deprecated constructor of InputMethodSettings.
...
am: 143a686
2016-03-17 18:19:23 +00:00
Meng Wang
96f2194480
Merge "Show ICCID in SIM status, if CarrierConfigManager allows." into nyc-dev
...
am: 2ccf1fd
2016-03-17 18:19:23 +00:00
Robin Lee
8af9a74529
Merge "Show "no vpns added" for empty vpn screen" into nyc-dev
...
am: d0979a5
2016-03-17 18:19:23 +00:00
Christopher Tate
ecd0f417ef
Merge "Don\'t crash if the backup transport supplies bogus intents" into nyc-dev
...
am: 8b90b39
2016-03-17 18:19:23 +00:00
Julia Reynolds
7c802419fd
Merge "Fix build" into nyc-dev
2016-03-17 18:07:48 +00:00
Julia Reynolds
40a82187c5
Fix build
...
Bug: 27709695
Change-Id: I2020a33aa0a305e025d7d004df4b23838bb42992
2016-03-17 13:58:15 -04:00
Mahaver Chopra
bef02df556
Merge "Title text and input bar should be white" into nyc-dev
2016-03-17 17:49:34 +00:00
Mahaver Chopra
78a4bcd419
Merge "Work Profile Security Challenge: Finalised strings" into nyc-dev
2016-03-17 17:48:35 +00:00
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
