diff options
| author | John Spurlock <jspurlock@google.com> | 2013-09-18 10:48:25 -0400 |
|---|---|---|
| committer | John Spurlock <jspurlock@google.com> | 2013-09-18 10:51:31 -0400 |
| commit | 2c38e70acd92372669cf93c2049ad162650a43ba (patch) | |
| tree | 4eaca323396122f8b2095ecab8c8d8cce87d8ef9 | |
| parent | 5664de2524be15329882bf81925d08b5de760b8c (diff) | |
| download | android_packages_apps_Trebuchet-2c38e70acd92372669cf93c2049ad162650a43ba.tar.gz android_packages_apps_Trebuchet-2c38e70acd92372669cf93c2049ad162650a43ba.tar.bz2 android_packages_apps_Trebuchet-2c38e70acd92372669cf93c2049ad162650a43ba.zip | |
Fix launcher3 standalone build.
Change-Id: Ibfe14c5960211916222fc49389b8776be6bf768b
| -rw-r--r-- | AndroidManifest.xml | 1 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 | ||||
| -rw-r--r-- | tests/Android.mk | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 14fb04403..c6263fb87 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -61,6 +61,7 @@ <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.BIND_APPWIDGET" /> <uses-permission android:name="android.permission.GET_ACCOUNTS" /> + <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" /> <uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" /> <uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" /> <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" /> diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index d70a3a9fb..6e6cdf6d7 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -3358,8 +3358,8 @@ public class Launcher extends Activity // We disable both search and voice search when there is no global search provider if (searchButtonContainer != null) searchButtonContainer.setVisibility(View.GONE); if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE); - searchButton.setVisibility(View.GONE); - voiceButton.setVisibility(View.GONE); + if (searchButton != null) searchButton.setVisibility(View.GONE); + if (voiceButton != null) voiceButton.setVisibility(View.GONE); setVoiceButtonProxyVisible(false); return false; } @@ -3412,7 +3412,7 @@ public class Launcher extends Activity return true; } else { if (voiceButtonContainer != null) voiceButtonContainer.setVisibility(View.GONE); - voiceButton.setVisibility(View.GONE); + if (voiceButton != null) voiceButton.setVisibility(View.GONE); setVoiceButtonProxyVisible(false); return false; } diff --git a/tests/Android.mk b/tests/Android.mk index e33169ccf..762a52b8d 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. # -LOCAL_PATH := $(call my-dir) -include $(call all-makefiles-under,$(LOCAL_PATH)) +#LOCAL_PATH := $(call my-dir) +#include $(call all-makefiles-under,$(LOCAL_PATH)) |