PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,769 Commits 1 Branch 0 Tags
a04d07cc75e7b07c56cf2323c4b2120dfe52501b
Commit Graph

15769 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sanket Padawe
a04d07cc75 Fixing "SMS Messages" to "SMS messages" as per UX requirement. 
Bug: 17322866
Change-Id: Id4dcfc70ef4675adabeb42c3f6bdf5bdbe5f71f1
 2014-12-02 15:40:23 -08:00
Geoff Mendal
645cf17f68 Import translations. DO NOT MERGE 
Change-Id: Ic5aaf08bc81e92023a18aafa0e5dde54adf8ea05
Auto-generated-cl: translation import
 2014-11-26 06:25:44 -08:00
Maurice Lam
3f9d8b60ca Merge "[Setup] Theme ChooseLockGeneric for setup wizard" into lmp-mr1-dev 2014-11-26 01:15:36 +00:00
Maurice Lam
52c75baa12 [Setup] Theme ChooseLockGeneric for setup wizard 
This is step one of theming the set-up lock screen flow to match the
setup wizard theme. This shows the general approach of creating a
subclass of both the activity and fragment and overriding methods to
achieve the desired behavior for setup.

ag/594000 is a much more comprehensive change for what the final
change will look like.

Bug: 18482708
Change-Id: Idff34937f39f46a0c488df2cae4c46155b80cab7
 2014-11-25 16:52:10 -08:00
Fabrice Di Meglio
09d2763715 Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 2014-11-26 00:31:50 +00:00
Raju Yadav
21dba1f0e7 IllegalStateException fixed in print service settings 
Settings crashed due to IllegalStateException
as OnQueryTextListener refers to an already
detached view. The listener is set to null
on press of home key (onPause).

Change-Id: I96052f95689ae17dd1b4e9d1c313100b7b47a599
 2014-11-25 15:08:14 -08:00
Adrian Roos
647f9752ce Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev 2014-11-25 15:00:00 +00:00
Lucky Zhang
74896d6f1d Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 2014-11-24 19:33:13 +00:00
Geoff Mendal
faf1dd2062 Import translations. DO NOT MERGE 
Change-Id: Ib35d3ce45d8d18a16ea37d1348a64ac621a54b1f
Auto-generated-cl: translation import
 2014-11-24 10:07:28 -08:00
Adrian Roos
90d6c568cf Don't show RedactionInterstitial when changing password 
Only show when going from an insecure to secure lock.

Bug: 18467783
Change-Id: Ia73682d45b1dcd9ad61a00abeac099a94256e3b7
 2014-11-24 17:33:56 +01:00
Paul Crowley
95a28c3f10 Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 2014-11-24 15:21:56 +00:00
Selim Cinek
44b50ad313 Merge "Fixed build breakage due to api change." into lmp-mr1-dev 2014-11-24 13:35:53 +00:00
Selim Cinek
334bd70fc7 Fixed build breakage due to api change. 
Bug: 16239208
Change-Id: I9c2b13d3687f9f61307e0c13b6940425faebfa9f
 2014-11-24 14:11:49 +01:00
Zoltan Szatmary-Ban
6ad8579262 Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 2014-11-24 12:08:02 +00:00
Wink Saville
239d185aa7 Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-22 20:19:56 +00:00
Wink Saville
0183fb5394 Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
 2014-11-22 10:11:39 -08:00
Lajos Molnar
c3245a0555 Reword NuPlayer developer settings to say AwesomePlayer 
Bug: 18489541
Change-Id: Iab3ad293fb6689949e57375371fa6ac649b4ff0c
 2014-11-21 21:51:29 -08:00
Andres Morales
7090c92f39 Merge "Update enable oem unlock warning" into lmp-mr1-dev 2014-11-22 03:28:45 +00:00
Lucky Zhang
39eb663c72 [WifiSetup] Wifi setup text wrapping problem 
Fixed the text orientation for items in wifi settings on 600dp screens
in portrait mode. This bug only happens in such a setup, because
there is a mistake in the corresponding style file.

Bug: 18323509
Change-Id: I7ca6a3b27c8ab32481e02590f7ea78d452ab8090
 2014-11-22 02:47:18 +00:00
Andres Morales
26b46882cb Update enable oem unlock warning 
updating the strings from bug previously fixed

Bug:18227644
Change-Id: I2b651c807df7585f4d08a26a2a09895100ae2cd6
 2014-11-21 16:42:57 -08:00
Sanket Padawe
9209ce852a Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev 2014-11-21 23:34:31 +00:00
Sanket Padawe
cd1846fa6b Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev 2014-11-21 23:32:51 +00:00
Lucky Zhang
0e606a2a30 Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev 2014-11-21 21:40:44 +00:00
Maurice Lam
485a7e5989 Merge "[WifiSetup] Update title string" into lmp-mr1-dev 2014-11-21 21:33:41 +00:00
Maurice Lam
01aab29343 [WifiSetup] Update title string 
Bug: 17887844
Change-Id: I08df121e2c5a6bcb919d3b372df71c9df0983f43
 2014-11-21 11:59:34 -08:00
