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
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
5c0d0729b1
Merge "Start cleaning up percentage formatting in Settings." into lmp-dev
2014-09-08 23:26:20 +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
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
bec89d797b
Merge "Fixed scrolling on the Wi-Fi Settings Dialog." into lmp-dev
2014-09-08 22:34:51 +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
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
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
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
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
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
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
01f3a15e89
Merge "Use correct list index for search highlighting" into lmp-dev
2014-09-08 19:47:54 +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
vandwalle
4d5ddf0cce
am c187193c
: Merge "prettify the wifi verbose logging string" into lmp-dev
...
* commit 'c187193c19cb8ad617ae85b81cb19a4d7d8fe16a':
prettify the wifi verbose logging string
2014-09-08 19:32:26 +00:00
vandwalle
c187193c19
Merge "prettify the wifi verbose logging string" into lmp-dev
2014-09-08 19:22:40 +00:00
Alexandra Gherghina
c210a3f2c6
am edbfedf5
: Merge "Splits out ACTION_MAIN intent filter for Settings and doesn\'t forward it." into lmp-dev
...
* commit 'edbfedf58fe2cb636017cc6d16da654525a4362f':
Splits out ACTION_MAIN intent filter for Settings and doesn't forward it.
2014-09-08 19:21:16 +00:00
Alexandra Gherghina
edbfedf58f
Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev
2014-09-08 19:13:10 +00:00
Carlos Valdivia
b38b1b9ed6
am 690ce1b3
: Merge "SECURITY: Don\'t pass a usable Pending Intent to 3rd parties." into lmp-dev
...
* commit '690ce1b32546c899fcf07f9d6552b04bb6fb7b2e':
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
2014-09-08 18:28:38 +00:00
Carlos Valdivia
690ce1b325
Merge "SECURITY: Don't pass a usable Pending Intent to 3rd parties." into lmp-dev
2014-09-08 18:21:03 +00:00
Jim Miller
75c782bf71
am 1f389c19
: Merge "Fix problem where rotating the device doesn\'t launch TrustAgent pref" into lmp-dev
...
* commit '1f389c1996d754142c52c947105af4ec2db84f5c':
Fix problem where rotating the device doesn't launch TrustAgent pref
2014-09-08 09:14:53 +00:00
Alexandra Gherghina
ba89f50ae7
am 80cd3732
: Merge "Reset Settings task when using the user switcher" into lmp-dev
...
* commit '80cd373263cf5fef41ad6a99317ecdcd68594734':
Reset Settings task when using the user switcher
2014-09-08 09:14:52 +00:00
Alexandra Gherghina
70ad4ffd05
am dc3193ca
: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
...
* commit 'dc3193ca6364ac9215180d2adb02f5ab009abe00':
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
2014-09-08 09:14:51 +00:00
Jim Miller
1f389c1996
Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev
2014-09-08 08:26:14 +00:00
Alexandra Gherghina
80cd373263
Merge "Reset Settings task when using the user switcher" into lmp-dev
2014-09-08 08:04:44 +00:00
Alexandra Gherghina
dc3193ca63
Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
2014-09-08 08:03:40 +00:00
vandwalle
b6854480d4
prettify the wifi verbose logging string
...
Bug:15168065
Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
2014-09-07 22:03:19 -07:00
Carlos Valdivia
f5d3e74ecc
SECURITY: Don't pass a usable Pending Intent to 3rd parties.
...
Unfortunately the Settings app has super powers. We shouldn't let
untrusted 3rd party authenticators re-purpose those powers to their own
nefarious ends. This means that we shouldn't pass along PendingIntents
that can have addressing information (component, action, category)
filled in by third parties.
Bug: 17356824
Change-Id: I397d26c5f465ddfb0e58bbc66cd44756e58cc507
2014-09-07 17:45:58 -07:00
Amith Yamasani
45308ef25d
am 30c50b15
: Use correct API for badging
...
* commit '30c50b15d0d716567c71d590aa835dc4a27591d6':
Use correct API for badging
2014-09-07 23:05:42 +00:00
Amith Yamasani
30c50b15d0
Use correct API for badging
...
Bug: 17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
2014-09-07 15:38:09 -07:00
Jim Miller
250b9bee68
Fix problem where rotating the device doesn't launch TrustAgent pref
...
This fixes a bug where the TrustAgent intent was being lost when
the device configurtion changes. It used to depend on a view that
gets recreated. Instead, we persist the actual launch intent
which works across activity restarts.
Fixes bug 17040470
Change-Id: Ia1c93867254cfdc27683a767cf41fe74dbb97db0
2014-09-07 14:30:38 -07:00
Fabrice Di Meglio
17f556c708
am b5cc0134
: Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
...
* commit 'b5cc01342ea3930ae3bc7592e13c4b5f6f4c646d':
Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard
2014-09-05 21:20:03 +00:00
Fabrice Di Meglio
b5cc01342e
Merge "Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
2014-09-05 21:12:51 +00:00
Fabrice Di Meglio
92239ed799
Fix bug #15890188 wifi toggle on-off switch missing after skipping setup wizard
...
- remove any reference to the Switch and use the SwitchBar API instead
- set the initial state of the SwitchBar depending on the WifiManager
Change-Id: I556bf8a007892c057edf7c6c144f71b2dcfe4f99
2014-09-05 14:08:58 -07:00
PauloftheWest
5437b488cb
am c7fafa25
: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
...
* commit 'c7fafa25c20bfdebe765227bbc135b4b4ec89be3':
Material design updates for Bluetooth Settings dialog.
2014-09-05 21:01:09 +00:00
PauloftheWest
c7fafa25c2
Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
2014-09-05 20:48:56 +00:00
Barnaby James
1299446dee
am 3c6f7a33
: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
...
* commit '3c6f7a33398ab610ec1c734360be092db090fb50':
Remove intent filter for Airplane mode voice activity.
2014-09-05 20:09:24 +00:00
Barnaby James
3c6f7a3339
Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
2014-09-05 19:59:21 +00:00
Amith Yamasani
ba790ca3ac
am 91648629
: Merge "Follow API change for method name" into lmp-dev
...
* commit '9164862936dc439045d35670909385defb281395':
Follow API change for method name
2014-09-05 19:53:27 +00:00
Amith Yamasani
9164862936
Merge "Follow API change for method name" into lmp-dev
2014-09-05 19:44:22 +00:00
PauloftheWest
8677d04512
Material design updates for Bluetooth Settings dialog.
...
Bug: 17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
2014-09-05 10:29:17 -07:00