Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c38e70a authored by John Spurlock's avatar John Spurlock
Browse files

Fix launcher3 standalone build. 

Change-Id: Ibfe14c5960211916222fc49389b8776be6bf768b
parent 5664de25

AndroidManifest.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

src/com/android/launcher3/Launcher.java

+3 −3
Original line number Diff line number Diff line
@@ -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;

        }

tests/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -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))