Lucky Zhang
91527920ff [SetupWizard] Warn user of missing FRP if skipping wi-fi 
Change the skip string in wifi settings to warn user of missing
out on device protection.

Bug: 18391349
Change-Id: Ica2434589ece60205cd9a06088a8eb65d5edfd0d
 2014-11-21 18:37:00 +00:00
Zoltan Szatmary-Ban
5875aefa8a Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 2014-11-21 15:21:34 +00:00
Zoltan Szatmary-Ban
b85025d98b Strings for multiprofile Location Settings. 
Bug: 17680368
Change-Id: I5f7f0891740b200322f99b2974d21b3dd33a5fd3
 2014-11-21 15:10:23 +00:00
Paul Crowley
13b8b564f8 Reduce number of attempts before factory reset to 30. 
Bug: 18292029

Change-Id: I2a78775d0505a3064838443ea631fee0ad612e5c
 2014-11-21 09:44:09 +00:00
Amith Yamasani
0cc764beed Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 2014-11-21 01:47:20 +00:00
Amith Yamasani
45f86236e4 Watch out for deleted user when exiting async task 
Fixes a problem where the async task can take a while to execute
and in the meantime the user can be removed. On exiting the async
task and updating the UI, make sure the user hasn't been deleted.

Bug: 18411181
Change-Id: I1831f3e53084c49e27557cb7aacec78c753a611b
 2014-11-20 13:19:18 -08:00
Wink Saville
b9b69faf5f Merge "Revert "Additional changes to SubscriptionManager API as per API council."" into lmp-mr1-dev 2014-11-20 20:30:48 +00:00
Wink Saville
9aa0dd69c5 Revert "Additional changes to SubscriptionManager API as per API council." 
This reverts commit 1285f74fcb.

Change-Id: I366556368a9c429d8c356bcdb8e29af9c6c4c71e
 2014-11-20 20:27:34 +00:00
Wink Saville
db2e05d89e Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 2014-11-20 20:21:29 +00:00
Zoltan Szatmary-Ban
876a21bae8 Remove backup preferences if backup service is inactive 
Also show informative message instead.

Bug: 16641441
Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
 2014-11-20 20:20:49 +00:00
Jeff Davidson
101743f9ec Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 2014-11-20 18:37:53 +00:00
Zoltan Szatmary-Ban
548460bda5 Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 2014-11-20 14:06:14 +00:00
Paul Crowley
67b4af148d Resolves conflicts for merge of 1cb45399 to lmp-mr1-dev 
Conflicts:
	src/com/android/settings/CryptKeeper.java

Change-Id: I3d16d6b571e9c493df23cb6cedd7e9ed929a43da
 2014-11-20 10:37:39 +00:00
Sanket Padawe
d0c0a479b0 Changing hint string inside sim name editor dialog in settings. 
Chaning hint string from "Enter SSID" to "Enter SIM name" inside sim name
editor dialog in sim settings.

Bug: 18455476
Change-Id: I3ac58e23a23d6afa31b84ec1296623e0443f3cff
 2014-11-19 16:50:28 -08:00
Fyodor Kupolov
5925e1912e Merge "Added a check if a custom activity can be started" into lmp-mr1-dev 2014-11-19 22:20:25 +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
Jeff Davidson
13b2a28463 Final strings for Wi-Fi Assistant in platform settings. 
Bug: 13780935
Change-Id: I70a22b3f439d05570d2508f8e05ed3aa9627e8f1
 2014-11-19 11:59:11 -08:00
Geoff Mendal
36d2656f96 Import translations. DO NOT MERGE 
Change-Id: Id90b273276938939b6e68b00149e54e8ec146ca6
Auto-generated-cl: translation import
 2014-11-19 11:03:40 -08:00
Sanket Padawe
79e44da1ba Changing sim selection dialog in Settings to use phoneAccount 
Changing sim selection dialog in Settings UI to select Call to display icons using
 phoneAccount.

Bug: 18435598
Change-Id: Ib89344be123c77a56e04a65dbb9e297f05e204eb
 2014-11-19 18:45:27 +00:00
Wink Saville
1285f74fcb Additional changes to SubscriptionManager API as per API council. 
bug: 17575308
Change-Id: I7773965094510999bfce8fc6b2b31ba6ce496653
 2014-11-19 10:34:28 -08: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
Fyodor Kupolov
07ab95c43e 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
 2014-11-18 17:12:54 -08:00
Zoltan Szatmary-Ban
cfe521e6e3 Stop background processes if TrustedCredentialSettings fragment gets detached 
Otherwise getActivity() returns null and other nasty null pointer dereferencings happen.

Bug: 17976307
Change-Id: If867785f991217267e0bf0ad3058a62177509852
 2014-11-18 18:02:48 +00:00
Alexandra Gherghina
3a84d40133 Merge "Fix NPE caused by status update outside activity lifecycle" into lmp-mr1-dev 2014-11-18 10:02:37 +00:00
Sanket Padawe
d85aa17894 Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 2014-11-17 23:53:13 +00:00