PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,435 Commits 1 Branch 0 Tags
028461176c44933737b19397b42b91cbed9cc08f
Commit Graph

17435 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
ed98052cf2 am db494098: am 9209ce85: Merge "Changing sim selection dialog in Settings to use phoneAccount" into lmp-mr1-dev 
* commit 'db4940988ddabb8f6c1768cb56ed3e7fa62a990d':
  Changing sim selection dialog in Settings to use phoneAccount
 2014-11-21 23:42:07 +00:00
Sanket Padawe
626d1fc0f7 am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev 
* commit 'c7e62cf149e98fe9da6f17e1dc43a7bb9ba256dc':
  Changing hint string inside sim name editor dialog in settings.
 2014-11-21 23:42:05 +00: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
d0d76e56af am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev 
* commit '37c3cd63a83a5e49686fc1eae25b2b2fc188991f':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
 2014-11-21 21:48:06 +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
80e2967529 am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev 
* commit '3b1baf4b18c8176ba76d4527cb5740c0ace2cf91':
  [WifiSetup] Update title string
 2014-11-21 21:40:38 +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
3da30aabf1 am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '208a8490c9fe6cfa3899c8c41f95afa539863711':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:32:33 +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
cf8255a0b1 am ad8191d9: am b85025d9: Strings for multiprofile Location Settings. 
* commit 'ad8191d95e4dfa296f276e68647e216502bf4d36':
  Strings for multiprofile Location Settings.
 2014-11-21 15:23:31 +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
07750584c8 am aa96cbec: am 0cc764be: Merge "Watch out for deleted user when exiting async task" into lmp-mr1-dev 
* commit 'aa96cbec46dc2fce7eabd660ad08c1ef8326dbb3':
  Watch out for deleted user when exiting async task
 2014-11-21 02:48:18 +00:00