Commit Graph

5703 Commits

Author SHA1 Message Date
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
Prem Kumar
f41c6c4577 am 96ca2cfd: Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev
* commit '96ca2cfd087078e4042f9ab9678c77dea136eefe':
  Clearing junk layout for add wifi dialog in settings.
2014-12-12 00:59:34 +00:00
Prem Kumar
96ca2cfd08 Merge "Clearing junk layout for add wifi dialog in settings." into lmp-mr1-dev 2014-12-12 00:52:32 +00:00
Sanket Padawe
9235e673f9 Clearing junk layout for add wifi dialog in settings.
Bug: 18359901
Change-Id: I9957efd0a6740ee470ee36b09a7b6884a0d2c63a
2014-12-11 15:48:45 -08:00
Stuart Scott
b3dd601286 Show toast when cellular data option is changing.
bug: 18594162
Change-Id: I19dc265af47c0a40a6ace6d4bf42e21e035daf0a
2014-12-10 13:31:36 -08:00
Geoff Mendal
38fa3d2fde Import translations. DO NOT MERGE
Change-Id: I3101f0a9a789a2cb20115e66f88ca96374594888
Auto-generated-cl: translation import
2014-12-10 06:39:51 -08:00
Geoff Mendal
26b0476586 Import translations. DO NOT MERGE
Change-Id: I7bab4568e3a20facc24f3a09d337076e07d5d7ad
Auto-generated-cl: translation import
2014-12-10 06:24:00 -08:00
Zoltan Szatmary-Ban
45f04233c2 am 5d653fe8: am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
* commit '5d653fe85a030b41d7d4d946feca12ea897c4457':
  Make Location Settings multiprofile aware
2014-12-08 19:42:19 +00:00
Maurice Lam
86ed2cf33f am 8fcbe816: am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
* commit '8fcbe816656a61bcb6b5c34e7bd535a5bba9964d':
  [FRP] Don't extract IME for PIN / Password during setup
2014-12-08 19:37:12 +00:00
Sanket Padawe
361681e257 am 889d3875: am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
* commit '889d3875af9235f8f5330e2fec3e2fd7d7ef22e0':
  Change default sim selection text in sim settings ui.
2014-12-08 19:17:49 +00:00
Maurice Lam
5c325c4d8c am ecf2f401: am 2c0c9837: Merge "[FRP] Use setup wizard nav bar buttons" into lmp-mr1-dev
* commit 'ecf2f401e9f0de62f318d7e9e4749d3a33ed57fc':
  [FRP] Use setup wizard nav bar buttons
2014-12-08 19:14:06 +00:00
Maurice Lam
3d9267f307 am 40a252ce: am dfaf4c92: Merge "[FRP] Add illustration to lock screen setup" into lmp-mr1-dev
* commit '40a252ce499fd1377da6b64cbd785d4ca1c55727':
  [FRP] Add illustration to lock screen setup
2014-12-08 19:12:12 +00:00
Maurice Lam
5d7cef31bc am b6f5e003: am 13989d6d: Merge "[FRP] Give pattern lock colors" into lmp-mr1-dev
* commit 'b6f5e003a9167c44155906235762f2fac890c66a':
  [FRP] Give pattern lock colors
2014-12-08 19:10:20 +00:00
Geoff Mendal
7f530b3350 Import translations. DO NOT MERGE
Change-Id: Ib5799918393320abc01ef481068d943b716451f9
Auto-generated-cl: translation import
2014-12-08 06:41:08 -08:00
Geoff Mendal
838d6dc949 Import translations. DO NOT MERGE
Change-Id: I961eb0c06458b16d134c52d5748954f7c359b053
Auto-generated-cl: translation import
2014-12-08 06:25:15 -08:00
Zoltan Szatmary-Ban
5d653fe85a am f84c6ee0: Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev
* commit 'f84c6ee01c09b25d78c48cdf6bde5be4e334758c':
  Make Location Settings multiprofile aware
2014-12-08 12:55:55 +00:00
Zoltan Szatmary-Ban
f84c6ee01c Merge "Make Location Settings multiprofile aware" into lmp-mr1-dev 2014-12-08 12:50:11 +00:00
Maurice Lam
8fcbe81665 am 400e9378: Merge "[FRP] Don\'t extract IME for PIN / Password during setup" into lmp-mr1-dev
* commit '400e93785016cce831b14990365ab7636b846648':
  [FRP] Don't extract IME for PIN / Password during setup
2014-12-06 03:10:19 +00:00
Maurice Lam
400e937850 Merge "[FRP] Don't extract IME for PIN / Password during setup" into lmp-mr1-dev 2014-12-06 03:03:56 +00:00
Sanket Padawe
889d3875af am 6d0059c3: Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev
* commit '6d0059c3f998a86b1726949525d3501d5b7cf589':
  Change default sim selection text in sim settings ui.
2014-12-05 21:03:35 +00:00
Sanket Padawe
6d0059c3f9 Merge "Change default sim selection text in sim settings ui." into lmp-mr1-dev 2014-12-05 20:55:29 +00:00
Zoltan Szatmary-Ban
86c877e9b6 Make Location Settings multiprofile aware
Injected location services and location access status are shown
for managed profiles on Settings > Location

Bug: 18602878
Change-Id: Ic6232f3dc03d9675b90fbfd0163fe5bae4bd13c6
2014-12-05 19:40:59 +00:00