Jim Miller
3221a34211
am ba1b3340
: am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit 'ba1b33407d66289a2367caab3141a3555f1fdcf7':
Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:57:34 +00:00
Jim Miller
ba1b33407d
am 602d559d
: Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
...
* commit '602d559d9c59074664ad684579dc3d14a09219cb':
Several fixes to new EncryptionInterstitial dialog.
2014-10-17 23:52:42 +00:00
Jim Miller
602d559d9c
Merge "Several fixes to new EncryptionInterstitial dialog." into lmp-dev
2014-10-17 23:48:35 +00:00
Svetoslav
1f39d6a6e7
am edbada7a
: am ba202e9f
: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
...
* commit 'edbada7acd2d40db1c472e291f3191c6f26d980a':
Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:14:01 +00:00
Jim Miller
0698a21631
Several fixes to new EncryptionInterstitial dialog.
...
The code now observes whether accessibility is turned on when
deciding the default state.
Additionally, it fixes a bug where the user can back out of
EncryptionInterstitial and leave the setting in a bad state.
We now propagate the state until the place where it ultimately
gets stored.
Also fixes problem where Encryption was ignoring the state
where the device was already encrypted.
Fixes bug 17881324
Change-Id: Iec09e4464832a506bb2a78bb14a38b3531971fa0
2014-10-17 16:11:59 -07:00
Svetoslav
edbada7acd
am ba202e9f
: Merge "Accessibility no longer overrides strong encryption (Settings)." into lmp-dev
...
* commit 'ba202e9fb299f4557190dbad5ed989a9c83a4380':
Accessibility no longer overrides strong encryption (Settings).
2014-10-17 23:08:40 +00:00
Svetoslav
40ca78f6f3
Accessibility no longer overrides strong encryption (Settings).
...
Updating the accessibility layer behavior to reflect the new
model where accessibility no longer overrides strong encryption.
Now enabling an accessibility service lowers the encryption
level but the user can bump it up in settings if desired.
bug:17881324
Change-Id: Iaf46cbabf1c19c193ea39b35add27aaa4ff509e4
2014-10-17 14:41:58 -07:00
Fabrice Di Meglio
140b46e43c
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-17 21:32:34 +00:00
Fabrice Di Meglio
44db45ac11
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert Trusted Credentials CheckBoxes to Switches
Change-Id: If878e8c10454a212ba9052280e3cbb17c0fdeeca
2014-10-17 14:06:22 -07:00
Fabrice Di Meglio
27c0b548ab
Merge "Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch" into lmp-mr1-dev
2014-10-17 20:46:32 +00:00
Svetoslav
b363c26e2f
am 431e2460
: am 3ea423ae
: User to confirm credentials if an accessibility service changes encryption.
...
* commit '431e246032d58b8aae72d348107f0d2aaa9efbac':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 18:53:32 +00:00
Alan Viverette
2106c79bc2
Merge "Prevent NPE when no accessibility services are enabled" into lmp-mr1-dev
2014-10-17 18:03:35 +00:00
Svetoslav
431e246032
am 3ea423ae
: User to confirm credentials if an accessibility service changes encryption.
...
* commit '3ea423ae0ff56d249b6844b3a68c67ee5eba243d':
User to confirm credentials if an accessibility service changes encryption.
2014-10-17 16:56:40 +00:00
John Spurlock
27334dbe75
Settings: Fix hotspot switch state issue.
...
Bug: 17967405
Change-Id: I40b956f483e2bdf313b42f6ed8906d5f8e9b95de
2014-10-17 11:55:26 -04:00
Alan Viverette
ea2810ad0f
Prevent NPE when no accessibility services are enabled
...
BUG: 18023183
Change-Id: Icad0631410f1436f7726bd7311ac3b766a2c46b2
2014-10-16 18:27:18 -07:00
Svetoslav
3ea423ae0f
User to confirm credentials if an accessibility service changes encryption.
...
When an accessibility service is enabled we are not using the user secure
lock when encrypting the data. If the latter is already used for encryption
we are decreasing the encryption level and therefore shall challenge the
user with their secure lock.
bug:17881324
Change-Id: If8905c05e20bc6bb6a6415e501871e5ad83f3d86
2014-10-16 17:35:07 -07:00
Fabrice Di Meglio
1bc996532c
Fix bug #15730311 Checkboxes on R side should update to Quantum/Material on/off switch
...
Per UX request, convert Account Sync feeds CheckBoxes to Switches
Change-Id: I7017020700b4214a16ca119a6992e6c7a484db0b
2014-10-16 17:16:26 -07:00
Fabrice Di Meglio
4a43a107d7
Merge "Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings" into lmp-mr1-dev
2014-10-16 22:08:17 +00:00
Alexandra Gherghina
06cd50177a
Reset spinner selection
...
This makes sure that when you go back to the spinner screen, the
selection is the one corresponding to the current profile.
Bug: 17378446
Change-Id: I536cc2701f9481986a63df1b01a38151edf2fa83
2014-10-16 23:05:49 +01:00
Fabrice Di Meglio
c94382e84e
Fix bug #18017952 It does not search all possible "USB" results that can be found in the settings
...
- add indexing for UsbSettings
- change constant name from RANK_MEMORY to RANK_STORAGE
- fix old issue with the PreferenceScreen title (as Location instead of USB computer connection)
Change-Id: I1395ec3d6a795edf73a8703545540456a477cc21
2014-10-16 14:42:10 -07: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
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
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
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
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
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
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
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
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