Commit Graph

15303 Commits

Author SHA1 Message Date
Jorim Jaggi
c4dbac0613 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:14:45 +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
3b17ac2007 am 51712241: Fix typo in intent filter
* commit '51712241f50f95d9bf8e83428ce5428f7f476431':
  Fix typo in intent filter
2014-09-05 15:53:32 +00:00
Alexandra Gherghina
51712241f5 Fix typo in intent filter
Bug: 16647771
Change-Id: I44c46a92fee23f78591677f7ea399fd963b4df16
2014-09-05 16:32:15 +01:00
Alexandra Gherghina
5af932e007 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:17 +00:00
Dan Sandler
f4a34a1d3b 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:16 +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
Wink Saville
de838b0001 am aa188b53: Merge "More cleanup prior to unhiding" into lmp-dev
* commit 'aa188b539be9e5284febc141b6b7f06c0faef5b8':
  More cleanup prior to unhiding
2014-09-05 03:49:53 +00:00
Wink Saville
aa188b539b Merge "More cleanup prior to unhiding" into lmp-dev 2014-09-05 03:40:35 +00:00
Wink Saville
78b36ba35e More cleanup prior to unhiding
Rename public SubInfoRecord instance variables

Change-Id: I25a56d779c63a3f483d7a43c5c123404bf489fa3
2014-09-04 15:36:49 -07:00
Fabrice Di Meglio
e7b63681b2 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
2014-09-04 22:20:53 +00:00
Fabrice Di Meglio
0535ed559e Merge "Fix bug #17393417 Developer Options are not indexed after activating them" into lmp-dev 2014-09-04 22:09:19 +00:00
Fabrice Di Meglio
f91b4dbc33 Fix bug #17393417 Developer Options are not indexed after activating them
- add forceUpdate field copy in the UpdateData copy constructor

Change-Id: I245ce76bf9798c359219e153d2af9d08e7e11903
2014-09-04 15:04:23 -07:00
PauloftheWest
f4040b3cd1 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.
2014-09-04 21:33:08 +00:00
PauloftheWest
4a1b7b5f94 Merge "Bug fix: Toggling Bluetooth off then on will now initiate a scan." into lmp-dev 2014-09-04 21:25:05 +00:00
PauloftheWest
6a1a6a943a Bug fix: Toggling Bluetooth off then on will now initiate a scan.
Bug: 17380015
Change-Id: Ie07d9a4f737df32aba7e400b028144f7a81cb37e
2014-09-04 14:10:24 -07:00
Chris Wren
15230e79b4 am 0a59607e: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '0a59607e5eea0e94542edb8de533ccb8e258536b':
  Implement per-app sensitivity settings toggle.
2014-09-04 21:07:35 +00:00
Chris Wren
0a59607e5e Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 20:38:40 +00:00
Fabrice Di Meglio
bb93da541f 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
2014-09-04 20:17:04 +00:00
Fabrice Di Meglio
ed1175cf0c Merge "Increase the delay for the Search result Ripple effect to happen" into lmp-dev 2014-09-04 20:06:23 +00:00
Fabrice Di Meglio
eced780ff5 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
2014-09-04 13:04:56 -07:00
Andres Morales
13a0e67a01 am 5c9a3b0d: Merge "New black drawables for tap and pay" into lmp-dev
* commit '5c9a3b0d87ef4dc1b82edac191fbc6e8101aaad6':
  New black drawables for tap and pay
2014-09-04 19:43:29 +00:00
Andres Morales
20a5bf285a am 1c09186d: Merge "Fix issue with wifi passwords >16 chars" into lmp-dev
* commit '1c09186d64f9f4188d0eccc5170f4bf4bbcf824d':
  Fix issue with wifi passwords >16 chars
2014-09-04 19:43:28 +00:00
Andres Morales
5c9a3b0d87 Merge "New black drawables for tap and pay" into lmp-dev 2014-09-04 19:31:57 +00:00
Andres Morales
1c09186d64 Merge "Fix issue with wifi passwords >16 chars" into lmp-dev 2014-09-04 19:31:48 +00:00
Andres Morales
7c5d31f8e7 New black drawables for tap and pay
Much more visible than the white ones on a white bg

Bug:17155785
Change-Id: I1c135ca819ee6734289777b3e694c7548777cb84
2014-09-04 12:11:26 -07:00
Baligh Uddin
7a826fc99b am 87c7cec8: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-dev
* commit '87c7cec8ea12dba610dcc4ccfe9896470e45f229':
  Import translations. DO NOT MERGE
