Zoltan Szatmary-Ban
7413c1fae4
am 574db426: Merge "Update Trusted Credentials screen in settings" into lmp-dev
...
* commit '574db4269528c7277f6e14a44156909fdb063190':
Update Trusted Credentials screen in settings
2014-09-09 11:12:09 +00:00
Zoltan Szatmary-Ban
574db42695
Merge "Update Trusted Credentials screen in settings" into lmp-dev
2014-09-09 11:05:54 +00:00
Baligh Uddin
2acd6aeced
Import translations. DO NOT MERGE
...
Change-Id: Iad5365cc40b0101b19c851aa3ed1f1431ba5fdc5
Auto-generated-cl: translation import
2014-09-08 22:54:40 -07:00
Baligh Uddin
ce59f5cfcd
Import translations. DO NOT MERGE
...
Change-Id: I20034afe71fda554c3139ad8e56df1fa7ae1ffd4
Auto-generated-cl: translation import
2014-09-08 22:43:25 -07:00
Baligh Uddin
7cfae9df9e
Import translations. DO NOT MERGE
...
Change-Id: I218cab3789ccb371b7ca9cd77388932b88ec5ab1
Auto-generated-cl: translation import
2014-09-08 22:39:52 -07:00
Elliott Hughes
fa13725d12
am 8a71e343: am 15a2e89a: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
...
* commit '8a71e3436f4230551c0839cb7eeba44478d04dc2':
Start cleaning up percentage formatting in Settings.
2014-09-09 00:00:01 +00:00
Elliott Hughes
8a71e3436f
am 15a2e89a: am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
...
* commit '15a2e89aa8646b0e080ed22ef6dab6bbdfc8f94a':
Start cleaning up percentage formatting in Settings.
2014-09-08 23:50:48 +00:00
Elliott Hughes
bce031b0ad
am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
...
* commit '5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
Start cleaning up percentage formatting in Settings.
2014-09-08 23:40:42 +00:00
Elliott Hughes
15a2e89aa8
am 5c0d0729: Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
...
* commit '5c0d0729b1701428d46ee7abb31f2a83d8da38ab':
Start cleaning up percentage formatting in Settings.
2014-09-08 23:39:56 +00:00
Elliott Hughes
5c0d0729b1
Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
2014-09-08 23:26:20 +00:00
PauloftheWest
6eccc85e94
am 36dbcdea: am 8e476892: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
...
* commit '36dbcdeaf6b94f50de6333c2e509d5a63ba52a65':
Fixed scrolling on the Wi-Fi Settings Dialog.
2014-09-08 23:10:51 +00:00
PauloftheWest
a7383f3862
Removed connect button from Saved Networks dialog.
...
Bug: 17065357
Change-Id: Idb46ac404b171733ccac271ba74188224ca2611d
2014-09-08 16:06:04 -07:00
PauloftheWest
36dbcdeaf6
am 8e476892: am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
...
* commit '8e476892937b5661a38f9c551e39c5dbe6444ab4':
Fixed scrolling on the Wi-Fi Settings Dialog.
2014-09-08 22:57:27 +00:00
PauloftheWest
5dcec20557
am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
...
* commit 'bec89d797b6f2680c544639faed7e47573625e11':
Fixed scrolling on the Wi-Fi Settings Dialog.
2014-09-08 22:54:05 +00:00
PauloftheWest
8e47689293
am bec89d79: Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
...
* commit 'bec89d797b6f2680c544639faed7e47573625e11':
Fixed scrolling on the Wi-Fi Settings Dialog.
2014-09-08 22:51:29 +00:00
PauloftheWest
c509c76068
am abc0e4b8: am ab3f2f6e: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
...
* commit 'abc0e4b87261e34df9e69d2f543ce0a8e930efef':
Disabled SIM Cards in Settings.
2014-09-08 22:35:31 +00:00
PauloftheWest
23f77701be
am 640a429d: am c6e1cc20: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
...
* commit '640a429d513fb6c7b342c9166a911e02727b744d':
Material theme updates for Wifi Dialog.
2014-09-08 22:35:26 +00:00
PauloftheWest
bec89d797b
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
2014-09-08 22:34:51 +00:00
PauloftheWest
abc0e4b872
am ab3f2f6e: am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
...
* commit 'ab3f2f6e4de972442c48a6cc1283c428116c769a':
Disabled SIM Cards in Settings.
2014-09-08 22:22:16 +00:00
PauloftheWest
640a429d51
am c6e1cc20: am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
...
* commit 'c6e1cc20d89ffb60732288a30dc2e91fff605463':
Material theme updates for Wifi Dialog.
2014-09-08 22:22:15 +00:00
PauloftheWest
ab3f2f6e4d
am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
...
* commit 'e5f847357697f15fe0507b9c9a77e85f2c0aeedf':
Disabled SIM Cards in Settings.
2014-09-08 22:12:36 +00:00
PauloftheWest
c6e1cc20d8
am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
...
* commit 'd0db988bb635975a366654099fe1ac559283161f':
Material theme updates for Wifi Dialog.
2014-09-08 22:12:35 +00:00
PauloftheWest
91f76560f8
am e5f84735: Merge "Disabled SIM Cards in Settings." into lmp-dev
...
* commit 'e5f847357697f15fe0507b9c9a77e85f2c0aeedf':
Disabled SIM Cards in Settings.
2014-09-08 22:08:41 +00:00
PauloftheWest
9128659be8
am d0db988b: Merge "Material theme updates for Wifi Dialog." into lmp-dev
...
* commit 'd0db988bb635975a366654099fe1ac559283161f':
Material theme updates for Wifi Dialog.
2014-09-08 22:08:40 +00:00
PauloftheWest
e5f8473576
Merge "Disabled SIM Cards in Settings." into lmp-dev
2014-09-08 22:02:11 +00:00
PauloftheWest
d0db988bb6
Merge "Material theme updates for Wifi Dialog." into lmp-dev
2014-09-08 22:01:06 +00:00
PauloftheWest
7ac5a1e887
Fixed scrolling on the Wi-Fi Settings Dialog.
...
+ When needed, scrollbars will always appear on the Wi-Fi Settings Dialog.
Bug: 17166502
Change-Id: I7f61746b505d1a1476e987571dc757d01ce636df
2014-09-08 14:59:04 -07:00
PauloftheWest
96fef981ed
Material theme updates for Wifi Dialog.
...
Bug: 17014192
Change-Id: I1e5dd04199a433d8d1c5c4e4c48329e871e28db5
2014-09-08 14:43:45 -07:00
Andres Morales
bb1f07c215
am 37df3745: am 68ccc9f9: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
...
* commit '37df3745b422260a566012a1549974efe77d49bd':
Fix issue where can't FR Volantis if OEM unlock is enabled
2014-09-08 21:36:54 +00:00
PauloftheWest
60f85d7ec7
am f3ff3330: am 327b99e7: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
...
* commit 'f3ff33307b93a0ec31dce8d177205672bd4ad979':
Turning Bluetooth on will make the device discoverable.
2014-09-08 21:27:50 +00:00
Andres Morales
37df3745b4
am 68ccc9f9: am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
...
* commit '68ccc9f96cc5d07538f0201b93bf34d464a919df':
Fix issue where can't FR Volantis if OEM unlock is enabled
2014-09-08 21:27:36 +00:00
Andres Morales
a40a9a90b3
am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
...
* commit '4fc50daefa205c6a511459c2978c288df31dd505':
Fix issue where can't FR Volantis if OEM unlock is enabled
2014-09-08 21:19:29 +00:00
PauloftheWest
f3ff33307b
am 327b99e7: am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
...
* commit '327b99e74c24f4f2cafb5a618c6f7363f469b3fd':
Turning Bluetooth on will make the device discoverable.
2014-09-08 21:17:02 +00:00
PauloftheWest
9998f473ca
Disabled SIM Cards in Settings.
...
+ Multi-SIM has been punted out from the L release. This change disables
the SIM Cards UI while keeping the code base.
Bug: 16808006
Change-Id: I2bd7ad430a6309f3f2241cd26ec86268aa31b699
2014-09-08 14:16:30 -07:00
Andres Morales
68ccc9f96c
am 4fc50dae: Merge "Fix issue where can\'t FR Volantis if OEM unlock is enabled" into lmp-dev
...
* commit '4fc50daefa205c6a511459c2978c288df31dd505':
Fix issue where can't FR Volantis if OEM unlock is enabled
2014-09-08 21:16:28 +00:00
Andres Morales
4fc50daefa
Merge "Fix issue where can't FR Volantis if OEM unlock is enabled" into lmp-dev
2014-09-08 21:07:48 +00:00
PauloftheWest
327b99e74c
am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
...
* commit '5fe30ea841d0512c414059c814a0d1e0590b7eeb':
Turning Bluetooth on will make the device discoverable.
2014-09-08 21:06:27 +00:00
PauloftheWest
5c86c95513
am 5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
...
* commit '5fe30ea841d0512c414059c814a0d1e0590b7eeb':
Turning Bluetooth on will make the device discoverable.
2014-09-08 21:05:32 +00:00
PauloftheWest
5fe30ea841
Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
2014-09-08 21:00:11 +00:00
PauloftheWest
469c812878
Turning Bluetooth on will make the device discoverable.
...
Bug: 17368189
Change-Id: Ic526fb1ff9dcc15e6fe1db055a471cc570b6a2e1
2014-09-08 13:31:53 -07:00
Alan Viverette
a760eba5df
am fea2e6a0: am def61529: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
...
* commit 'fea2e6a0cd932d16ea030d5b526e8c2141d11fa3':
Use correct list index for search highlighting
2014-09-08 20:14:57 +00:00
Andres Morales
e6bf2a5609
Fix issue where can't FR Volantis if OEM unlock is enabled
...
Bug: 17426800
Change-Id: I02340d1ec4b80d9e3b05d35d36653c6ff4ff3232
2014-09-08 13:14:00 -07:00
Alan Viverette
fea2e6a0cd
am def61529: am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
...
* commit 'def6152913ef554ca0606135bcde90d1685f92c6':
Use correct list index for search highlighting
2014-09-08 20:05:12 +00:00
Alan Viverette
ce7c033720
am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
...
* commit '01f3a15e89f80d88ba8600a53f5722468fecd4c9':
Use correct list index for search highlighting
2014-09-08 19:57:07 +00:00
Alan Viverette
def6152913
am 01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
...
* commit '01f3a15e89f80d88ba8600a53f5722468fecd4c9':
Use correct list index for search highlighting
2014-09-08 19:57:07 +00:00
vandwalle
1603ff70c8
am 2aeb4c2d: am 2e3d6d38: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
...
* commit '2aeb4c2dfb5dc1b98a725362923adf0209085868':
prettify the wifi verbose logging string
2014-09-08 19:51:23 +00:00
Alan Viverette
01f3a15e89
Merge "Use correct list index for search highlighting" into lmp-dev
2014-09-08 19:47:54 +00:00
vandwalle
2aeb4c2dfb
am 2e3d6d38: am c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
...
* commit '2e3d6d38548d54d7936b4ad9362468707f8d5d89':
prettify the wifi verbose logging string
2014-09-08 19:45:16 +00:00
Alan Viverette
2fed4d4256
Use correct list index for search highlighting
...
BUG: 14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356
2014-09-08 12:40:59 -07:00
Alexandra Gherghina
2eaa925167
am 4ac6247c: am 572290d6: am edbfedf5: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
...
* commit '4ac6247c56514d76351e7ae7b2661507e8d01970':
Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
2014-09-08 19:38:06 +00:00