Commit Graph

5724 Commits

Author SHA1 Message Date
Sanket Padawe
55ebba9bed Change to fit color name text on color selection spinner in settings. automerge: a46c723
automerge: f99df05

* commit 'f99df057acb077e7601ec11d27be1bca0265247b':
  Change to fit color name text on color selection spinner in settings.
2015-01-30 19:58:41 +00:00
Sanket Padawe
f99df057ac Change to fit color name text on color selection spinner in settings.
automerge: a46c723

* commit 'a46c7236b6d71c861b49d20dd7515a9031764909':
  Change to fit color name text on color selection spinner in settings.
2015-01-30 19:50:33 +00:00
Sanket Padawe
a46c7236b6 Change to fit color name text on color selection spinner in settings.
Bug: 19206902
Change-Id: I5903ac6d6c1abd7a33a0c47483335114e28a0f51
2015-01-30 11:23:22 -08:00
Pavel Zhamaitsiak
d67ad203db resolved conflicts for merge of 23682809 to lmp-mr1-dev-plus-aosp
Change-Id: Ia6ad086dad93e5230ec59287d96e736e8d785320
2015-01-28 13:07:57 -08:00
Pavel Zhamaitsiak
236828098c Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev
automerge: 882000f

* commit '882000f39b91d908cc5e83cec47e7ce630d68e1a':
  Add button in "hidden" settings to flip "VoLTE Provisioned" flag
2015-01-28 19:04:58 +00:00
Pavel Zhamaitsiak
882000f39b Merge "Add button in "hidden" settings to flip "VoLTE Provisioned" flag" into lmp-mr1-dev 2015-01-28 18:59:18 +00:00
Geoff Mendal
fcfec91571 Import translations. DO NOT MERGE
Change-Id: Iec49e91adb1c662c0c59081415a2bd563b2e1d96
Auto-generated-cl: translation import
2015-01-28 06:59:36 -08:00
Geoff Mendal
b5ad15ae24 Import translations. DO NOT MERGE
Change-Id: I5d5971528e80df5a3582a364a0153338c63701d8
Auto-generated-cl: translation import
2015-01-28 06:47:47 -08:00
Geoff Mendal
f916950094 Import translations. DO NOT MERGE
Change-Id: I4b0c7abc349b040b61fa2a08fc20c7ef7dcb4aca
Auto-generated-cl: translation import
2015-01-26 06:55:29 -08:00
Geoff Mendal
26a3e949c5 Import translations. DO NOT MERGE
Change-Id: Iec41803b44675805c7c1df742682b986fb1015f0
Auto-generated-cl: translation import
2015-01-26 06:43:26 -08:00
Pavel Zhamaitsiak
cb267a6f8c Add button in "hidden" settings to flip "VoLTE Provisioned" flag
VoLTE Provisioned flag can be lost when new device image is flashed. Currently
there is no way to trigger Verizon provisioning update from device. This patch
adds button in hidden settings which allow to manually change value of the
flag.

