PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,154 Commits 1 Branch 0 Tags
f39a0988ef56adb86aae7c2036b53819c3fe8b52
Commit Graph

16154 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
e0658ddafe am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit '09d276371560a8e20e80a7f05a6807b5b8f0ace3':
  IllegalStateException fixed in print service settings
 2014-11-26 00:37:43 +00: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
PauloftheWest
256d83dc7a Remove extraneous SIM status information 
Bug: 18467248
Change-Id: I59aff3f979f76ca622a6a9e944398042f236f0b7
 2014-11-25 12:36:40 -08:00
PauloftheWest
ae680e3c67 Fixed a Wi-Fi dialog crash 
Bug: 18498974
Change-Id: I00ba9828c4f15cefd143fc1c92e1c81f43e91c95
 2014-11-25 12:27:07 -08:00
Adrian Roos
b3e88b6e20 am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit '647f9752ce1bdd4c02cd44028dac769369140764':
  Don't show RedactionInterstitial when changing password
 2014-11-25 15:04:25 +00:00
Adrian Roos
647f9752ce Merge "Don't show RedactionInterstitial when changing password" into lmp-mr1-dev 2014-11-25 15:00:00 +00:00
PauloftheWest
c80b7616ca Added color to Data Usage graph 
+ Fixed some issues with displaying multiple SIMs in Data Usage.

Bug: 18466592
Bug: 18291246
Change-Id: I77417be995761ce62e464c7d21a34af1334aac17
 2014-11-25 04:58:22 -08:00
Lucky Zhang
1d556fcca2 am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 
* commit '74896d6f1d6e2b5507f3e1b2c6d40d6ae1bfde37':
  [WifiSetup] Wifi setup text wrapping problem
 2014-11-24 20:01:20 +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
4eed13cad1 am faf1dd20: (-s ours) Import translations. DO NOT MERGE 
* commit 'faf1dd2062390250f4622583dc651e5dd0685f6b':
  Import translations. DO NOT MERGE
 2014-11-24 18:27:37 +00:00
Geoff Mendal
709b12c1ba Import translations. DO NOT MERGE 
Change-Id: I1f4c7ef53f323dfab3afc7978d7c90c05e5865a3
Auto-generated-cl: translation import
 2014-11-24 10:20:28 -08: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
7bd7823758 am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '95a28c3f10b3f9a2fdcebcd1019f97989e2393c5':
  Reduce number of attempts before factory reset to 30.
 2014-11-24 15:26:56 +00: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
2a65b1b105 am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '44b50ad313e827f03391ebac47f3db6308b52d42':
  Fixed build breakage due to api change.
 2014-11-24 13:39:38 +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
4a30d627a2 am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '6ad8579262dbc059472a2cbe1ff4b675f01e4268':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-24 12:13:10 +00: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
PauloftheWest
ac5c081adc Changed SIM lock toggle to a switch 
Bug: 18408617
Change-Id: Iea14f40082aa9b7fd6c1925ee5ca5e6bc6841140
 2014-11-23 17:19:49 -08:00
Wink Saville
fd0c6eb523 am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit '239d185aa727a0930f1983cd77ddaeb268adc315':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-22 20:22:57 +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
5f9ee5e46c am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer 
* commit 'c3245a0555fbd9b02407edebfdac386a62a4af0a':
  Reword NuPlayer developer settings to say AwesomePlayer
 2014-11-22 06:51:13 +00: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
e6d4aba3e1 am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev 
* commit '7090c92f3933238a06a6d799e49ae6b13d09cbb4':
  Update enable oem unlock warning
 2014-11-22 03:32:52 +00: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
db4940988d am 9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev 
* commit '9209ce852ab7fbed10772af20aa7ff75ec69a96c':
  Changing sim selection dialog in Settings to use phoneAccount
 2014-11-21 23:37:47 +00:00
Sanket Padawe
c7e62cf149 am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev 
* commit 'cd1846fa6bed76532bc66182fe6a9a87e6e7edd6':
  Changing hint string inside sim name editor dialog in settings.
 2014-11-21 23:37:46 +00: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
37c3cd63a8 am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev 
* commit '0e606a2a301b91669af59e61f3e607463d49ed56':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
 2014-11-21 21:44:47 +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
3b1baf4b18 am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev 
* commit '485a7e5989823ff30e6ef61064a592d42f49a1f0':
  [WifiSetup] Update title string
 2014-11-21 21:36:22 +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
208a8490c9 am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '5875aefa8a48cd90a1245303c42c171c2f4962b4':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:29:01 +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
ad8191d95e am b85025d9: Strings for multiprofile Location Settings. 
* commit 'b85025d98b7c9d28c9ee2b26ce3c9d11929aeb3a':
  Strings for multiprofile Location Settings.
 2014-11-21 15:18:59 +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
aa96cbec46 am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 
* commit '0cc764beed2b816ee7e092591c7f205601e1b596':
  Watch out for deleted user when exiting async task
 2014-11-21 01:50:50 +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