PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,174 Commits 1 Branch 0 Tags
cbcc76e8d32f95690d08258a91d58136cd9fb056
Commit Graph

6577 Commits

Author SHA1 Message Date
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
1eb838ec83 am 626d1fc0: am c7e62cf1: am cd1846fa: Merge "Changing hint string inside sim name editor dialog in settings." into lmp-mr1-dev 
* commit '626d1fc0f78aa634778b7cc1ac860c35f6a83213':
  Changing hint string inside sim name editor dialog in settings.
 2014-11-22 00:00:30 +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
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
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
72c70cb098 am d0d76e56: am 37c3cd63: am 0e606a2a: Merge "[SetupWizard] Warn user of missing FRP if skipping wi-fi" into lmp-mr1-dev 
* commit 'd0d76e56af9c75b75d8f08c2ba77577e2745a382':
  [SetupWizard] Warn user of missing FRP if skipping wi-fi
 2014-11-21 23:13:37 +00:00
Maurice Lam
a78fbb48ce am 80e29675: am 3b1baf4b: am 485a7e59: Merge "[WifiSetup] Update title string" into lmp-mr1-dev 
* commit '80e2967529cf0bb75cb43881931bf4516e28bbd2':
  [WifiSetup] Update title string
 2014-11-21 23:13:32 +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
9986ca49d6 am 3da30aab: am 208a8490: am 5875aefa: Merge "Remove backup preferences if backup service is inactive" into lmp-mr1-dev 
* commit '3da30aabf18dcb0107894d7ef400f417cc665f5d':
  Remove backup preferences if backup service is inactive
 2014-11-21 15:37:25 +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
61d0017cc1 am cf8255a0: am ad8191d9: am b85025d9: Strings for multiprofile Location Settings. 
* commit 'cf8255a0b150118a4c1f8703fe49d333d3fe0298':
  Strings for multiprofile Location Settings.
 2014-11-21 15:28:04 +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
Jeff Davidson
f73f5b6d63 am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
automerge: 32b7def

* commit '32b7def42f912ea527427892f4d95d277e4851fc':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-21 01:55:01 +00:00
Jeff Davidson
32b7def42f am 9503a00c: am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
* commit '9503a00c587bff45d09206af309abc87b8f138df':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-21 00:44:02 +00:00
Zoltan Szatmary-Ban
2a7a9f6b9e am ead7991d: am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev automerge: 72b1985 
* commit 'ead7991dead5f2c5886778ac4d9b31f0ac300101':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 21:29:12 +00:00
Zoltan Szatmary-Ban
ead7991dea am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 
automerge: 72b1985

* commit '72b198508a3e2db38541e49a85229d363fdef3ae':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 21:25:42 +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
9503a00c58 am 101743f9: Merge "Final strings for Wi-Fi Assistant in platform settings." into lmp-mr1-dev 
* commit '101743f9ecccae0054ba5867ae0585750a0a8bd2':
  Final strings for Wi-Fi Assistant in platform settings.
 2014-11-20 18:43:00 +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
72b198508a am 548460bd: Merge "Show managed profile accounts on Settings > Factory Reset" into lmp-mr1-dev 
* commit '548460bda5d37b22165b8e9e4e6349699910795a':
  Show managed profile accounts on Settings > Factory Reset
 2014-11-20 14:10:14 +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
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
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
41ae403fa0 Import translations. DO NOT MERGE 
Change-Id: Iab22f476ee0efb824690089ee1b12efe44eba77f
Auto-generated-cl: translation import
 2014-11-19 11:19:12 -08:00
Geoff Mendal
3b77e45e5c Import translations. DO NOT MERGE 
Change-Id: I6ac6d662765779e610a210ad7ac792e7543af3fc
Auto-generated-cl: translation import
 2014-11-19 11:08:37 -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
d1cb0d3805 am 1115d938: am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1115d93887de1b758fa120dc9a4caa7278dd4a96':
  Adding icons to sim color selection in settings UI.
 2014-11-18 20:17:51 +00:00
PauloftheWest
ed6cf9c191 am 5f0da57c: am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '5f0da57c651571e89cb87160f3eebe0945eca1da':
  Created Multi-SIM notifications.
 2014-11-18 20:17:50 +00:00
Sanket Padawe
1115d93887 am 1ec6807a: am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit '1ec6807a11b92ceca43e09d8517641150ccb826a':
  Adding icons to sim color selection in settings UI.
 2014-11-18 02:08:01 +00:00
PauloftheWest
5f0da57c65 am a41e40ec: am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit 'a41e40ec3039f77bbe7c02714d7a2abef24c0a6d':
  Created Multi-SIM notifications.
 2014-11-18 02:06:55 +00:00
Sanket Padawe
1ec6807a11 am d85aa178: Merge "Adding icons to sim color selection in settings UI." into lmp-mr1-dev 
* commit 'd85aa17894db4928d010c1590c2c6ea781546230':
  Adding icons to sim color selection in settings UI.
 2014-11-17 23:57:18 +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
PauloftheWest
a41e40ec30 am 79381a92: Merge "Created Multi-SIM notifications." into lmp-mr1-dev 
* commit '79381a928b998cc45ffeeea624d8bc4b77c6529a':
  Created Multi-SIM notifications.
 2014-11-17 22:59:24 +00:00
PauloftheWest
79381a928b Merge "Created Multi-SIM notifications." into lmp-mr1-dev 2014-11-17 22:50:08 +00:00
Geoff Mendal
edd2631cd4 Merge "Import translations. DO NOT MERGE" 2014-11-17 22:27:38 +00:00
Geoff Mendal
217ffe6bf8 Import translations. DO NOT MERGE 
Change-Id: Ie927e25029960f1ed0c8858e9162f4d2f235b687
Auto-generated-cl: translation import
 2014-11-17 14:24:08 -08:00
Geoff Mendal
6c30eb976a Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-17 22:13:18 +00:00
Geoff Mendal
0b78e252b7 Import translations. DO NOT MERGE 
Change-Id: Ia2caaac61701db1f431df0fa44827e1b6f617bcd
Auto-generated-cl: translation import
 2014-11-17 14:09:21 -08:00
Geoff Mendal
383d2ab6bd Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-17 22:06:48 +00:00