OSDN Git Service
PauloftheWest [Mon, 8 Sep 2014 21:05:32 +0000 (21:05 +0000)]
am
5fe30ea8: Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
* commit '
5fe30ea841d0512c414059c814a0d1e0590b7eeb':
Turning Bluetooth on will make the device discoverable.
PauloftheWest [Mon, 8 Sep 2014 21:00:11 +0000 (21:00 +0000)]
Merge "Turning Bluetooth on will make the device discoverable." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 21:45:40 +0000 (14:45 -0700)]
Turning Bluetooth on will make the device discoverable.
Bug:
17368189
Change-Id: Ic526fb1ff9dcc15e6fe1db055a471cc570b6a2e1
Alan Viverette [Mon, 8 Sep 2014 19:57:07 +0000 (19:57 +0000)]
am
01f3a15e: Merge "Use correct list index for search highlighting" into lmp-dev
* commit '
01f3a15e89f80d88ba8600a53f5722468fecd4c9':
Use correct list index for search highlighting
Alan Viverette [Mon, 8 Sep 2014 19:47:53 +0000 (19:47 +0000)]
Merge "Use correct list index for search highlighting" into lmp-dev
Alan Viverette [Mon, 8 Sep 2014 19:40:59 +0000 (12:40 -0700)]
Use correct list index for search highlighting
BUG:
14974443
Change-Id: Iad3d3efb2449fc61636c221bde92169293bf5356
vandwalle [Mon, 8 Sep 2014 19:32:26 +0000 (19:32 +0000)]
am
c187193c: Merge "prettify the wifi verbose logging string" into lmp-dev
* commit '
c187193c19cb8ad617ae85b81cb19a4d7d8fe16a':
prettify the wifi verbose logging string
vandwalle [Mon, 8 Sep 2014 19:22:39 +0000 (19:22 +0000)]
Merge "prettify the wifi verbose logging string" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 19:21:16 +0000 (19:21 +0000)]
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.
Alexandra Gherghina [Mon, 8 Sep 2014 19:13:09 +0000 (19:13 +0000)]
Merge "Splits out ACTION_MAIN intent filter for Settings and doesn't forward it." into lmp-dev
Carlos Valdivia [Mon, 8 Sep 2014 18:28:38 +0000 (18:28 +0000)]
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.
Carlos Valdivia [Mon, 8 Sep 2014 18:21:03 +0000 (18:21 +0000)]
Merge "SECURITY: Don't pass a usable Pending Intent to 3rd parties." into lmp-dev
Jim Miller [Mon, 8 Sep 2014 09:14:53 +0000 (09:14 +0000)]
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
Alexandra Gherghina [Mon, 8 Sep 2014 09:14:52 +0000 (09:14 +0000)]
am
80cd3732: Merge "Reset Settings task when using the user switcher" into lmp-dev
* commit '
80cd373263cf5fef41ad6a99317ecdcd68594734':
Reset Settings task when using the user switcher
Alexandra Gherghina [Mon, 8 Sep 2014 09:14:51 +0000 (09:14 +0000)]
am
dc3193ca: Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
* commit '
dc3193ca6364ac9215180d2adb02f5ab009abe00':
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
Jim Miller [Mon, 8 Sep 2014 08:26:14 +0000 (08:26 +0000)]
Merge "Fix problem where rotating the device doesn't launch TrustAgent pref" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 08:04:43 +0000 (08:04 +0000)]
Merge "Reset Settings task when using the user switcher" into lmp-dev
Alexandra Gherghina [Mon, 8 Sep 2014 08:03:38 +0000 (08:03 +0000)]
Merge "Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS" into lmp-dev
vandwalle [Fri, 5 Sep 2014 07:00:24 +0000 (00:00 -0700)]
prettify the wifi verbose logging string
Bug:
15168065
Change-Id: I1a3bd38ea6562b7b48c70db8fbd6940d4c96ceb4
Carlos Valdivia [Mon, 8 Sep 2014 00:45:58 +0000 (17:45 -0700)]
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
Amith Yamasani [Sun, 7 Sep 2014 23:05:42 +0000 (23:05 +0000)]
am
30c50b15: Use correct API for badging
* commit '
30c50b15d0d716567c71d590aa835dc4a27591d6':
Use correct API for badging
Amith Yamasani [Sun, 7 Sep 2014 22:38:09 +0000 (15:38 -0700)]
Use correct API for badging
Bug:
17414778
Change-Id: Ieb9890751c3071088b9f5aab48053e767f78bfe5
Jim Miller [Sat, 6 Sep 2014 01:48:18 +0000 (18:48 -0700)]
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
Fabrice Di Meglio [Fri, 5 Sep 2014 21:20:03 +0000 (21:20 +0000)]
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
Fabrice Di Meglio [Fri, 5 Sep 2014 21:12:51 +0000 (21:12 +0000)]
Merge "Fix bug #
15890188 wifi toggle on-off switch missing after skipping setup wizard" into lmp-dev
Fabrice Di Meglio [Fri, 5 Sep 2014 21:08:58 +0000 (14:08 -0700)]
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
PauloftheWest [Fri, 5 Sep 2014 21:01:09 +0000 (21:01 +0000)]
am
c7fafa25: Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
* commit '
c7fafa25c20bfdebe765227bbc135b4b4ec89be3':
Material design updates for Bluetooth Settings dialog.
PauloftheWest [Fri, 5 Sep 2014 20:48:56 +0000 (20:48 +0000)]
Merge "Material design updates for Bluetooth Settings dialog." into lmp-dev
Barnaby James [Fri, 5 Sep 2014 20:09:24 +0000 (20:09 +0000)]
am
3c6f7a33: Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
* commit '
3c6f7a33398ab610ec1c734360be092db090fb50':
Remove intent filter for Airplane mode voice activity.
Barnaby James [Fri, 5 Sep 2014 19:59:20 +0000 (19:59 +0000)]
Merge "Remove intent filter for Airplane mode voice activity." into lmp-dev
Amith Yamasani [Fri, 5 Sep 2014 19:53:27 +0000 (19:53 +0000)]
am
91648629: Merge "Follow API change for method name" into lmp-dev
* commit '
9164862936dc439045d35670909385defb281395':
Follow API change for method name
Amith Yamasani [Fri, 5 Sep 2014 19:44:22 +0000 (19:44 +0000)]
Merge "Follow API change for method name" into lmp-dev
PauloftheWest [Sun, 24 Aug 2014 18:10:16 +0000 (11:10 -0700)]
Material design updates for Bluetooth Settings dialog.
Bug:
17140512
Change-Id: I93dd89c3f12d8abe2041dd68faef8daf981252fb
Amith Yamasani [Fri, 5 Sep 2014 17:23:04 +0000 (10:23 -0700)]
Follow API change for method name
Bug:
17389920
Change-Id: I5c5bdacd863f84c503e7a16dc611feda36bc462f
Svetoslav [Fri, 5 Sep 2014 17:17:51 +0000 (17:17 +0000)]
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.
Svetoslav [Fri, 5 Sep 2014 17:17:50 +0000 (17:17 +0000)]
am
527ecccc: Merge "Update Settings due to API changes." into lmp-dev
* commit '
527ecccce879471dd0096b72a4be584d35fe32d0':
Update Settings due to API changes.
Svetoslav [Fri, 5 Sep 2014 17:10:05 +0000 (17:10 +0000)]
Merge "Fix an occasional crash in print job state fragment in Settings." into lmp-dev
Svetoslav [Fri, 5 Sep 2014 17:09:14 +0000 (17:09 +0000)]
Merge "Update Settings due to API changes." into lmp-dev
Jorim Jaggi [Fri, 5 Sep 2014 16:15:01 +0000 (16:15 +0000)]
am
f7cdbc3a: Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
* commit '
f7cdbc3a68fc5a900b3d2f2d910b2990410737db':
Remove weird divider from confirm_lock_pattern
Jorim Jaggi [Fri, 5 Sep 2014 16:06:26 +0000 (16:06 +0000)]
Merge "Remove weird divider from confirm_lock_pattern" into lmp-dev
Jorim Jaggi [Fri, 5 Sep 2014 15:56:17 +0000 (17:56 +0200)]
Remove weird divider from confirm_lock_pattern
Bug:
16686614
Change-Id: I5b62a220181e384328a3b27e05a218a5984e23d1
Alexandra Gherghina [Fri, 5 Sep 2014 15:54:03 +0000 (15:54 +0000)]
am
51712241: Fix typo in intent filter
* commit '
51712241f50f95d9bf8e83428ce5428f7f476431':
Fix typo in intent filter
Alexandra Gherghina [Wed, 3 Sep 2014 13:17:35 +0000 (14:17 +0100)]
Obeying Settings.EXTRA_AUTHORITIES extra for SYNC_SETTINGS
Bug:
17188306
Change-Id: I00481c6c4f346b6f4037554296735f4323cbbcfb
Alexandra Gherghina [Fri, 5 Sep 2014 15:32:14 +0000 (16:32 +0100)]
Fix typo in intent filter
Bug:
16647771
Change-Id: I44c46a92fee23f78591677f7ea399fd963b4df16
Alexandra Gherghina [Fri, 5 Sep 2014 15:29:28 +0000 (15:29 +0000)]
am
9b6ab158: Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
* commit '
9b6ab1584cb1087689acacf95c0ed5c2f58a2f15':
Update Settings cross-profile intent filters upon OTA
Dan Sandler [Fri, 5 Sep 2014 15:29:28 +0000 (15:29 +0000)]
am
8aed3e3f: Only fetch titles of ringtones coming from the MediaStore.
* commit '
8aed3e3f9e0bbb690866110581bde5c94e1fb490':
Only fetch titles of ringtones coming from the MediaStore.
Alexandra Gherghina [Fri, 5 Sep 2014 15:26:58 +0000 (15:26 +0000)]
Merge "Update Settings cross-profile intent filters upon OTA" into lmp-dev
Alexandra Gherghina [Fri, 5 Sep 2014 14:27:03 +0000 (15:27 +0100)]
Update Settings cross-profile intent filters upon OTA
Bug:
16647771
Change-Id: I2e23d26b425bde5339221851ac54aab760dc1cc9
Dan Sandler [Thu, 4 Sep 2014 00:19:28 +0000 (02:19 +0200)]
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
Alexandra Gherghina [Fri, 5 Sep 2014 10:42:51 +0000 (11:42 +0100)]
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
Alexandra Gherghina [Thu, 4 Sep 2014 15:52:53 +0000 (16:52 +0100)]
Reset Settings task when using the user switcher
Bug:
17294618
Change-Id: I8bd9d7226e52017938828f3bc195cc995fe80b20
Barnaby James [Thu, 4 Sep 2014 22:33:23 +0000 (15:33 -0700)]
Remove intent filter for Airplane mode voice activity.
Change-Id: I7f217350fdb51c2a88c92777d33c021dd32cd07e
Bug:
17398731
Wink Saville [Fri, 5 Sep 2014 03:50:26 +0000 (03:50 +0000)]
am
aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit '
aa188b539be9e5284febc141b6b7f06c0faef5b8':
More cleanup prior to unhiding
Wink Saville [Fri, 5 Sep 2014 03:40:35 +0000 (03:40 +0000)]
Merge "More cleanup prior to unhiding" into lmp-dev
Svetoslav [Fri, 5 Sep 2014 02:54:15 +0000 (19:54 -0700)]
Fix an occasional crash in print job state fragment in Settings.
There is a NPE in the print settings if the following occurs:
We open the print job state UI in settings for an ongoing print
job (now we have action bar buttons for cancel and restart);
now the print job gets completed and we update the UI and
since the print job is not longer present we nullify the current
job reference and finish the activity. But since activity
is not finished immediately there is an opportunity for the
user to click on the action bar options which results in NPE.
The fix is to not update the print job instance in the update
UI method if the job is not available, i.e. the update method
does not mutate state if the job is no longer present, as we
are finishing and performing an operation on a finished job will
have no effect.
bug:
17387134
Change-Id: I501ed1e05b8b70584b3299a16e93ead5ab7f155f
Svetoslav [Thu, 4 Sep 2014 23:51:43 +0000 (16:51 -0700)]
Update Settings due to API changes.
bug:
17390424
Change-Id: I25dfa40cc5109260d48dbe5f33274b162912d059
Wink Saville [Thu, 4 Sep 2014 22:36:49 +0000 (15:36 -0700)]
More cleanup prior to unhiding
Rename public SubInfoRecord instance variables
Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
Fabrice Di Meglio [Thu, 4 Sep 2014 22:20:55 +0000 (22:20 +0000)]
am
0535ed55: Merge "Fix bug #
17393417 Developer Options are not indexed after activating them" into lmp-dev
* commit '
0535ed559eca51cce107309d05a3858ae48f5f20':
Fix bug #
17393417 Developer Options are not indexed after activating them
Fabrice Di Meglio [Thu, 4 Sep 2014 22:09:18 +0000 (22:09 +0000)]
Merge "Fix bug #
17393417 Developer Options are not indexed after activating them" into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 22:04:23 +0000 (15:04 -0700)]
Fix bug #
17393417 Developer Options are not indexed after activating them
- add forceUpdate field copy in the UpdateData copy constructor
Change-Id: I245ce76bf9798c359219e153d2af9d08e7e11903
PauloftheWest [Thu, 4 Sep 2014 21:33:16 +0000 (21:33 +0000)]
am
4a1b7b5f: Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
* commit '
4a1b7b5f942833937bd0e24082bb0dfff9e6ddf2':
Bug fix: Toggling Bluetooth off then on will now initiate a scan.
PauloftheWest [Thu, 4 Sep 2014 21:25:04 +0000 (21:25 +0000)]
Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 21:10:24 +0000 (14:10 -0700)]
Bug fix: Toggling Bluetooth off then on will now initiate a scan.
Bug:
17380015
Change-Id: Ie07d9a4f737df32aba7e400b028144f7a81cb37e
Chris Wren [Thu, 4 Sep 2014 21:04:07 +0000 (21:04 +0000)]
am
0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
0a59607e5eea0e94542edb8de533ccb8e258536b':
Implement per-app sensitivity settings toggle.
Chris Wren [Thu, 4 Sep 2014 20:38:39 +0000 (20:38 +0000)]
Merge "Implement per-app sensitivity settings toggle." into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 20:17:10 +0000 (20:17 +0000)]
am
ed1175cf: Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
* commit '
ed1175cf0c6759671b40caa2ca5630e8325d97d1':
Increase the delay for the Search result Ripple effect to happen
Fabrice Di Meglio [Thu, 4 Sep 2014 20:06:22 +0000 (20:06 +0000)]
Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev
Fabrice Di Meglio [Thu, 4 Sep 2014 20:01:55 +0000 (13:01 -0700)]
Increase the delay for the Search result Ripple effect to happen
- will actually make the Ripple look better and a bit longer
(it was showing and disappearing a bit too fast)
See bug: #
14974443
Change-Id: I7a0354c679cfa8d9596bcb957c922b8dcf88f0e3
Andres Morales [Thu, 4 Sep 2014 19:42:33 +0000 (19:42 +0000)]
am
5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev
* commit '
5c9a3b0d87ef4dc1b82edac191fbc6e8101aaad6':
New black drawables for tap and pay
Andres Morales [Thu, 4 Sep 2014 19:42:32 +0000 (19:42 +0000)]
am
1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit '
1c09186d64f9f4188d0eccc5170f4bf4bbcf824d':
Fix issue with wifi passwords >16 chars
Andres Morales [Thu, 4 Sep 2014 19:31:56 +0000 (19:31 +0000)]
Merge "New black drawables for tap and pay" into lmp-dev
Andres Morales [Thu, 4 Sep 2014 19:31:47 +0000 (19:31 +0000)]
Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
Andres Morales [Thu, 4 Sep 2014 19:11:26 +0000 (12:11 -0700)]
New black drawables for tap and pay
Much more visible than the white ones on a white bg
Bug:
17155785
Change-Id: I1c135ca819ee6734289777b3e694c7548777cb84
Baligh Uddin [Thu, 4 Sep 2014 18:49:53 +0000 (18:49 +0000)]
am
87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '
87c7cec8ea12dba610dcc4ccfe9896470e45f229':
Import translations. DO NOT MERGE
Andres Morales [Thu, 4 Sep 2014 18:42:53 +0000 (11:42 -0700)]
Fix issue with wifi passwords >16 chars
Wasn't calculating their length in hex properly
Bug:
17369745
Change-Id: I7652c10a2e0704877ad113fcbc04007845a862e3
Baligh Uddin [Thu, 4 Sep 2014 18:34:46 +0000 (18:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-dev
Baligh Uddin [Thu, 4 Sep 2014 18:34:44 +0000 (18:34 +0000)]
Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev
PauloftheWest [Thu, 4 Sep 2014 18:02:06 +0000 (18:02 +0000)]
am
0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '
0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7':
Material theme updates for Bluetooth Device picker.
PauloftheWest [Thu, 4 Sep 2014 17:50:00 +0000 (17:50 +0000)]
Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 17:49:48 +0000 (17:49 +0000)]
am
92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit '
92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
Fix the truncating of Bluetooth icons.
PauloftheWest [Thu, 4 Sep 2014 17:34:17 +0000 (17:34 +0000)]
Merge "Fix the truncating of Bluetooth icons." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 17:14:19 +0000 (10:14 -0700)]
Material theme updates for Bluetooth Device picker.
Bug:
17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
Fabrice Di Meglio [Thu, 4 Sep 2014 17:10:59 +0000 (17:10 +0000)]
am
5a8a75d9: Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
* commit '
5a8a75d98bcbd06e6ff18c79e5852d4ad833bbc6':
Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings
Fabrice Di Meglio [Thu, 4 Sep 2014 17:01:15 +0000 (17:01 +0000)]
Merge "Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev
Chris Wren [Thu, 4 Sep 2014 15:20:05 +0000 (15:20 +0000)]
Implement per-app sensitivity settings toggle.
Change-Id: Iaa1de63b720bf93bdf432117604740e509fe3ab0
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug:
16324353
PauloftheWest [Thu, 4 Sep 2014 15:27:32 +0000 (08:27 -0700)]
Fix the truncating of Bluetooth icons.
Bug:
17347150
Change-Id: Iad6bec51bf9327ee0c6752ddaa161aec3b4ff590
Chris Wren [Thu, 4 Sep 2014 13:57:30 +0000 (13:57 +0000)]
am
ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit '
ee846f8828f9e2988e646af85da55f3d51c02f27':
missing dep. Revert "Implement per-app sensitivity settings toggle."
Chris Wren [Thu, 4 Sep 2014 13:41:08 +0000 (13:41 +0000)]
missing dep. Revert "Implement per-app sensitivity settings toggle."
This reverts commit
56131de7412edaab9f3e5834fe3888ac8588ec79.
Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
Chris Wren [Thu, 4 Sep 2014 13:46:49 +0000 (13:46 +0000)]
am
77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '
77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
Implement per-app sensitivity settings toggle.
Chris Wren [Thu, 4 Sep 2014 13:40:04 +0000 (13:40 +0000)]
Merge "Implement per-app sensitivity settings toggle." into lmp-dev
Dan Sandler [Thu, 4 Sep 2014 13:25:34 +0000 (13:25 +0000)]
am
feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit '
feec34cec83b87f0c9e88b0d5883bd65170398bf':
Don't block notifications from system packages.
Dan Sandler [Thu, 4 Sep 2014 13:15:47 +0000 (13:15 +0000)]
Merge "Don't block notifications from system packages." into lmp-dev
PauloftheWest [Thu, 4 Sep 2014 12:55:11 +0000 (12:55 +0000)]
am
e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit '
e1a164bf9be2d32da3c6154eca14230677a49283':
Aligned buttons on the Wi-Fi Assistant Card.
PauloftheWest [Thu, 4 Sep 2014 12:50:03 +0000 (12:50 +0000)]
Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:45:09 +0000 (12:45 +0000)]
am
c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
* commit '
c91d2cd082b5b682bb957085862b54431485f43a':
Put VPN settings under primary profile control
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:38:48 +0000 (12:38 +0000)]
Merge "Put VPN settings under primary profile control" into lmp-dev
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 12:05:48 +0000 (12:05 +0000)]
am
1e0ea452: Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
* commit '
1e0ea452635fb3e8fbac733567489a38ee3ed635':
Start activity for the correct user in Settings > Data Usage
Zoltan Szatmary-Ban [Thu, 4 Sep 2014 11:55:48 +0000 (11:55 +0000)]
Merge "Start activity for the correct user in Settings > Data Usage" into lmp-dev
Alexandra Gherghina [Thu, 4 Sep 2014 09:36:20 +0000 (09:36 +0000)]
am
9dce0791: Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev
* commit '
9dce0791f8e9a0e91eabe61589c9a9c5f695f7b2':
Code clean-ups following moving the managed profile under accounts
Alexandra Gherghina [Thu, 4 Sep 2014 09:26:02 +0000 (09:26 +0000)]
Merge "Code clean-ups following moving the managed profile under accounts" into lmp-dev