PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,055 Commits 1 Branch 0 Tags
870de3eeb9ebcf097ca48c63fd67a864829b6acf
Commit Graph

5396 Commits

Author SHA1 Message Date
Paul Lawrence
870de3eeb9 am be492644: am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit 'be492644102083557fa47cde3ee9110826677079':
  Make emergency button right size
 2014-10-30 10:18:26 +00:00
Paul Lawrence
be49264410 am 00abeba2: Merge "Make emergency button right size" into lmp-mr1-dev 
* commit '00abeba2c08b656db924d967a0733aa76aea40a7':
  Make emergency button right size
 2014-10-28 20:14:31 +00:00
Paul Lawrence
59717ad3a7 Make emergency button right size 
Bug: 18123894
Bug: 17394128
Change-Id: I248890b82f62146e1814172fd8b67e9a39661997
 2014-10-28 19:01:18 +00:00
Geoff Mendal
f571e511ba Import translations. DO NOT MERGE 
Change-Id: Ia682e947ee01ba5ecc42b3a4578fcc010a7efead
Auto-generated-cl: translation import
 2014-10-27 09:43:16 -07:00
Geoff Mendal
40f84ca020 Import translations. DO NOT MERGE 
Change-Id: Ifc5fc4573b40b501282cb71a17ba8c6873dc64c6
Auto-generated-cl: translation import
 2014-10-27 09:40:31 -07:00
Sanket Padawe
35f83ca996 am 844c2a77: am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '844c2a77f44491ed8fec0e43919c4a3efae0acdf':
  WIP support icon
 2014-10-24 17:48:17 +00:00
Sanket Padawe
844c2a77f4 am 7ff1718e: am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '7ff1718e1fb58b38ebfa4ec0d45e788c9acd2b5c':
  WIP support icon
 2014-10-24 17:42:48 +00:00
Sanket Padawe
7ff1718e1f am 5fd97c55: Merge "WIP support icon" into lmp-sprout-dev 
* commit '5fd97c551fb8cbcc43d762d9c609be1061cc5170':
  WIP support icon
 2014-10-24 17:39:21 +00:00
Sanket Padawe
5fd97c551f Merge "WIP support icon" into lmp-sprout-dev 2014-10-24 17:34:24 +00:00
Sanket Padawe
0f596b90fe WIP support icon 
Added static sim icon to alert box for selecting different sim accounts.

Change-Id: Ib22ceba4b96d636754d7946859f194488517ff9d
 2014-10-24 10:17:08 -07:00
Geoff Mendal
1303f19b5f Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-22 23:57:03 +00:00
Geoff Mendal
82454b4721 Import translations. DO NOT MERGE 
Change-Id: I895931be5f341683d3bed7a087b3b1c4dc5a0359
Auto-generated-cl: translation import
 2014-10-22 16:29:28 -07:00
Geoff Mendal
bd265c947b Import translations. DO NOT MERGE 
Change-Id: I5df28d6eefcb0e0e3e2fc49baa1a751fa830319b
Auto-generated-cl: translation import
 2014-10-22 16:23:27 -07:00
Geoff Mendal
8e2fb4c9c4 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-22 23:22:02 +00:00
Geoff Mendal
d5032606cc Import translations. DO NOT MERGE 
Change-Id: I7a571f71af317a655f81d6446aebbd5912cd9089
Auto-generated-cl: translation import
 2014-10-22 16:20:52 -07:00
Sanket Padawe
f7fad6b6db am eee65f04: am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit 'eee65f0417e879be499a15d006520b30618cc7c2':
  Commit with dialog box but using subinfo records
 2014-10-22 21:27:13 +00:00
Sanket Padawe
eee65f0417 am 286e3c46: am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '286e3c4651fa0af76e092ea52349d5ae2235825d':
  Commit with dialog box but using subinfo records
 2014-10-22 21:08:13 +00:00
Sanket Padawe
286e3c4651 am 266e4296: Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 
* commit '266e429657774dc7aa14029629a9e78c942c6104':
  Commit with dialog box but using subinfo records
 2014-10-22 20:45:40 +00:00
John Spurlock
968a294720 am 5c1f4155: am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title. 
* commit '5c1f41558f47ce79c3b30448d6f5025669704f06':
  Settings: Remove obsolete string: heads_up_enabled_title.
 2014-10-22 17:15:24 +00:00
John Spurlock
5c1f41558f am 2ae90864: Settings: Remove obsolete string: heads_up_enabled_title. 
* commit '2ae908649c5eb4708af1c29cefbf97cfab2cc341':
  Settings: Remove obsolete string: heads_up_enabled_title.
 2014-10-22 16:42:54 +00:00
John Spurlock
2ae908649c Settings: Remove obsolete string: heads_up_enabled_title. 
Instead of bumping the char limit as requested by translation, simply
remove it altogether, it's no longer used.

Bug: 14244562
Change-Id: I20737ec80c748c1a0eb206819ae82348a05c31a9
 2014-10-22 11:36:58 -04:00
Alan Viverette
c734de2aad am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 
automerge: 6a4d223

* commit '6a4d22389a3f214d73f1d40c5b28966433b656da':
  Adjust caption preset picker items dimens for Material
 2014-10-22 05:19:48 +00:00
Alan Viverette
6a4d22389a am 2625d8ed: Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 
* commit '2625d8ed8914ccdfd47983f63df800d991ca3f0c':
  Adjust caption preset picker items dimens for Material
 2014-10-22 02:08:12 +00:00
Alan Viverette
2625d8ed89 Merge "Adjust caption preset picker items dimens for Material" into lmp-mr1-dev 2014-10-22 01:25:24 +00:00
Alexandra Gherghina
3ac497d8d5 am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 
automerge: 3748b94

