Fabrice Di Meglio
e4e24ee798
am 8b5b47bf
: am b5a582eb
: am 667695eb
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '8b5b47bf4521164381476c0ca5a8dc40bbd8cf5a':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-16 21:54:38 +00:00
Fabrice Di Meglio
667695eb11
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-16 21:40:03 +00:00
Fabrice Di Meglio
daef2e2b06
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert more CheckBoxes to Switches
Change-Id: I04712bce4c0a54516d9ecedbb554f403fd6dd9e7
2014-10-15 19:00:35 -07:00
Jim Miller
69cb6a9001
am f38b63c9
: am f3e5611c
: am 1d050220
: am 3ef52587
: resolved conflicts for merge of 46c7f6d6
to lmp-sprout-dev
...
* commit 'f38b63c9137ac1eb11e30ff03553c88696813ec0':
Add a checkbox option to 'require password to decrypt'
2014-10-15 21:23:51 +00:00
Jim Miller
1d050220a0
am 3ef52587
: resolved conflicts for merge of 46c7f6d6
to lmp-sprout-dev
...
* commit '3ef52587da6fd91fc12164fd57100d6e352508ec':
Add a checkbox option to 'require password to decrypt'
2014-10-15 21:02:09 +00:00
Jim Miller
3ef52587da
resolved conflicts for merge of 46c7f6d6
to lmp-sprout-dev
...
Change-Id: Ic07a97df04c274bbfa980134c9f4589c65a7ef62
2014-10-15 13:54:37 -07:00
Fabrice Di Meglio
709e32447a
am 3c56d456
: am 14d4f3de
: am 5e916480
: am 6b68b000
: am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '3c56d456ea4a6f0f5d642ba96f066740a268f485':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 03:06:55 +00:00
Fabrice Di Meglio
c616a65ee6
am b84d366f
: am 156d30db
: am 40103896
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit 'b84d366f6bffc6676b6223c3757faef1c6e9f8fe':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-15 03:06:53 +00:00
Jim Miller
46c7f6d6f3
Add a checkbox option to 'require password to decrypt'
...
Fixes bug 17881324
Change-Id: I3f256f448a35cf8104ee6acb4de253874101f7c0
2014-10-14 18:40:30 -07:00
Fabrice Di Meglio
5e91648077
am 6b68b000
: am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '6b68b000da5db8df9228ae9f589dfb1f2b38759b':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 00:53:43 +00:00
Fabrice Di Meglio
6b68b000da
am 94dce761
: Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
...
* commit '94dce7618584b4ca51bf17937cbd6cb0c22aaaea':
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
2014-10-15 00:44:23 +00:00
Fabrice Di Meglio
94dce76185
Merge "Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity" into lmp-dev
2014-10-15 00:39:58 +00:00
Fabrice Di Meglio
40103896b0
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-14 23:54:09 +00:00
Fabrice Di Meglio
886387373e
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, use a Switch instead of a CheckBox for Developer Settings
Change-Id: I6a9b3fef879299a8ac5b57ff9c794b58022b79d9
2014-10-14 16:43:37 -07:00
Fabrice Di Meglio
3e825febca
Fix bug #17976062 Stability: ISE in Settings: Fragment ApnSettings{4da9ae0} not attached to Activity
...
- prevent IllegalStateException
Change-Id: I63fa1bb6240c7ff82c04be938b72940049409dee
2014-10-14 16:21:22 -07:00
vandwalle
d2aa13d319
am 74e79a96
: am 74be17ed
: am 7d89e294
: am 52e929a9
: am 2fb9c773
: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
...
* commit '74e79a96804c4a6309e61f2675170ea4562fe9a7':
dont show a config in saved network if it is self added and we never connected to it Bug:17939405
2014-10-14 22:25:48 +00:00
vandwalle
7d89e294b5
am 52e929a9
: am 2fb9c773
: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
...
* commit '52e929a9613e52e199dcf12b95acab31be3c25bd':
dont show a config in saved network if it is self added and we never connected to it Bug:17939405
2014-10-14 19:55:58 +00:00
Fabrice Di Meglio
04393389a9
am 3395d650
: am 7ae5528a
: am c2f0f751
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit '3395d65062fe2a085cfd7909cdded8eb15cc3c7c':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-14 19:05:19 +00:00
John Spurlock
26c1e72e7d
am 2fc692d5
: am 3ee136eb
: am ec3e4cd5
: Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
...
* commit '2fc692d58c586073a80a8870727341570dbb0572':
Settings: Restart existing volumizers in volume prefs.
2014-10-14 19:04:56 +00:00
Fabrice Di Meglio
fec1425c0b
am a6c1e815
: am f3a306cd
: am 22a57a8c
: Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
...
* commit 'a6c1e815bf4be14d875f34dd2e6eba6f9a97e3bd':
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
2014-10-14 19:04:50 +00:00
Fabrice Di Meglio
c2f0f751dd
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-14 18:08:18 +00:00
John Spurlock
26e66ccfc6
am a4ff5b00
: am dbd85a70
: am a0d28225
: am ef390443
: am a312f7f8
: Fix battery-history-chart large-mode labels in RTL layouts.
...
* commit 'a4ff5b00c38ebe5a4dec019d204c71b1c8833276':
Fix battery-history-chart large-mode labels in RTL layouts.
2014-10-14 17:30:40 +00:00
John Spurlock
ec3e4cd5f3
Merge "Settings: Restart existing volumizers in volume prefs." into lmp-mr1-dev
2014-10-14 16:40:44 +00:00
vandwalle
52e929a961
am 2fb9c773
: Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
...
* commit '2fb9c773761b1375c86963ebb8f3bb3bec18e479':
dont show a config in saved network if it is self added and we never connected to it Bug:17939405
2014-10-14 15:38:09 +00:00
vandwalle
2fb9c77376
Merge "dont show a config in saved network if it is self added and we never connected to it Bug:17939405" into lmp-dev
2014-10-14 06:41:27 +00:00
vandwalle
426005a299
dont show a config in saved network if it is self added and we never connected to it
...
Bug:17939405
Change-Id: I1c56ba85d4f98c8b5eb711f6afdc0c06731d7b6e
2014-10-13 18:44:21 -07:00
Fabrice Di Meglio
d8ae35ea50
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, use a Switch for:
Accessibility
- Large text
- High contrast text
- Power button ends call
- Auto-rotate screen
- Speak passwords
Change-Id: I668586f3eb0e458db631e60f272e62f1315d3758
2014-10-13 17:09:08 -07:00
Fabrice Di Meglio
22a57a8cbe
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-13 23:29:01 +00:00
Fabrice Di Meglio
b98c40649e
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, use a Switch for:
- Automatic date & time
- Automatic time zone
- Use 24-hour format
Change-Id: Ie35816febe2469705446fdd2c703b52ff8b0929a
2014-10-13 16:02:25 -07:00
John Spurlock
a0d2822535
am ef390443
: am a312f7f8
: Fix battery-history-chart large-mode labels in RTL layouts.
...
* commit 'ef390443eb7a6a4ac52c62aea65e7ba94f1f897a':
Fix battery-history-chart large-mode labels in RTL layouts.
2014-10-13 22:13:01 +00:00
John Spurlock
ef390443eb
am a312f7f8
: Fix battery-history-chart large-mode labels in RTL layouts.
...
* commit 'a312f7f8044a07a2a41de477cc30bb34fc1df55f':
Fix battery-history-chart large-mode labels in RTL layouts.
2014-10-13 22:03:54 +00:00
Alan Viverette
c7a48fc19f
am e74c772b
: am 6229d683
: am ca2d56a8
: Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
...
* commit 'e74c772b11d5d3d059d793337c6ea5c898cb67c9':
Update Settings to use themed Context.getDrawable()
2014-10-13 21:12:38 +00:00
Alan Viverette
ca2d56a849
Merge "Update Settings to use themed Context.getDrawable()" into lmp-mr1-dev
2014-10-13 20:58:39 +00:00
John Spurlock
af05fda24d
Settings: Restart existing volumizers in volume prefs.
...
Use the new .start() method to ensure the underlying volumizer
is always started, regardless of pref activity lifecycle.
Depends on frameworks/base:
I2f860864161f818d5a62a28331ef1c47051fb39f
Bug:17898190
Change-Id: I55dea590c13363730549aa29f194337efccdeaf7
2014-10-13 20:47:05 +00:00
John Spurlock
a312f7f804
Fix battery-history-chart large-mode labels in RTL layouts.
...
Bug: 17425651
Change-Id: Iae53e111fa3c6bc822821a6a30bd34edb058c1a5
2014-10-13 15:48:50 -04:00
Amit Mahajan
88b2790d73
Merge "Fix to show signal strength as 0 if out of service." into lmp-dev
2014-10-10 22:41:09 +00:00
Amit Mahajan
4d49e3f5b1
Fix to show signal strength as 0 if out of service.
...
Bug: 17942583
Change-Id: I399e5352b4585cff42ee5c7dd164315c1797110a
2014-10-10 14:40:44 -07:00
Dianne Hackborn
449eac9f66
am eac414ae
: am 9d49e51c
: am c30661c0
: am 8541206e
: am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'eac414ae23a2b0db870ca5ed82b2900aa18e38cc':
Update to use "real" L codename.
2014-10-10 18:41:57 +00:00
Zoltan Szatmary-Ban
e9cc344746
am ac8a4c07
: am e807e1ea
: am 90625329
: am 95dda800
: am 50263efb
: Remove CA Cert UI item from one list only
...
* commit 'ac8a4c0762df40b5525eadad4f979ae38ab78229':
Remove CA Cert UI item from one list only
2014-10-10 18:41:56 +00:00
Svetoslav
1337305a8e
am aaeaa9da
: am a883dbba
: am 39674811
: Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
...
* commit 'aaeaa9dadc004929b2fb4ee5e21c2099ec36cbbd':
Update accessibility service toggle switch when resuming.
2014-10-10 18:41:55 +00:00
Alan Viverette
0ba89bd54c
Update Settings to use themed Context.getDrawable()
...
Explicit null theme is passed when using Resources.getDrawable() and
no theme is available, e.g. when using getResourcesForApplication().
This fixes an issue with ic_text_dot theming and helps avoid similar
issues in the future.
BUG: 17648301
Change-Id: I3e97c3490b6f2a55744f567b21284f2935ae9af7
2014-10-10 10:58:58 -07:00
Sanket Padawe
ea2e53ead5
am ce1bfbb0
: resolved conflicts for merge of 61719a80
to lmp-mr1-dev-plus-aosp
...
* commit 'ce1bfbb04e75a9b4362b2f3070ff4ee5406f136d':
Removing display number format from SIM UI
2014-10-10 05:15:52 +00:00
Dianne Hackborn
c30661c05d
am 8541206e
: am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit '8541206e6bbc08f5e5bc7d545fcdce38ff853f8e':
Update to use "real" L codename.
2014-10-09 22:02:02 +00:00
Dianne Hackborn
8541206e6b
am a4204bde
: Merge "Update to use "real" L codename." into lmp-dev
...
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1':
Update to use "real" L codename.
2014-10-09 19:29:33 +00:00
Zoltan Szatmary-Ban
9062532960
am 95dda800
: am 50263efb
: Remove CA Cert UI item from one list only
...
* commit '95dda800a988c1ca778dae08563b6875c30d089a':
Remove CA Cert UI item from one list only
2014-10-09 19:22:48 +00:00
Zoltan Szatmary-Ban
95dda800a9
am 50263efb
: Remove CA Cert UI item from one list only
...
* commit '50263efbaf5ce432c7335c1428ca10c1096cce1f':
Remove CA Cert UI item from one list only
2014-10-09 19:11:25 +00:00
Svetoslav
396748110b
Merge "Update accessibility service toggle switch when resuming." into lmp-mr1-dev
2014-10-09 18:21:53 +00:00
Dianne Hackborn
a4204bde45
Merge "Update to use "real" L codename." into lmp-dev
2014-10-09 16:54:16 +00:00
Sanket Padawe
04b8b4c1a4
am e4cbb865
: Merge "Removing display number format from SIM UI" into lmp-sprout-dev
...
* commit 'e4cbb86596dd55200eb1842b66463a70e59a8ee4':
Removing display number format from SIM UI
2014-10-09 13:03:33 +00:00
Zoltan Szatmary-Ban
50263efbaf
Remove CA Cert UI item from one list only
...
When removing a CA Cert in TrustedCredentialsSettings the UI item
is now removed from the list of the respective profile only.
Bug: 17926190
Change-Id: I7f7ae3498717cc457cb9e360e59bb365225b0cb6
2014-10-09 13:00:32 +01:00