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

Commit 1b1b84e9 authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

resolve merge conflicts of f82aba03 to nyc-mr1-dev-plus-aosp 

Change-Id: I9fdb4b870c11cd9ef1d46727496839743217fac3
parents 529970a1 f82aba03

Android.mk

+5 −19
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src) \ 


LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res \

    $(LOCAL_PATH)/res \

    $(LOCAL_PATH)/../../../frameworks/support/v7/recyclerview/res

    frameworks/support/v7/recyclerview/res



LOCAL_PROGUARD_FLAG_FILES := proguard.flags
@@ -54,34 +54,20 @@ include $(BUILD_PACKAGE) 




#

# Protocol Buffer Debug Utility in Java

# Launcher proto buffer jar used for development

#

include $(CLEAR_VARS)



LOCAL_SRC_FILES := $(call all-java-files-under, util) \

    $(call all-proto-files-under, protos)

LOCAL_SRC_FILES := $(call all-proto-files-under, protos)



LOCAL_PROTOC_OPTIMIZE_TYPE := nano

LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/



LOCAL_MODULE_TAGS := optional

LOCAL_MODULE := launcher_protoutil_lib

LOCAL_MODULE := launcher_proto_lib

LOCAL_IS_HOST_MODULE := true

LOCAL_JAR_MANIFEST := util/etc/manifest.txt

LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano



include $(BUILD_HOST_JAVA_LIBRARY)



#

# Protocol Buffer Debug Utility Wrapper Script

#

include $(CLEAR_VARS)

LOCAL_IS_HOST_MODULE := true

LOCAL_MODULE_CLASS := EXECUTABLES

LOCAL_MODULE := launcher_protoutil

LOCAL_SRC_FILES := util/etc/launcher_protoutil

LOCAL_REQUIRED_MODULES := launcher_protoutil_lib

include $(BUILD_PREBUILT)



INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)



include $(call all-makefiles-under,$(LOCAL_PATH))

AndroidManifest.xml

+50 −61
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ 
            android:theme="@style/Theme"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            android:configChanges="keyboard|keyboardHidden|navigation"

            android:resumeWhilePausing="true"

            android:taskAffinity=""

            android:enabled="true">
@@ -92,39 +93,6 @@ 
            </intent-filter>

        </activity>



        <!-- ENABLE_FOR_TESTING



        <activity

            android:name="com.android.launcher3.testing.LauncherExtension"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:theme="@style/Theme"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            android:enabled="false">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.HOME" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.MONKEY"/>

            </intent-filter>

        </activity>



        -->



        <activity

            android:name="com.android.launcher3.ToggleWeightWatcher"

            android:label="@string/toggle_weight_watcher"

            android:enabled="@bool/debug_memory_enabled"

            android:icon="@mipmap/ic_launcher_home">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



        <activity

            android:name="com.android.launcher3.WallpaperPickerActivity"

            android:theme="@style/Theme.WallpaperPicker"
@@ -159,34 +127,6 @@ 
            android:process=":settings_process">

        </activity>



        <!-- Debugging tools -->

        <activity

            android:name="com.android.launcher3.MemoryDumpActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:label="@string/debug_memory_activity"

            android:enabled="@bool/debug_memory_enabled"

            android:excludeFromRecents="true"

            android:icon="@mipmap/ic_launcher_home"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



        <service android:name="com.android.launcher3.MemoryTracker"

            android:enabled="@bool/debug_memory_enabled"

            >

        </service>



        <receiver

            android:name="com.android.launcher3.WallpaperChangedReceiver">

            <intent-filter>

                <action android:name="android.intent.action.WALLPAPER_CHANGED" />

            </intent-filter>

        </receiver>



        <!-- Intent received used to install shortcuts from other applications -->

        <receiver

            android:name="com.android.launcher3.InstallShortcutReceiver"
@@ -219,5 +159,54 @@ 


        <meta-data android:name="android.nfc.disable_beam_default"

                       android:value="true" />



        <!-- ENABLE_FOR_TESTING



        <activity

            android:name="com.android.launcher3.testing.LauncherExtension"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:stateNotNeeded="true"

            android:theme="@style/Theme"

            android:windowSoftInputMode="adjustPan"

            android:screenOrientation="nosensor"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.HOME" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.MONKEY"/>

            </intent-filter>

        </activity>



        <activity

            android:name="com.android.launcher3.testing.MemoryDumpActivity"

            android:theme="@android:style/Theme.NoDisplay"

            android:label="* HPROF"

            android:excludeFromRecents="true"

            android:icon="@mipmap/ic_launcher_home"

            >

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



        <activity

            android:name="com.android.launcher3.testing.ToggleWeightWatcher"

            android:label="Show Mem"

            android:icon="@mipmap/ic_launcher_home">

            <intent-filter>

                <action android:name="android.intent.action.MAIN" />

                <category android:name="android.intent.category.DEFAULT" />

                <category android:name="android.intent.category.LAUNCHER" />

            </intent-filter>

        </activity>



        <service android:name="com.android.launcher3.testing.MemoryTracker" />



        -->



    </application>

</manifest>

WallpaperPicker/res/anim/fade_out.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project



 Licensed under the Apache License, Version 2.0 (the "License");

 you may not use this file except in compliance with the License.

 You may obtain a copy of the License at



      http://www.apache.org/licenses/LICENSE-2.0



 Unless required by applicable law or agreed to in writing, software

 distributed under the License is distributed on an "AS IS" BASIS,

 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 See the License for the specific language governing permissions and

 limitations under the License.

-->



<!-- startOffset is the same as the duration of the wallpaper_enter animation. We have this delay so

    that we don't see the wallpaper changing before fading back to the home screen. -->

<alpha xmlns:android="http://schemas.android.com/apk/res/android"

    android:startOffset="@android:integer/config_longAnimTime"

    android:duration="@android:integer/config_mediumAnimTime"

    android:fromAlpha="1"

    android:toAlpha="0"/>

WallpaperPicker/res/layout/actionbar_set_wallpaper.xml

+2 −1
Original line number Diff line number Diff line
@@ -28,5 +28,6 @@ 
    android:drawableLeft="@drawable/ic_actionbar_accept"

    android:drawablePadding="8dp"

    android:gravity="start|center_vertical"

    android:text="@string/wallpaper_instructions">

    android:text="@string/wallpaper_instructions"

    android:enabled="false">

</com.android.launcher3.AlphaDisableableButton>

WallpaperPicker/res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
    <string name="wallpaper_instructions" msgid="3524143401182707094">"Stel muurpapier"</string>

    <string name="image_load_fail" msgid="7538534580694411837">"Kon nie prent laai nie"</string>

    <string name="wallpaper_load_fail" msgid="4800700444605404650">"Kon nie prent as muurpapier laai nie"</string>

    <string name="wallpaper_set_fail" msgid="7023180794008631780">"Kon nie prent as muurpapier stel nie"</string>

  <plurals name="number_of_items_selected">

    <item quantity="zero" msgid="9015111147509924344">"%1$d gekies"</item>

    <item quantity="one" msgid="8409622005831789373">"%1$d gekies"</item>