* commit '3748b940a3c86377e55d0a505858da2c2fc1cdaa':
  Fix user spinner anchor following system ui changes
 2014-10-22 00:28:07 +00:00
Alan Viverette
285fb04711 Adjust caption preset picker items dimens for Material 
BUG: 18027521
Change-Id: Icce397410af495639df0b6852b21c159ec103ed8
 2014-10-21 16:51:54 -07:00
Alexandra Gherghina
3748b940a3 am b9d05d6c: Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 
* commit 'b9d05d6c63c7bdd866b2cfb3e5b549c352d1493f':
  Fix user spinner anchor following system ui changes
 2014-10-21 22:29:39 +00:00
Alexandra Gherghina
b9d05d6c63 Merge "Fix user spinner anchor following system ui changes" into lmp-mr1-dev 2014-10-21 22:20:07 +00:00
Alexandra Gherghina
9dbaf77696 am 7574ee6a: am aadc070a: Move up spinner in apps screen 
* commit '7574ee6a257b7d24447a9ec9767b8d985baaafcf':
  Move up spinner in apps screen
 2014-10-21 22:19:36 +00:00
Alexandra Gherghina
7574ee6a25 am aadc070a: Move up spinner in apps screen 
* commit 'aadc070a35ca47940e9fa964ba68c5ce817202ef':
  Move up spinner in apps screen
 2014-10-21 22:14:30 +00:00
Sanket Padawe
266e429657 Merge "Commit with dialog box but using subinfo records" into lmp-sprout-dev 2014-10-21 21:56:06 +00:00
Sanket Padawe
a501137f26 Commit with dialog box but using subinfo records 
Change-Id: I144aa8899eb050db29a9d78aaf7af4c1f31d9eab
 2014-10-21 14:16:12 -07:00
Alexandra Gherghina
aadc070a35 Move up spinner in apps screen 
Bug: 18006320
Change-Id: Ic23c2c3e02a6c6a20b180065975228d42fd91899
 2014-10-21 18:39:07 +01:00
John Spurlock
12680fafb7 am e926cd5c: am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit 'e926cd5cc4ef8d4ef858bc6c7d68e12f32aabac6':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:32:29 +00:00
John Spurlock
e926cd5cc4 am 196aaceb: Merge "Settings: Display \'Calls\' category on non-voice devices." into lmp-mr1-dev 
* commit '196aacebf9ac9dd4ffedc3012f59285be499e470':
  Settings: Display 'Calls' category on non-voice devices.
 2014-10-21 16:19:46 +00:00
John Spurlock
196aacebf9 Merge "Settings: Display 'Calls' category on non-voice devices." into lmp-mr1-dev 2014-10-21 16:11:12 +00:00
Geoff Mendal
eda5136ba2 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:57:55 +00:00
Geoff Mendal
d335d4f395 Import translations. DO NOT MERGE 
Change-Id: Ib689764b81b797eb3dee6a1bd786ef911926adbd
Auto-generated-cl: translation import
 2014-10-20 16:52:16 -07:00
Geoff Mendal
c25c92cccd Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-10-20 23:45:44 +00:00
Geoff Mendal
ac9623c69a Import translations. DO NOT MERGE 
Change-Id: Iffd7117e48c6f0fb2120b254bc455b22c8941ae8
Auto-generated-cl: translation import
 2014-10-20 16:44:24 -07:00
Geoff Mendal
50d4d2d39a Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-10-20 23:42:30 +00:00
Geoff Mendal
0019c6af93 Import translations. DO NOT MERGE 
Change-Id: I4bcf84faf0b26292a74ed9c833a2e9e48ad795b8
Auto-generated-cl: translation import
 2014-10-20 16:40:41 -07:00
Sanket Padawe
8299d519de am 4bcd973d: am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit '4bcd973db125d775b88d28e5a3c77ba739cf3d9d':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 21:01:53 +00:00
Sanket Padawe
4bcd973db1 am fbde7619: am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'fbde761930f23efd4102c983b430c35a615b71d9':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:56:27 +00:00
Sanket Padawe
fbde761930 am bdedbb85: Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 
* commit 'bdedbb851699016a70eafdb82b038240646358c8':
  Changing settings UI changes related to strings to be displayed
 2014-10-20 20:51:07 +00:00
Sanket Padawe
bdedbb8516 Merge "Changing settings UI changes related to strings to be displayed" into lmp-sprout-dev 2014-10-20 20:42:57 +00:00
Sanket Padawe
9d276ca597 Changing settings UI changes related to strings to be displayed 
Change-Id: I4e722d7cac3914ce93ad28c806787851949028bd
 2014-10-20 12:33:50 -07:00
John Spurlock
9a940cbf04 Settings: Display 'Calls' category on non-voice devices. 
Since the category applies to any call, include config for
this interruption even on non-voice-capable devices.

Bug: 17666139
Change-Id: I3732246179c527220f8c6bee539ba7bc1e80de18
 2014-10-20 14:22:38 -04:00
Jim Miller
8baf92359b am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial 
automerge: c8b2003

* commit 'c8b20033de1af626d68ca049077e327e839fbb5b':
  Fix bad string in EncryptionInterstitial
 2014-10-18 03:06:26 +00:00
Jim Miller
c8b20033de am 3d3c8703: am 456b866c: am aa037675: Fix bad string in EncryptionInterstitial 
* commit '3d3c870374584d542e7722da44a1b5e3cbffa401':
  Fix bad string in EncryptionInterstitial
 2014-10-18 02:35:43 +00:00