Commit Graph

7091 Commits

Author SHA1 Message Date
Sanket Padawe
9fbff5a31b am 59dc8d1d: SIM settings display name changes
* commit '59dc8d1db4c557ace1ded52122993be2e73f6863':
  SIM settings display name changes
2014-10-22 21:22:25 +00:00
Paul Jensen
246273ae35 am a1640daf: am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit 'a1640daf6202b12e64bcc26647449695f9ef2a61':
  Launch browser directly when user selects "Mobile Plan".
2014-10-22 21:22:20 +00:00
Sanket Padawe
286e3c4651 am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev
* commit '266e429657774dc7aa14029629a9e78c942c6104':
  Commit with dialog box but using subinfo records
2014-10-22 20:45:40 +00:00
Sanket Padawe
59dc8d1db4 SIM settings display name changes
Resubmitting the change for displaying SIM name in SIM settings.

Change-Id: I22d368c3880eaa54d37c9afcfd63d4e94e41fea8
2014-10-22 11:36:08 -07:00
Paul Jensen
a1640daf62 am d9b8d180: Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev
* commit 'd9b8d1803aac44f382e330ea62bc936e049a1aed':
  Launch browser directly when user selects "Mobile Plan".
2014-10-22 17:26:58 +00:00
Paul Jensen
d9b8d1803a Merge "Launch browser directly when user selects "Mobile Plan"." into lmp-dev 2014-10-22 17:17:00 +00:00
Sanket Padawe
a501137f26 Commit with dialog box but using subinfo records
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
2014-10-21 14:16:12 -07:00
Alexandra Gherghina
aadc070a35 Move up spinner in apps screen
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
2014-10-21 18:39:07 +01:00
Alexandra Gherghina
2f90c4cd52 Merge "Reset spinner selection" into lmp-mr1-dev 2014-10-21 16:49:24 +00:00
John Spurlock
196aacebf9 Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev 2014-10-21 16:11:12 +00:00
Sanket Padawe
fbde761930 am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev
* commit 'bdedbb851699016a70eafdb82b038240646358c8':
  Changing settings UI changes related to strings to be displayed
2014-10-20 20:51:07 +00:00
Sanket Padawe
bdedbb8516 Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597 Changing settings UI changes related to strings to be displayed
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
2014-10-20 12:33:50 -07:00
John Spurlock
9a940cbf04 Settings: Display 'Calls' category on non-voice devices.
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.

Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
2014-10-20 14:22:38 -04:00
Paul Jensen
d96c5fc70a Launch browser directly when user selects "Mobile Plan".
Previously this used to send a broadcast to ConnectivityService
which would in turn launch the web browser.  The ConnectivityService
code has since been removed, so just launch the browser directly.

bug:17472930
Change-Id: I5d419348efbb56b6c3c0fdbb8663efd0cfb2dde9
2014-10-18 15:33:33 -04:00
Jim Miller
3d3c870374 am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial
* commit '456b866c09f88d4fd15c9650d2ee882be9dca8ec':
  Fix bad string in EncryptionInterstitial
2014-10-18 02:20:59 +00:00
Jim Miller
456b866c09 am aa037675: Fix bad string in EncryptionInterstitial
* commit 'aa0376759873893197a0109025fd4ec8beca5929':
  Fix bad string in EncryptionInterstitial
2014-10-18 02:09:26 +00:00
Jim Miller
138d7b6273 am bc0e5e26: am 47adff0a: Show warning dialog when Accessibility is enabled
* commit 'bc0e5e2684d9e08f55aa9eb5f36edabd096e541d':
  Show warning dialog when Accessibility is enabled
2014-10-18 01:31:03 +00:00
Jim Miller
aa03767598 Fix bad string in EncryptionInterstitial
The string contains "Talkback", but it should grab one of
the installed Accessibility services so it works on 3rd party
devices.

Fixes bug 17881324

Change-Id: Iee2d8d4ce93c851badc59b5ef21462213f530a96
2014-10-17 18:28:52 -07:00
Jim Miller
bc0e5e2684 am 47adff0a: Show warning dialog when Accessibility is enabled
* commit '47adff0a8bb4aeeefe6e3d3efc0b2579f6754af0':
  Show warning dialog when Accessibility is enabled
2014-10-18 01:20:53 +00:00
Jim Miller
47adff0a8b Show warning dialog when Accessibility is enabled
This shows a warning dialog in EncryptionInterstitial when the
user selects "Require password".

Fixes bug 17881324

Change-Id: Id9336f1f14d38f169205cc72cc42be8de94fae71
2014-10-17 17:43:18 -07:00
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