Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,443 Commits 1 Branch 0 Tags
2e095fa263b0887fc55576b32625264e13fee4c7
Commit Graph

7064 Commits

Author SHA1 Message Date
Zach Jang
c87ceb7ec1 am 6ceb2ba9: DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3 
* commit '6ceb2ba9b8928b33c30e0c639539c3fe2f27971e':
  DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings CL#3/3
 2015-09-17 20:04:18 +00:00
Zach Jang
6ceb2ba9b8 DO NOT MERGE - Backport of ag/748147 - Security Patch Level in Settings 
CL#3/3

b/23946860

Change-Id: I2cfcfcbc28d6a1391cae55f505a2b981df9ade2c
 2015-09-14 14:03:12 -07:00
Sanket Padawe
ac2347c0bf am 158fa952: am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct. 
* commit '158fa952187245ce7b8e9b8c71ee8bd3f23a9cb8':
  Check for special char when renaming device for Wi-Fi direct.
 2015-07-29 19:25:06 +00:00
Sanket Padawe
158fa95218 am df9b13af: am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct. 
* commit 'df9b13af9bff0858c787000f1accee7dd1d2874d':
  Check for special char when renaming device for Wi-Fi direct.
 2015-07-29 17:08:45 +00:00
Sanket Padawe
df9b13af9b am 74d85949: am e05f7143: Check for special char when renaming device for Wi-Fi direct. 
* commit '74d85949507f3d9fdc75ace2acbec1aa7503b034':
  Check for special char when renaming device for Wi-Fi direct.
 2015-07-29 16:44:58 +00:00
Sanket Padawe
e05f714315 Check for special char when renaming device for Wi-Fi direct. 
Bug: 21141820
Change-Id: I78231d95e5ba3f505325d5657f8e6106a887f11e
(cherry picked from commit 7186a47ef3)
 2015-07-28 16:09:59 +00:00
Fyodor Kupolov
bd89b7b45e am 0d5ad3b7: am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
* commit '0d5ad3b73ef524b4aa09e86d3c3a68b48be0d1d1':
  Added a check if a custom activity can be started
 2015-01-29 18:19:06 +00:00
Fyodor Kupolov
0d5ad3b73e am 57641a8b: am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
* commit '57641a8b5080b5122fcdd98c56fffaef90b3992d':
  Added a check if a custom activity can be started
 2015-01-29 18:09:29 +00:00
Fyodor Kupolov
57641a8b50 am d7e93570: am f11f9f47: Added a check if a custom activity can be started 
* commit 'd7e93570d35cfec4e5de0f3edc5d326ecdb8a442':
  Added a check if a custom activity can be started
 2015-01-29 18:02:40 +00:00
Fyodor Kupolov
f11f9f47d3 Added a check if a custom activity can be started 
AppRestrictionsFragment starts an activity using an intent provided by the
receiver. A check was added to prevent an app from starting an activity that
it does not own.

Bug: 14441412
Change-Id: Ia6820b1daf3783d605b92976c78cb522b17dc8f2
(cherry picked from commit 07ab95c43e)
 2015-01-28 10:31:36 +00:00
Paul Crowley
1cb45399d3 Prevent factory reset for short passwords in CryptKeeper 
automerge: 8fca3fc

* commit '8fca3fcc06cfa7c4baf16b3bc53c4e52c9678fbb':
  Prevent factory reset for short passwords in CryptKeeper
 2014-11-19 20:49:13 +00:00
Paul Crowley
8fca3fcc06 Prevent factory reset for short passwords in CryptKeeper 
Since patterns and passwords can't be shorter than 4
elements, we shouldn't count them against attempts to unlock
the device.  If we do, we risk resetting the device
due to stray input.

Bug: 18211475
Bug: 18273380

Change-Id: Ib329cd3383471483cda68bfac4278b17d0c09c57

Conflicts:
	src/com/android/settings/CryptKeeper.java

Conflicts:
	src/com/android/settings/CryptKeeper.java
 2014-11-19 12:00:32 +00:00
Michael Wright
95f29a1930 Skip Misc/Overcounted battery stats in release builds. 
automerge: f7a5017

* commit 'f7a5017fa60d4cd3c802a45a7b04a4c8f34d969e':
  Skip Misc/Overcounted battery stats in release builds.
 2014-10-24 22:04:21 +00:00
Michael Wright
f7a5017fa6 Skip Misc/Overcounted battery stats in release builds. 
Bug: 18090734
Change-Id: I24d8eea9fcb0d0b9e50d512325ed91ce70eb16ac
 2014-10-24 14:25:49 -07:00
Sanket Padawe
5fd97c551f Merge "WIP support icon" into lmp-sprout-dev 2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe WIP support icon 
Added static sim icon to alert box for selecting different sim accounts.

Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
 2014-10-24 10:17:08 -07:00
Amith Yamasani
526e4b4155 am c1dc8752: Merge "Disable factory reset for secondary users" into lmp-dev 
* commit 'c1dc875224f9b2286bfe455f37006aabaa057431':
  Disable factory reset for secondary users
 2014-10-23 00:02:44 +00:00
Amith Yamasani
c1dc875224 Merge "Disable factory reset for secondary users" into lmp-dev 2014-10-22 23:59:19 +00:00
Amith Yamasani
4339a470d3 Disable factory reset for secondary users 
Search in Settings makes it possible to find the factory reset screen.
Disable the search index in PrivacySettings so that backup and reset
keywords don't get indexed for secondary users.
Also add additional safeguards for other entry points such as public
intents, so that the backup/reset screen does not show any options.

Bug: 18076086
Change-Id: Ie5135fbf4084038c99947a1a107ab4758f0c15a9
 2014-10-22 13:51:53 -07: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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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