Commit Graph

4121 Commits

Author SHA1 Message Date
Vineeta Srivastava
7a40def17c am 47963424: Merge "Remove Manage Mobile Plan when config_show_mobile_plan is set to false" into klp-dev
* commit '479634248d2c9833d7315a6382f491460f48da0f':
  Remove Manage Mobile Plan when config_show_mobile_plan is set to false
2013-10-23 16:11:45 -07:00
Sungmin Choi
2490315e49 Remove Manage Mobile Plan when config_show_mobile_plan is set to false
config_show_mobile_plan is set to true by default.
When you don't want to show "Manage mobile plan" set config_show_mobile_plan to false in overlay.

Bug: 10819853
Change-Id: Ic3c69fb4246cc0de38518ef6c9950cee7fa4d987
2013-10-23 21:29:14 +00:00
Baligh Uddin
351a3dce1e Merge "Import translations. DO NOT MERGE" 2013-10-22 19:54:15 +00:00
Baligh Uddin
7fe57374cd Merge "Import translations. DO NOT MERGE" into klp-dev 2013-10-22 19:54:11 +00:00
Lifu Tang
f31559601c am 7077e646: am 75099b67: am cace3d8d: Modified the strings according to the specs
* commit '7077e6460e393e567d3b80da6190ff1ebe7d834a':
  Modified the strings according to the specs
2013-10-21 16:06:09 -07:00
Lifu Tang
7077e6460e am 75099b67: am cace3d8d: Modified the strings according to the specs
* commit '75099b672338213e9f74462cd9ff96dd51bdd9d5':
  Modified the strings according to the specs
2013-10-21 16:03:20 -07:00
Lifu Tang
75099b6723 am cace3d8d: Modified the strings according to the specs
* commit 'cace3d8d28f005e6226a3eb909f8ebc3668ef805':
  Modified the strings according to the specs
2013-10-21 16:00:32 -07:00
Baligh Uddin
393798c73d Import translations. DO NOT MERGE
Change-Id: Ie22a6c9bff23e69d4ed2fbf21c92cea4283797fe
Auto-generated-cl: translation import
2013-10-21 11:08:18 -07:00
Baligh Uddin
0e036f24af Import translations. DO NOT MERGE
Change-Id: Ic7fb5ee337d953a38cd86957054f550aa4ccc88c
Auto-generated-cl: translation import
2013-10-21 11:04:20 -07:00
Lifu Tang
cace3d8d28 Modified the strings according to the specs
- Fix b/11290711

Change-Id: I23827ad5bef4cf4bda14bb08f0e502cc4e9d2727
2013-10-18 17:49:47 -07:00
Baligh Uddin
2b22e29f3e Import translations. DO NOT MERGE
Change-Id: I41a338eda7e5ea66266315fab7808b0b04ec3ed9
Auto-generated-cl: translation import
2013-10-17 14:30:00 -07:00
Baligh Uddin
2496a32ca6 Import translations. DO NOT MERGE
Change-Id: I2aba430c7c862ee16f7adb93503877a4e79a1117
Auto-generated-cl: translation import
2013-10-17 14:21:57 -07:00
Baligh Uddin
d093024297 Import translations. DO NOT MERGE
Change-Id: Ifb0c8c8555ee014dbab39fab6d9f19442eb28410
Auto-generated-cl: translation import
2013-10-16 23:18:02 -07:00
Baligh Uddin
50a64d9dcf Import translations. DO NOT MERGE
Change-Id: I837e1a31e3443781597b7de28f44fc332c6a84fd
Auto-generated-cl: translation import
2013-10-16 23:13:11 -07:00
Torne (Richard Coles)
deb0a156bb Resolved conflicts for merge of 67e72aa4 to master
Change-Id: Ib3904427c8f6bcc19895b39e4ce65eaa626e8396
2013-10-15 13:37:35 +01:00
Torne (Richard Coles)
67e72aa49e am 9880646e: am f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit '9880646e197331b99ba9824b7d47f12391c82bf4':
  Remove experimental WebView setting.