Bug: 19038362
Change-Id: I23f13004dbcf9eaf711c66261696772b1d7bfd6e
2015-01-22 02:57:37 +00:00
Geoff Mendal
1359290622 Import translations. DO NOT MERGE
Change-Id: I7b3a724e783b9e279200e43f876d3a30ee813fc0
Auto-generated-cl: translation import
2015-01-21 06:55:59 -08:00
Geoff Mendal
75c5298e06 Import translations. DO NOT MERGE
Change-Id: Iec85d27eb1b30f9d04c74b75e35d86e3a9d3a4e8
Auto-generated-cl: translation import
2015-01-21 06:44:20 -08:00
Geoff Mendal
e06ab11084 Import translations. DO NOT MERGE
Change-Id: I33eb0003d296f51618451be42ed108d03e833fe7
Auto-generated-cl: translation import
2015-01-19 07:14:45 -08:00
Geoff Mendal
69b87f7925 Import translations. DO NOT MERGE
Change-Id: I5e8d466062fa0483aecaefdac20c34e219b43b3a
Auto-generated-cl: translation import
2015-01-19 07:07:29 -08:00
Geoff Mendal
23fd634e2d Import translations. DO NOT MERGE
Change-Id: Ifcd43881fe6a7f7cecd76278e10d99f1c01857c3
Auto-generated-cl: translation import
2015-01-14 06:23:07 -08:00
Geoff Mendal
c51cfe3d81 Import translations. DO NOT MERGE
Change-Id: Ic614419c04bbacc20f37c24902286fcaa11e79a9
Auto-generated-cl: translation import
2015-01-14 06:16:00 -08:00
Geoff Mendal
04250824ff Import translations. DO NOT MERGE
Change-Id: I3174bd9c344b8bf618340c4b21b0f739ba198095
Auto-generated-cl: translation import
2015-01-12 07:03:11 -08:00
Geoff Mendal
2631077287 Import translations. DO NOT MERGE
Change-Id: I58204e4d028fbdb98e1bb810de8d535974aeb130
Auto-generated-cl: translation import
2015-01-12 06:55:33 -08:00
Geoff Mendal
51aedf8603 Import translations. DO NOT MERGE
Change-Id: I6ad655aeb29d245a44a42ccb3f8d43d84a47d422
Auto-generated-cl: translation import
2015-01-07 06:22:13 -08:00
Geoff Mendal
1dcc3e5ca9 Import translations. DO NOT MERGE
Change-Id: I3fc38eff7245760c96eac6222d4afd53f4169718
Auto-generated-cl: translation import
2015-01-07 06:14:40 -08:00
Mikhail Naganov
8ada2c53b9 am 2399c450: am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
* commit '2399c4500c5801cead4ce89132751fd21551213a':
  Add an item to "Legal information" screen for WebView license
2015-01-07 12:50:04 +00:00
Mikhail Naganov
2399c4500c am 59f4d20b: Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev
* commit '59f4d20b2e818c56e30b9a6e9fa6b693aaad7bbf':
  Add an item to "Legal information" screen for WebView license
2015-01-07 12:40:43 +00:00
Mikhail Naganov
59f4d20b2e Merge "Add an item to "Legal information" screen for WebView license" into lmp-mr1-dev 2015-01-07 12:33:30 +00:00
Mikhail Naganov
71ef80eaf4 Add an item to "Legal information" screen for WebView license
Similar to how it is done for other legal information items --
if there is an activity that serves android.settings.WEBVIEW_LICENSE
intent, the item is shown with the title set to the activity's title,
otherwise the item is hidden.

Bug: 18729447
Change-Id: Ic5bad40c91e35fa3c8235128628413929ef111d3
2015-01-06 20:55:09 +00:00
Geoff Mendal
e421be56cf Import translations. DO NOT MERGE
Change-Id: Ia39277fe2bc9e2c171eec7349b5e829787311c84
Auto-generated-cl: translation import
2015-01-05 06:23:03 -08:00
Geoff Mendal
7e669a0ae5 Import translations. DO NOT MERGE
Change-Id: I657043d37bd3a3a13ef7b442c8ee6f86095bce15
Auto-generated-cl: translation import
2015-01-05 06:15:47 -08:00
Baligh Uddin
ad3b94fbde Import translations. DO NOT MERGE
Change-Id: I2a95cc3df31da8342436e918b02792d4624e5e88
Auto-generated-cl: translation import
2014-12-29 15:11:40 -08:00
Baligh Uddin
c3068f0788 Import translations. DO NOT MERGE
Change-Id: Iecde29c95e3c603740f4ff7875a594083bb6b40e
Auto-generated-cl: translation import
2014-12-29 14:59:54 -08:00
Baligh Uddin
6ccde759cb Import translations. DO NOT MERGE
Change-Id: I3f4b4d374faee184252c651295a6298c621fbcfd
Auto-generated-cl: translation import
2014-12-22 09:01:37 -08:00
Baligh Uddin
e957cb47a4 Import translations. DO NOT MERGE
Change-Id: I95c46e36bef66944280675891951c487f43c622f
Auto-generated-cl: translation import
2014-12-22 08:50:56 -08:00
Maurice Lam
9e1a3d6fc5 am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
automerge: e24c760

* commit 'e24c7605119312b0f8333c827663738fb2719e7b':
  [WifiSetup] Fix text colors in dark theme
2014-12-20 07:48:45 +00:00
Maurice Lam
e24c760511 am 9ab9d1ec: Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev
* commit '9ab9d1ec82047b74a6a4fc91ab5864086e715c35':
  [WifiSetup] Fix text colors in dark theme
