PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
18,439 Commits 1 Branch 0 Tags
2823eb81f5e52f682488ff62d115c6c6ad1d872d
Commit Graph

18439 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Fabrice Di Meglio
2823eb81f5 am 7a9494d5: am e0658dda: am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit '7a9494d53e908cf340eb02351981e191afc778af':
  IllegalStateException fixed in print service settings
 2014-11-26 19:56:47 +00:00
Fabrice Di Meglio
7a9494d53e am e0658dda: am 09d27637: Merge "IllegalStateException fixed in print service settings" into lmp-mr1-dev 
* commit 'e0658ddafe8a73a551fc8626a96db07c9e905536':
  IllegalStateException fixed in print service settings
 2014-11-26 18:41:28 +00:00
Geoff Mendal
f9154eef73 Import translations. DO NOT MERGE 
Change-Id: I36312c2e5f3bf38ba107336920aae2083e75d0bb
Auto-generated-cl: translation import
 2014-11-26 06:49:26 -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
Fabrice Di Meglio
5de7509927 am d5a4dae8: am c5aa905a: Merge "IllegalStateException fixed in print service settings" 
* commit 'd5a4dae8d8f16a42c32b4c0e63e4b1abbe7374e5':
  IllegalStateException fixed in print service settings
 2014-11-25 23:26:59 +00:00
Fabrice Di Meglio
d5a4dae8d8 am c5aa905a: Merge "IllegalStateException fixed in print service settings" 
* commit 'c5aa905a31e48fdeb52a8591ebb018ff161d57ad':
  IllegalStateException fixed in print service settings
 2014-11-25 23:23:16 +00:00
Fabrice Di Meglio
c5aa905a31 Merge "IllegalStateException fixed in print service settings" 2014-11-25 23:12:38 +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
b00bf5b690 am 9fc6bf3f: am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit '9fc6bf3f3776fae1bcb8175b61e2c38744941312':
  Don't show RedactionInterstitial when changing password
 2014-11-25 18:57:18 +00:00
Adrian Roos
9fc6bf3f37 am b3e88b6e: am 647f9752: Merge "Don\'t show RedactionInterstitial when changing password" into lmp-mr1-dev 
* commit 'b3e88b6e209992b5ce8dabfb95bb5dfb6aa79425':
  Don't show RedactionInterstitial when changing password
 2014-11-25 18:45:43 +00:00
Lucky Zhang
a162bd7651 am e289815e: am 1d556fcc: am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 
* commit 'e289815ec02d30e9fe47197141efe141b68f6ba8':
  [WifiSetup] Wifi setup text wrapping problem
 2014-11-25 17:49:55 +00:00
Geoff Mendal
6fdf6183d8 am 02846117: (-s ours) am 4eed13ca: (-s ours) am faf1dd20: (-s ours) Import translations. DO NOT MERGE 
* commit '028461176c44933737b19397b42b91cbed9cc08f':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:53 +00:00
Geoff Mendal
61860cb16f am dfa717d7: (-s ours) am 709b12c1: (-s ours) Import translations. DO NOT MERGE 
* commit 'dfa717d788188abf3966109815f06277d45d6654':
  Import translations. DO NOT MERGE
 2014-11-25 17:49:52 +00:00
Lucky Zhang
e289815ec0 am 1d556fcc: am 74896d6f: Merge "[WifiSetup] Wifi setup text wrapping problem" into lmp-mr1-dev 
* commit '1d556fcca25a68e35536e3d668bfb24bd2b62d0d':
  [WifiSetup] Wifi setup text wrapping problem
 2014-11-25 17:39:04 +00:00
Geoff Mendal
028461176c am 4eed13ca: (-s ours) am faf1dd20: (-s ours) Import translations. DO NOT MERGE 
* commit '4eed13cad112e6ae99464e561b43d14ae6cdbee8':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:26 +00:00
Geoff Mendal
dfa717d788 am 709b12c1: (-s ours) Import translations. DO NOT MERGE 
* commit '709b12c1bafe670146b19f5f911679db7f11e116':
  Import translations. DO NOT MERGE
 2014-11-25 17:37:21 +00:00
Paul Crowley
15ad1bd3b0 am 1abdd7c9: am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '1abdd7c98137b9b1c4172f2247a2cae37117b262':
  Reduce number of attempts before factory reset to 30.
 2014-11-25 15:21:44 +00:00
