OSDN Git Service
Jorim Jaggi [Fri, 5 Sep 2014 16:14:45 +0000 (16:14 +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:53:32 +0000 (15:53 +0000)]
am
51712241: Fix typo in intent filter
* commit '
51712241f50f95d9bf8e83428ce5428f7f476431':
Fix typo in intent filter
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:17 +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:16 +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
Wink Saville [Fri, 5 Sep 2014 03:49:53 +0000 (03:49 +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
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:53 +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:08 +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:07:35 +0000 (21:07 +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:04 +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:43:29 +0000 (19:43 +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:43:28 +0000 (19:43 +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:50:09 +0000 (18:50 +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
PauloftheWest [Thu, 4 Sep 2014 18:00:57 +0000 (18:00 +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:51:01 +0000 (17:51 +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:50:00 +0000 (17:50 +0000)]
Merge "Material theme updates for Bluetooth Device picker." into lmp-dev
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:11:21 +0000 (17:11 +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:36 +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:52 +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:56 +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:26 +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:17 +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:06:15 +0000 (12:06 +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:02 +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
Baligh Uddin [Thu, 4 Sep 2014 06:11:31 +0000 (23:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I46cb4475ee4c31d33f11c15cc33f6a4a2c045bc7
Auto-generated-cl: translation import
Fabrice Di Meglio [Thu, 4 Sep 2014 01:25:43 +0000 (18:25 -0700)]
Fix bug #
17358371 Wallpaper attributions in "Legal Information" section of Settings
- add the requested infos
Change-Id: Ib2d07f79d8c2e2c85032d7ec595055254437ba19
PauloftheWest [Thu, 28 Aug 2014 21:10:36 +0000 (14:10 -0700)]
Aligned buttons on the Wi-Fi Assistant Card.
Bug:
17305353
Change-Id: Iffdcd9b1248dc7e6bd13c9eeca267392d2171c86
Dan Sandler [Wed, 3 Sep 2014 14:48:13 +0000 (16:48 +0200)]
Don't block notifications from system packages.
Bug:
16703366
Change-Id: Id2f635e4e99df0c10afff8a0f5130179d381762c
PauloftheWest [Wed, 3 Sep 2014 22:12:54 +0000 (22:12 +0000)]
am
7641e1ad: Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
* commit '
7641e1ad44f6006cac1bd1b88ca09b3bab2cca78':
Fixed an issue were "Saved Networks" would not appear correctly.
PauloftheWest [Wed, 3 Sep 2014 22:00:38 +0000 (22:00 +0000)]
Merge "Fixed an issue were "Saved Networks" would not appear correctly." into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 20:51:26 +0000 (20:51 +0000)]
am
52a48226: Merge "Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
* commit '
52a48226ec0566570afd6f0d2c5287d9b727b339':
Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed
Fabrice Di Meglio [Wed, 3 Sep 2014 20:43:55 +0000 (20:43 +0000)]
Merge "Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed" into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 20:40:08 +0000 (13:40 -0700)]
Fix bug #
17374913 Accessibility settings crashes when there is no accessibility service installed
- use the Preference.setSummary(CharSequence) instead of trying to set the summary
manually
Change-Id: I3692c50e3821a34a9c03a614cbc40209157068f3
Fabrice Di Meglio [Wed, 3 Sep 2014 20:13:11 +0000 (20:13 +0000)]
am
815dc273: Merge "Fix bug #
17330962 Clicking a search result in Settings shows \'wireless_settings\' instead of \'More\'" into lmp-dev
* commit '
815dc2738dcb1fe8abf9e436cae3e217edc77d95':
Fix bug #
17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
Fabrice Di Meglio [Wed, 3 Sep 2014 20:00:25 +0000 (20:00 +0000)]
Merge "Fix bug #
17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'" into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 19:57:25 +0000 (12:57 -0700)]
Fix bug #
17330962 Clicking a search result in Settings shows 'wireless_settings' instead of 'More'
- revert to the correct string for the Preference screen title.
Change-Id: I17c58485875e71e5785d5879b60aebcf6c4d454a
Chris Wren [Tue, 2 Sep 2014 21:26:17 +0000 (17:26 -0400)]
Implement per-app sensitivity settings toggle.
Change-Id: I0e70e6ce5c4a56d738c1850c50c2e268296d9d92
Depends-On: I2d5cf6782273744cbf9b309dec76780cc0a4c39e
Bug:
16324353
Wink Saville [Wed, 3 Sep 2014 19:23:26 +0000 (19:23 +0000)]
am
418346d5: Merge "Prepare to make SubscriptionManager public." into lmp-dev
* commit '
418346d5cf6c41162031a0731927502f503163a1':
Prepare to make SubscriptionManager public.
Wink Saville [Wed, 3 Sep 2014 18:26:02 +0000 (18:26 +0000)]
Merge "Prepare to make SubscriptionManager public." into lmp-dev
Fabrice Di Meglio [Wed, 3 Sep 2014 18:11:41 +0000 (18:11 +0000)]
am
b5caa647: Merge "Fix bug #
17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
* commit '
b5caa647e74729e0bcfabe12ca40b30a82dd906a':
Fix bug #
17208479 Have Cellular Networks Show up in Data Usage
Fabrice Di Meglio [Wed, 3 Sep 2014 17:56:07 +0000 (17:56 +0000)]
Merge "Fix bug #
17208479 Have Cellular Networks Show up in Data Usage" into lmp-dev
Dan Sandler [Wed, 3 Sep 2014 16:19:25 +0000 (16:19 +0000)]
am
b58b5127: Fix links to notification settings activities.
* commit '
b58b5127040b3c843fe42544a89a1085cf7e74f6':
Fix links to notification settings activities.
Dan Sandler [Tue, 2 Sep 2014 16:31:49 +0000 (18:31 +0200)]
Fix links to notification settings activities.
Additionally, we now show the user a list of "app-like"
things (packages with launchable activities) instead of only
non-system things. This way you can make (some) changes to
system package notifications while not having to page
through reams of random non-app packages.
Bug:
17277023
Change-Id: I920d6b941070efb75a816e6ad38b798b09a83d08
PauloftheWest [Tue, 2 Sep 2014 21:22:55 +0000 (14:22 -0700)]
Fixed an issue were "Saved Networks" would not appear correctly.
Bug:
17284538
Change-Id: Id93cd93f94a59437b04d41d4b0412d3b22575e17
Alexandra Gherghina [Wed, 3 Sep 2014 10:01:45 +0000 (11:01 +0100)]
Code clean-ups following moving the managed profile under accounts
Bug:
16234745
Change-Id: I7b4799157394a85a27610de7e059c846f77dda02
Wink Saville [Wed, 3 Sep 2014 05:40:55 +0000 (22:40 -0700)]
Prepare to make SubscriptionManager public.
Sync SubscriptionManager and its dependentes between lmp-dev
and lmp-sprout-dev.
Change-Id: Ie06ced3e7ff5a3d06b3b47892fed22b4bb8972c7
Fabrice Di Meglio [Wed, 3 Sep 2014 01:22:09 +0000 (18:22 -0700)]
Fix bug #
17208479 Have Cellular Networks Show up in Data Usage
- prevent collisions in the DocId (which is the primary key of
the FTS4 table)
- instead of just using "updatedTitle" hash, use instead
"updatedTitle + screenTitle"
Change-Id: If38f7bcc7fb857d59242d08c16c39adb80590254
Vinit Deshpande [Wed, 3 Sep 2014 01:03:06 +0000 (01:03 +0000)]
am
963ce475: Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
* commit '
963ce47525144879d295b5f54b04225220f74866':
Address API Council feedback for WifiAdapter/WPS APIs
Amith Yamasani [Wed, 3 Sep 2014 01:03:05 +0000 (01:03 +0000)]
am
99ad06c2: Merge "Change the location mode before applying restrictions" into lmp-dev
* commit '
99ad06c2a15200cfd83da7cf2131c8127f55544c':
Change the location mode before applying restrictions
Vinit Deshpande [Wed, 3 Sep 2014 00:59:56 +0000 (00:59 +0000)]
Merge "Address API Council feedback for WifiAdapter/WPS APIs" into lmp-dev
Amith Yamasani [Wed, 3 Sep 2014 00:56:28 +0000 (00:56 +0000)]
Merge "Change the location mode before applying restrictions" into lmp-dev
Amith Yamasani [Wed, 3 Sep 2014 00:10:18 +0000 (17:10 -0700)]
Change the location mode before applying restrictions
Once the location sharing restriction is applied, the setting cannot
be changed, so change the setting first.
Bug:
17348894
Change-Id: I9dcad230e816aaa2482f1f35f1993f51d14eabc7
PauloftheWest [Tue, 2 Sep 2014 21:38:29 +0000 (21:38 +0000)]
am
ebe496ea: Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
* commit '
ebe496ea7b18c5d702db4beee270046e43e491ad':
Fixed a crash when loading Bluetooth Settings.
PauloftheWest [Tue, 2 Sep 2014 21:31:22 +0000 (21:31 +0000)]
Merge "Fixed a crash when loading Bluetooth Settings." into lmp-dev
PauloftheWest [Wed, 27 Aug 2014 23:08:49 +0000 (16:08 -0700)]
Fixed a crash when loading Bluetooth Settings.
Bug:
17320674
Change-Id: Ibff0b5929b88b1a48c1fdd810fd8461bdb5f1274
Jason Monk [Tue, 2 Sep 2014 20:14:09 +0000 (20:14 +0000)]
am
dc4818ab: Merge "Bring back auto-rotate to settings" into lmp-dev
* commit '
dc4818ab7aa959143a1eb0b88bf0a4c9e6d19380':
Bring back auto-rotate to settings
Jason Monk [Tue, 2 Sep 2014 20:04:35 +0000 (20:04 +0000)]
Merge "Bring back auto-rotate to settings" into lmp-dev
Jason Monk [Wed, 20 Aug 2014 17:29:20 +0000 (13:29 -0400)]
Bring back auto-rotate to settings
Add a dropdown preference to the display settings screen that
controls whether auto-rotate is on.
Bug:
16636008
Change-Id: I71099a23793aa82b514bd0eebae183695415a92c
Paul Lawrence [Tue, 2 Sep 2014 19:46:00 +0000 (19:46 +0000)]
am
1f06a89f: Merge "Get correct factory reset reason from encryption failure" into lmp-dev
* commit '
1f06a89f468d7998a271b49dfbbdd7ea1f5b01a3':
Get correct factory reset reason from encryption failure
Paul Lawrence [Tue, 2 Sep 2014 19:33:25 +0000 (19:33 +0000)]
Merge "Get correct factory reset reason from encryption failure" into lmp-dev
Maurice Lam [Tue, 2 Sep 2014 19:03:00 +0000 (19:03 +0000)]
am
def48d60: Merge "[WifiSetup] Add shadow below header" into lmp-dev
* commit '
def48d605abe4fe597dbcea5e7c2f9ca93f1b237':
[WifiSetup] Add shadow below header
Maurice Lam [Tue, 2 Sep 2014 18:51:36 +0000 (18:51 +0000)]
Merge "[WifiSetup] Add shadow below header" into lmp-dev
PauloftheWest [Tue, 2 Sep 2014 18:28:54 +0000 (18:28 +0000)]
am
bde55601: Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
* commit '
bde55601ba5695894b7f9b8c7f61fd6694f9b459':
Fixed a Null Pointer Exception when Wifi Settings is indexing.
Paul Lawrence [Thu, 28 Aug 2014 22:56:38 +0000 (15:56 -0700)]
Get correct factory reset reason from encryption failure
Requires matching framework change
https://googleplex-android-review.git.corp.google.com/#/c/535832/
Bug:
17213613
Change-Id: Ia8006f4a9cb5909d83f1848d9acfbc3f1e0ab5fb
PauloftheWest [Tue, 2 Sep 2014 18:11:37 +0000 (18:11 +0000)]
Merge "Fixed a Null Pointer Exception when Wifi Settings is indexing." into lmp-dev
Fabrice Di Meglio [Tue, 2 Sep 2014 17:22:54 +0000 (17:22 +0000)]
am
de8c683f: Merge "Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
* commit '
de8c683f99b8db7289289016cf5d33016eea9dcd':
Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)
Fabrice Di Meglio [Tue, 2 Sep 2014 17:13:41 +0000 (17:13 +0000)]
Merge "Fix bug #
17250939 Stability: ANRs in Settings: at com.android.settings.search.Index.updateInternal(Index.java:518)" into lmp-dev
Dan Sandler [Tue, 2 Sep 2014 15:40:18 +0000 (15:40 +0000)]
am
3eac072b: Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev
* commit '
3eac072b1ad963007211d1b13ebb6d0bb0fc24a6':
Switch to vibrate (or slash-bell) icon at ringer volume 0.
Dan Sandler [Tue, 2 Sep 2014 15:32:41 +0000 (15:32 +0000)]
Merge "Switch to vibrate (or slash-bell) icon at ringer volume 0." into lmp-dev