2013-10-15 03:37:07 -07:00
Torne (Richard Coles)
9880646e19 am f88e5442: Merge "Remove experimental WebView setting." into klp-dev
* commit 'f88e5442f5d2492d415864d1cd118d610b0005d0':
  Remove experimental WebView setting.
2013-10-15 03:34:15 -07:00
Torne (Richard Coles)
f88e5442f5 Merge "Remove experimental WebView setting." into klp-dev 2013-10-15 10:31:46 +00:00
Baligh Uddin
548de33483 Import translations. DO NOT MERGE
Change-Id: If06a2397c8b907b0593374a89ad2d22bc53382c1
Auto-generated-cl: translation import
2013-10-14 15:30:24 -07:00
Baligh Uddin
740702ced3 Import translations. DO NOT MERGE
Change-Id: I53c3eb76acc7cfd73101c70e2db66f66da45e8c3
Auto-generated-cl: translation import
2013-10-14 15:24:56 -07:00
Torne (Richard Coles)
0bf324c628 Remove experimental WebView setting.
The experimental WebView is no longer experimental; remove the setting
from the settings app.

Bug: 10427705
Change-Id: Iaad17b132f21cad3d32ee5800a9274863962cc87
2013-10-14 17:35:43 +01:00
Baligh Uddin
04e9687144 Import translations. DO NOT MERGE
Change-Id: I61a6ed38ca7f23682f15d452b199e57f3dc4b632
Auto-generated-cl: translation import
2013-10-12 00:59:55 -07:00
Baligh Uddin
3747312193 Import translations. DO NOT MERGE
Change-Id: Ib4e08a38decb3b697e53959546b74baaf0836211
Auto-generated-cl: translation import
2013-10-12 00:56:01 -07:00
Baligh Uddin
36d4eb83c8 Import translations. DO NOT MERGE
Change-Id: Ifa7a23156b38840d7807de126a8eb3d556ac95ff
Auto-generated-cl: translation import
2013-10-11 14:56:37 -07:00
Baligh Uddin
8dd824b60b Import translations. DO NOT MERGE
Change-Id: Iab8ff1d8541b26f8bc44905b98dd847ca4faa870
Auto-generated-cl: translation import
2013-10-11 14:51:44 -07:00
Baligh Uddin
9c861f80a2 Import translations. DO NOT MERGE
Change-Id: Id47b239bd151fd77314c38caf065c8f0d24ed62b
Auto-generated-cl: translation import
2013-10-11 14:47:56 -07:00
Dianne Hackborn
5e53e25e8d am 47be2e84: am 4f00b368: am b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '47be2e84d0b0f603357646ae18a2bc39b8b148cf':
  Allow tapping on memory status regions to filter proc stats.
2013-10-11 12:55:04 -07:00
Dianne Hackborn
47be2e84d0 am 4f00b368: am b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit '4f00b368f9fcc27d43dfc63c3ac9d6fedf8a070d':
  Allow tapping on memory status regions to filter proc stats.
2013-10-11 12:50:07 -07:00
Dianne Hackborn
4f00b368f9 am b1e33884: Allow tapping on memory status regions to filter proc stats.
* commit 'b1e33884190732a58bfbfe659898e02d41fe39f4':
  Allow tapping on memory status regions to filter proc stats.
