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
Amith Yamasani
375baea456
Follow API change for method name
...
Bug: 17389920
Change-Id: I5c5bdacd863f84c503e7a16dc611feda36bc462f
2014-09-05 10:23:04 -07:00
Svetoslav
9b8912dbee
am fd3a3d79
: Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
...
* commit 'fd3a3d79290799ec80c3bc9cfe965280428a8077':
Fix an occasional crash in print job state fragment in Settings.
2014-09-05 17:17:51 +00:00
Svetoslav
3c0385e465
am 527ecccc
: Merge "Update Settings due to API changes." into lmp-dev
...
* commit '527ecccce879471dd0096b72a4be584d35fe32d0':
Update Settings due to API changes.
2014-09-05 17:17:50 +00:00
Svetoslav
fd3a3d7929
Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
2014-09-05 17:10:06 +00:00
Svetoslav
527ecccce8
Merge "Update Settings due to API changes." into lmp-dev
2014-09-05 17:09:15 +00:00
Jorim Jaggi
60b7e88289
am f7cdbc3a
: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
...
* commit 'f7cdbc3a68fc5a900b3d2f2d910b2990410737db':
Remove weird divider from confirm_lock_pattern
2014-09-05 16:15:01 +00:00
Jorim Jaggi
f7cdbc3a68
Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
2014-09-05 16:06:26 +00:00
Jorim Jaggi
d3a2ec0cbb
Remove weird divider from confirm_lock_pattern
...
Bug: 16686614
Change-Id: I5b62a220181e384328a3b27e05a218a5984e23d1
2014-09-05 17:56:17 +02:00
Alexandra Gherghina
da1e8c75fb
am 51712241
: Fix typo in intent filter
...
* commit '51712241f50f95d9bf8e83428ce5428f7f476431':
Fix typo in intent filter
2014-09-05 15:54:03 +00:00
Alexandra Gherghina
af0d9540c2
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
...
Bug: 17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
2014-09-05 16:46:54 +01:00
Alexandra Gherghina
51712241f5
Fix typo in intent filter
...
Bug: 16647771
Change-Id: I44c46a92fee23f78591677f7ea399fd963b4df16
2014-09-05 16:32:15 +01:00
Alexandra Gherghina
8378516b0b
am 9b6ab158
: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
...
* commit '9b6ab1584cb1087689acacf95c0ed5c2f58a2f15':
Update Settings cross-profile intent filters upon OTA
2014-09-05 15:29:28 +00:00
Dan Sandler
6f0507add7
am 8aed3e3f
: Only fetch titles of ringtones coming from the MediaStore.
...
* commit '8aed3e3f9e0bbb690866110581bde5c94e1fb490':
Only fetch titles of ringtones coming from the MediaStore.
2014-09-05 15:29:28 +00:00
Alexandra Gherghina
9b6ab1584c
Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
2014-09-05 15:26:59 +00:00
Alexandra Gherghina
c4916832d0
Update Settings cross-profile intent filters upon OTA
...
Bug: 16647771
Change-Id: I2e23d26b425bde5339221851ac54aab760dc1cc9
2014-09-05 15:27:04 +01:00
Dan Sandler
8aed3e3f9e
Only fetch titles of ringtones coming from the MediaStore.
...
As a fallback we attempt to get DISPLAY_NAME from the
provider. Any other URIs probably don't have titles.
Bug: 14093281
Change-Id: I39adbad52ef6dcc1686cbc738457b55c33948bd6
2014-09-05 13:59:31 +00:00
Alexandra Gherghina
05dec7fc69
Splits out ACTION_MAIN intent filter for Settings and doesn't
...
forward it.
This is required so that general queries for ACTION_MAIN apps
do not get stuck with the IntentForwarderActivity.
Bug: 17053933
Change-Id: Ie04e2b29f2467e14fd82d27c1e94d93eda90f4c1
2014-09-05 14:58:04 +01:00
Alexandra Gherghina
56645002b2
Reset Settings task when using the user switcher
...
Bug: 17294618
Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
2014-09-05 11:39:39 +01:00
Barnaby James
cec8e2fe78
Remove intent filter for Airplane mode voice activity.
...
Change-Id: I7f217350fdb51c2a88c92777d33c021dd32cd07e
Bug: 17398731
2014-09-04 21:59:09 -07:00
Wink Saville
0e559d532c
am aa188b53
: Merge "More cleanup prior to unhiding" into lmp-dev
...
* commit 'aa188b539be9e5284febc141b6b7f06c0faef5b8':
More cleanup prior to unhiding
2014-09-05 03:50:26 +00:00
Wink Saville
aa188b539b
Merge "More cleanup prior to unhiding" into lmp-dev
2014-09-05 03:40:35 +00:00