Selim Cinek
bde3966a82 am 51a36c67: am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '51a36c67666abd40188fdd182192a78c436c349e':
  Fixed build breakage due to api change.
 2014-11-25 15:21:43 +00:00
Zoltan Szatmary-Ban
0dccb9091b am 7a2e5f1b: am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '7a2e5f1b0370ce2f84b298659d3220ae592b1f74':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-25 15:21:41 +00:00
Paul Crowley
1abdd7c981 am 7bd78237: am 95a28c3f: Merge "Reduce number of attempts before factory reset to 30." into lmp-mr1-dev 
* commit '7bd7823758fa88c295858466a0ffd5f5468a1452':
  Reduce number of attempts before factory reset to 30.
 2014-11-25 15:08:33 +00:00
Selim Cinek
51a36c6766 am 2a65b1b1: am 44b50ad3: Merge "Fixed build breakage due to api change." into lmp-mr1-dev 
* commit '2a65b1b105b6b1b0ea8f8b82df6833f2eadca5bd':
  Fixed build breakage due to api change.
 2014-11-25 15:08:14 +00:00
Zoltan Szatmary-Ban
7a2e5f1b03 am 4a30d627: am 6ad85792: Merge "Stop background processes if TrustedCredentialSettings fragment gets detached" into lmp-mr1-dev 
* commit '4a30d627a25f2e6cf3d699c4949919aae7ca7063':
  Stop background processes if TrustedCredentialSettings fragment gets detached
 2014-11-25 15:08:02 +00: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
Raju Yadav
7468085405 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: If9c76fe3ff040c295f0af9c092e8824b9a1371d7
 2014-11-25 13:26:42 +01: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
4def38c32c Merge "Import translations. DO NOT MERGE" 2014-11-24 18:34:51 +00:00
Geoff Mendal
7c128a2601 Import translations. DO NOT MERGE 
Change-Id: Ieeb1625c68eca3c1777c3adbc48853231c685c62
Auto-generated-cl: translation import
 2014-11-24 10:31:25 -08: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
Wink Saville
e09e245173 am c1ded7e2: am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'c1ded7e23fc385f902720ca4590031bd690ecee3':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:12:18 +00:00
Lajos Molnar
0a03478cea am 8b2c19b5: am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer 
* commit '8b2c19b5780bc2dedb51982b2a40c573e1c86157':
  Reword NuPlayer developer settings to say AwesomePlayer
 2014-11-24 18:12:16 +00:00
Andres Morales
ee47e0219e am 877e9de6: am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev 
* commit '877e9de67b69c77bd34452c28b1b0a4739da1d90':
  Update enable oem unlock warning
 2014-11-24 18:12:15 +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
Wink Saville
c1ded7e23f am fd0c6eb5: am 239d185a: Merge "Additional changes to SubscriptionManager API as per API council." into lmp-mr1-dev 
* commit 'fd0c6eb52326ae18d9b82c71b57c0cdef88344fd':
  Additional changes to SubscriptionManager API as per API council.
 2014-11-24 18:05:59 +00:00
Lajos Molnar
8b2c19b578 am 5f9ee5e4: am c3245a05: Reword NuPlayer developer settings to say AwesomePlayer 
* commit '5f9ee5e46cd2c2747211b66a01773bb524f14aec':
  Reword NuPlayer developer settings to say AwesomePlayer
 2014-11-24 18:05:54 +00:00
Andres Morales
877e9de67b am e6d4aba3: am 7090c92f: Merge "Update enable oem unlock warning" into lmp-mr1-dev 
* commit 'e6d4aba3e1686084833a09d1fcdabf91fc35b0b6':
  Update enable oem unlock warning
 2014-11-24 18:05:33 +00: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
Narayan Kamath
d57c79bcc3 am 0d9fece9: am eb7795ed: Merge "Use shortFormat instead of shortFormat4." 
* commit '0d9fece9e82f92e45c118c4b89d02517c05221d8':
  Use shortFormat instead of shortFormat4.
 2014-11-24 16:11:43 +00:00
Narayan Kamath
0d9fece9e8 am eb7795ed: Merge "Use shortFormat instead of shortFormat4." 
* commit 'eb7795ed31ee84c5569490b0949ea271865de7d8':
  Use shortFormat instead of shortFormat4.
 2014-11-24 16:07:21 +00:00
Narayan Kamath
eb7795ed31 Merge "Use shortFormat instead of shortFormat4." 2014-11-24 15:59:16 +00: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