2014-09-04 18:50:09 +00:00
Andres Morales
3902c785b0 Fix issue with wifi passwords >16 chars
Wasn't calculating their length in hex properly

Bug:17369745
Change-Id: I7652c10a2e0704877ad113fcbc04007845a862e3
2014-09-04 11:42:53 -07:00
Baligh Uddin
87c7cec8ea Merge "Import translations. DO NOT MERGE" into lmp-dev 2014-09-04 18:34:46 +00:00
PauloftheWest
8c5140c0ab am 0e73c521: Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
* commit '0e73c521bd9f4acaa6d22b5768ace39d4ce8fec7':
  Material theme updates for Bluetooth Device picker.
2014-09-04 18:00:57 +00:00
PauloftheWest
86fa459e98 am 92de681e: Merge "Fix the truncating of Bluetooth icons." into lmp-dev
* commit '92de681ec31315bc0fd3deacf8166b2ba45cdbb1':
  Fix the truncating of Bluetooth icons.
2014-09-04 17:51:01 +00:00
PauloftheWest
0e73c521bd Merge "Material theme updates for Bluetooth Device picker." into lmp-dev 2014-09-04 17:50:00 +00:00
PauloftheWest
92de681ec3 Merge "Fix the truncating of Bluetooth icons." into lmp-dev 2014-09-04 17:34:17 +00:00
PauloftheWest
e32220eedc Material theme updates for Bluetooth Device picker.
Bug: 17303554
Change-Id: I6eba8654ffb95ff6a9e31c43f8e2ba93df79280d
2014-09-04 10:16:09 -07:00
Fabrice Di Meglio
b876576a49 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
2014-09-04 17:11:21 +00:00
Fabrice Di Meglio
5a8a75d98b Merge "Fix bug #17358371 Wallpaper attributions in "Legal Information" section of Settings" into lmp-dev 2014-09-04 17:01:16 +00:00
Chris Wren
3d903185c7 Implement per-app sensitivity settings toggle.
Change-Id: Iaa1de63b720bf93bdf432117604740e509fe3ab0
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug: 16324353
2014-09-04 11:37:18 -04:00
PauloftheWest
a7aef13fbb Fix the truncating of Bluetooth icons.
Bug: 17347150
Change-Id: Iad6bec51bf9327ee0c6752ddaa161aec3b4ff590
2014-09-04 08:27:32 -07:00
Chris Wren
0388a7fa54 am ee846f88: missing dep. Revert "Implement per-app sensitivity settings toggle."
* commit 'ee846f8828f9e2988e646af85da55f3d51c02f27':
  missing dep.  Revert "Implement per-app sensitivity settings toggle."
2014-09-04 13:57:36 +00:00
Chris Wren
ee846f8828 missing dep. Revert "Implement per-app sensitivity settings toggle."
This reverts commit 56131de741.

Change-Id: I409dbf4495f95ff37d2a47168cdbc4131a80d42e
2014-09-04 15:49:58 +02:00
Chris Wren
264e942cc2 am 77fdc93b: Merge "Implement per-app sensitivity settings toggle." into lmp-dev
* commit '77fdc93bcdb3ae60fe617012c6c52aa274ed331e':
  Implement per-app sensitivity settings toggle.
2014-09-04 13:46:52 +00:00
Chris Wren
77fdc93bcd Merge "Implement per-app sensitivity settings toggle." into lmp-dev 2014-09-04 13:40:04 +00:00
Dan Sandler
bb7d22fb6e am feec34ce: Merge "Don\'t block notifications from system packages." into lmp-dev
* commit 'feec34cec83b87f0c9e88b0d5883bd65170398bf':
  Don't block notifications from system packages.
2014-09-04 13:25:56 +00:00
Dan Sandler
feec34cec8 Merge "Don't block notifications from system packages." into lmp-dev 2014-09-04 13:15:48 +00:00
PauloftheWest
19ae38adf0 am e1a164bf: Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev
* commit 'e1a164bf9be2d32da3c6154eca14230677a49283':
  Aligned buttons on the Wi-Fi Assistant Card.
2014-09-04 12:55:26 +00:00
PauloftheWest
e1a164bf9b Merge "Aligned buttons on the Wi-Fi Assistant Card." into lmp-dev 2014-09-04 12:50:04 +00:00
Zoltan Szatmary-Ban
c465867bde am c91d2cd0: Merge "Put VPN settings under primary profile control" into lmp-dev
* commit 'c91d2cd082b5b682bb957085862b54431485f43a':
  Put VPN settings under primary profile control
2014-09-04 12:45:17 +00:00