2014-12-20 01:23:53 +00:00
Maurice Lam
9ab9d1ec82 Merge "[WifiSetup] Fix text colors in dark theme" into lmp-mr1-dev 2014-12-20 01:17:59 +00:00
Maurice Lam
b413c523c0 [WifiSetup] Fix text colors in dark theme
Use the attribute version of the material colors to avoid dark-on-
dark text in dark theme setup wizard.

Bug: 18810611
Change-Id: I740487e97a48016551f00c6a04876b0d4c71e0ab
2014-12-19 11:52:52 -08:00
Geoff Mendal
181494318c Import translations. DO NOT MERGE
Change-Id: I37ca51108f533323a830a9fcb550af4b94a2b2a3
Auto-generated-cl: translation import
2014-12-17 06:28:32 -08:00
Geoff Mendal
3b08bdec94 Import translations. DO NOT MERGE
Change-Id: I58cb836de181e6a7b4de701941e3a13bea7378cb
Auto-generated-cl: translation import
2014-12-17 06:18:00 -08:00
PauloftheWest
7741dff861 am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
automerge: 3df1fe0

* commit '3df1fe080f27ef46f1f3b03125391f0166af8664':
  Made the WPS icon visisble.
2014-12-16 01:41:58 +00:00
PauloftheWest
3df1fe080f am 4fe583d4: Merge "Made the WPS icon visisble." into lmp-mr1-dev
* commit '4fe583d4cf2e2f3ba86f80e8695b104234d714eb':
  Made the WPS icon visisble.
2014-12-16 00:54:21 +00:00
PauloftheWest
4fe583d4cf Merge "Made the WPS icon visisble." into lmp-mr1-dev 2014-12-15 22:49:24 +00:00
Stuart Scott
e84524efc8 am 56db3f35: am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
* commit '56db3f35eba2dae6463ac981822d8fe80fc6d189':
  Show toast when cellular data option is changing.
2014-12-15 22:41:52 +00:00
Stuart Scott
56db3f35eb am b62bfe71: Merge "Show toast when cellular data option is changing." into lmp-mr1-dev
* commit 'b62bfe715552fb86330958755f0e12ab0ffe7cad':
  Show toast when cellular data option is changing.
2014-12-15 22:35:57 +00:00
Stuart Scott
b62bfe7155 Merge "Show toast when cellular data option is changing." into lmp-mr1-dev 2014-12-15 19:43:19 +00:00
PauloftheWest
592545bf7d Made the WPS icon visisble.
Bug: 18335660
Change-Id: I62fd0be70680f74d7898dcf806ebbe41e5eb7342
2014-12-15 10:55:28 -08:00
Geoff Mendal
7e5cd2830f Import translations. DO NOT MERGE
Change-Id: I1cd9781471c0c3c1c74fc429e9013e9e8dfeef41
Auto-generated-cl: translation import
2014-12-15 06:42:32 -08:00
Geoff Mendal
d3affe47ee Import translations. DO NOT MERGE
Change-Id: I07a9426156ec5f40cded12af58aca05723a55005
Auto-generated-cl: translation import
2014-12-15 06:26:44 -08:00
John Spurlock
3eaa35064a am e964060b: am b4805e3a: Settings: Allow more lines of saver feature description text.
* commit 'e964060b5de4b534431b58c2ac4fae9fdd6baedc':
  Settings: Allow more lines of saver feature description text.
2014-12-12 19:08:46 +00:00
John Spurlock
e964060b5d am b4805e3a: Settings: Allow more lines of saver feature description text.
* commit 'b4805e3a3481196a0e945d397bef0950a843f5a3':
  Settings: Allow more lines of saver feature description text.
2014-12-12 19:04:24 +00:00
John Spurlock
b4805e3a34 Settings: Allow more lines of saver feature description text.
Bug: 18706906
Change-Id: I27bfd5e70c3e20c17fcad691cfb3c9f74d7d0390
2014-12-12 12:54:48 -05:00
Prem Kumar
78670560cd am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
automerge: f41c6c4

* commit 'f41c6c4577169880a2c339ec84d93078513b3402':
  Clearing junk layout for add wifi dialog in settings.
2014-12-12 04:31:59 +00:00