2013-10-11 11:59:51 -07:00
Dianne Hackborn
b1e3388419 Allow tapping on memory status regions to filter proc stats.
Change-Id: Iade56907df648a95600919578154635c49ac9dce
2013-10-11 11:54:34 -07:00
Baligh Uddin
855f866cdd Merge "Import translations. DO NOT MERGE" 2013-10-11 15:22:45 +00:00
Baligh Uddin
38d0357739 Import translations. DO NOT MERGE
Change-Id: I2ef84bf546ddd4be1daa67e14bf5152a4bf2b381
Auto-generated-cl: translation import
2013-10-11 01:22:14 -07:00
Baligh Uddin
3104c1ce9f Import translations. DO NOT MERGE
Change-Id: I227ca980e6c3ac5e58184a2b06f8e9151cf99edf
Auto-generated-cl: translation import
2013-10-11 01:17:11 -07:00
Baligh Uddin
6e96aff554 Import translations. DO NOT MERGE
Change-Id: I7a39d70c7962e6c2721ea408712e9bdd23770cea
Auto-generated-cl: translation import
2013-10-11 01:12:20 -07:00
Alan Viverette
b57fe58e6e Merge "Update color blindness descriptions for translation" 2013-10-11 00:34:55 +00:00
Alan Viverette
7ec57940c0 Update color blindness descriptions for translation
BUG: 11079175
Change-Id: I4498613c4ce796c2b86de714aebcf7397dffc7c8
2013-10-10 17:34:08 -07:00
David Christie
774a06593e am 156cec37: am df0698e9: am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
* commit '156cec37aaf0159ac89199021ce725960e43571d':
  Change location settings icons from crosshair to pin -b/8142654
2013-10-10 16:08:21 -07:00
David Christie
156cec37aa am df0698e9: am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
* commit 'df0698e9f655718743c2d065eae481f1f9d1aba3':
  Change location settings icons from crosshair to pin -b/8142654
2013-10-10 16:05:36 -07:00
David Christie
df0698e9f6 am 6d6d4976: Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev
* commit '6d6d4976104e811dab2eb8a4d3ff0680fc7eb46a':
  Change location settings icons from crosshair to pin -b/8142654
2013-10-10 15:39:06 -07:00
David Christie
6d6d497610 Merge "Change location settings icons from crosshair to pin -b/8142654" into klp-dev 2013-10-10 22:28:31 +00:00
Alan Viverette
4625cac938 am cb2cf8aa: am b371444b: am 16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit 'cb2cf8aa4375fc6ba0abf9abffeafebeeb0964e1':
  Fix caption settings picker layouts
2013-10-09 13:34:26 -07:00
Alan Viverette
cb2cf8aa43 am b371444b: am 16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit 'b371444b2fee94045ea97c7f4e97a08610595d61':
  Fix caption settings picker layouts
2013-10-09 13:31:04 -07:00
Alan Viverette
b371444b2f am 16ad5748: Merge "Fix caption settings picker layouts" into klp-dev
* commit '16ad57483d7bba6f5c05ffd64431a900c400eff5':
  Fix caption settings picker layouts
2013-10-09 13:29:08 -07:00
Alan Viverette
16ad57483d Merge "Fix caption settings picker layouts" into klp-dev 2013-10-09 20:25:09 +00:00
David Christie
6207fc6aef Change location settings icons from crosshair to pin
-b/8142654

Change-Id: I4c0b6aeb56a9a100c2869032bb09dc11cc66dcea
2013-10-09 10:27:10 -07:00
Nick Kralevich
a5418e33e3 Fix build.
I have no idea if this is an appropriate change, but it's the
smallest patch I could come up with that lets the code compile.

Change-Id: I363386a23cd70f7a1207c5711d2e4b92e8e23937
2013-10-09 08:57:19 -07:00
Alan Viverette
954fd32047 Fix caption settings picker layouts
BUG: 11056756
Change-Id: I64fa4517591915d89be8d72d2075794cab1063bd
2013-10-08 15:33:00 -07:00
Baligh Uddin
5faedbfb72 Import translations. DO NOT MERGE
Change-Id: Ia0bfc7802cee3463b0ea003fa23a41ac948065cf
Auto-generated-cl: translation import
2013-10-07 19:06:16 -07:00
Baligh Uddin
b49c9a49d5 Import translations. DO NOT MERGE
Change-Id: If370e7dc3d5de024ec3a6afd037019226fe45569
Auto-generated-cl: translation import
2013-10-07 19:02:02 -07:00
Baligh Uddin
275f7679d0 Import translations. DO NOT MERGE
Change-Id: I8cdb9b939a3985f7eb7813fa0bfbc3129ca8638d
Auto-generated-cl: translation import
2013-10-07 18:55:29 -07:00