resolved conflicts for merge of 13ef17a3 to mnc-dev-plus-aosp (e1d69c9d) · Commits · e / os / android_packages_apps_Trebuchet

.gitignore

+9 −0

Original line number	Original line	Diff line number	Diff line
	db_files		db_files
			*.iml
			.project
			.classpath
			.project.properties
			gen/
			tests/stress/gen/
			WallpaperPicker/gen/
			WallpaperPicker/.project.properties
			bin/

Android.mk

+6 −9

Original line number	Original line	Diff line number	Diff line
	@@ -23,28 +23,23 @@ include $(CLEAR_VARS)

	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	LOCAL_STATIC_JAVA_LIBRARIES := android-support-v13

	LOCAL_SRC_FILES := $(call all-java-files-under, src) \		LOCAL_SRC_FILES := $(call all-java-files-under, src) \
	$(call all-java-files-under, WallpaperPicker/src) \		$(call all-java-files-under, WallpaperPicker/src) \
	$(call all-renderscript-files-under, src) \
	$(call all-proto-files-under, protos)		$(call all-proto-files-under, protos)
	LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res		LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/WallpaperPicker/res $(LOCAL_PATH)/res
			LOCAL_PROGUARD_FLAG_FILES := proguard.flags
	LOCAL_AAPT_FLAGS := --auto-add-overlay		LOCAL_STATIC_JAVA_LIBRARIES := android-support-v4 android-support-v7-recyclerview

	LOCAL_PROTOC_OPTIMIZE_TYPE := nano		LOCAL_PROTOC_OPTIMIZE_TYPE := nano
	LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/		LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
			LOCAL_AAPT_FLAGS := --auto-add-overlay

	LOCAL_SDK_VERSION := 21		LOCAL_SDK_VERSION := current

	LOCAL_PACKAGE_NAME := Launcher3		LOCAL_PACKAGE_NAME := Launcher3
	#LOCAL_CERTIFICATE := shared		#LOCAL_CERTIFICATE := shared

	LOCAL_OVERRIDES_PACKAGES := Home Launcher2		LOCAL_OVERRIDES_PACKAGES := Home Launcher2

	LOCAL_PROGUARD_FLAG_FILES := proguard.flags

	include $(BUILD_PACKAGE)		include $(BUILD_PACKAGE)


	@@ -83,4 +78,6 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/util/etc/launcher_protoutil \| $(ACP)
	$(copy-file-to-new-target)		$(copy-file-to-new-target)
	$(hide) chmod 755 $@		$(hide) chmod 755 $@

			INTERNAL_DALVIK_MODULES += $(LOCAL_INSTALLED_MODULE)

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

AndroidManifest.xml

+15 −36

Original line number	Original line	Diff line number	Diff line
	@@ -28,12 +28,6 @@
	android:protectionLevel="dangerous"		android:protectionLevel="dangerous"
	android:label="@string/permlab_install_shortcut"		android:label="@string/permlab_install_shortcut"
	android:description="@string/permdesc_install_shortcut" />		android:description="@string/permdesc_install_shortcut" />
	<permission
	android:name="com.android.launcher.permission.UNINSTALL_SHORTCUT"
	android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
	android:protectionLevel="dangerous"
	android:label="@string/permlab_uninstall_shortcut"
	android:description="@string/permdesc_uninstall_shortcut"/>
	<permission		<permission
	android:name="com.android.launcher3.permission.READ_SETTINGS"		android:name="com.android.launcher3.permission.READ_SETTINGS"
	android:permissionGroup="android.permission-group.SYSTEM_TOOLS"		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
	@@ -71,7 +65,6 @@
	<uses-permission android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" />		<uses-permission android:name="com.android.launcher3.permission.RECEIVE_FIRST_LOAD_BROADCAST" />

	<application		<application
	android:name="com.android.launcher3.LauncherApplication"
	android:allowBackup="@bool/enable_backup"		android:allowBackup="@bool/enable_backup"
	android:backupAgent="com.android.launcher3.LauncherBackupAgentHelper"		android:backupAgent="com.android.launcher3.LauncherBackupAgentHelper"
	android:hardwareAccelerated="true"		android:hardwareAccelerated="true"
	@@ -89,6 +82,8 @@
	android:theme="@style/Theme"		android:theme="@style/Theme"
	android:windowSoftInputMode="adjustPan"		android:windowSoftInputMode="adjustPan"
	android:screenOrientation="nosensor"		android:screenOrientation="nosensor"
			android:resumeWhilePausing="true"
			android:taskAffinity=""
	android:enabled="true">		android:enabled="true">
	<intent-filter>		<intent-filter>
	<action android:name="android.intent.action.MAIN" />		<action android:name="android.intent.action.MAIN" />
	@@ -98,8 +93,10 @@
	</intent-filter>		</intent-filter>
	</activity>		</activity>

			<!-- ENABLE_FOR_TESTING

	<activity		<activity
	android:name="com.android.launcher3.LauncherExtension"		android:name="com.android.launcher3.testing.LauncherExtension"
	android:launchMode="singleTask"		android:launchMode="singleTask"
	android:clearTaskOnLaunch="true"		android:clearTaskOnLaunch="true"
	android:stateNotNeeded="true"		android:stateNotNeeded="true"
	@@ -115,6 +112,8 @@
	</intent-filter>		</intent-filter>
	</activity>		</activity>

			-->

	<activity		<activity
	android:name="com.android.launcher3.ToggleWeightWatcher"		android:name="com.android.launcher3.ToggleWeightWatcher"
	android:label="@string/toggle_weight_watcher"		android:label="@string/toggle_weight_watcher"
	@@ -128,7 +127,7 @@
	</activity>		</activity>

	<activity		<activity
	android:name="com.android.launcher3.LauncherWallpaperPickerActivity"		android:name="com.android.launcher3.WallpaperPickerActivity"
	android:theme="@style/Theme.WallpaperPicker"		android:theme="@style/Theme.WallpaperPicker"
	android:label="@string/pick_wallpaper"		android:label="@string/pick_wallpaper"
	android:icon="@mipmap/ic_launcher_wallpaper"		android:icon="@mipmap/ic_launcher_wallpaper"
	@@ -154,6 +153,13 @@
	</intent-filter>		</intent-filter>
	</activity>		</activity>

			<activity
			android:name="com.android.launcher3.SettingsActivity"
			android:label="@string/settings_button_text"
			android:autoRemoveFromRecents="true"
			android:process=":settings_process">
			</activity>

	<!-- Debugging tools -->		<!-- Debugging tools -->
	<activity		<activity
	android:name="com.android.launcher3.MemoryDumpActivity"		android:name="com.android.launcher3.MemoryDumpActivity"
	@@ -191,15 +197,6 @@
	</intent-filter>		</intent-filter>
	</receiver>		</receiver>

	<!-- Intent received used to uninstall shortcuts from other applications -->
	<receiver
	android:name="com.android.launcher3.UninstallShortcutReceiver"
	android:permission="com.android.launcher.permission.UNINSTALL_SHORTCUT">
	<intent-filter>
	<action android:name="com.android.launcher.action.UNINSTALL_SHORTCUT" />
	</intent-filter>
	</receiver>

	<!-- Intent received used to initialize a restored widget -->		<!-- Intent received used to initialize a restored widget -->
	<receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >		<receiver android:name="com.android.launcher3.AppWidgetsRestoredReceiver" >
	<intent-filter>		<intent-filter>
	@@ -207,24 +204,6 @@
	</intent-filter>		</intent-filter>
	</receiver>		</receiver>

	<!-- New user initialization; set up initial wallpaper -->
	<receiver
	android:name="com.android.launcher3.UserInitializeReceiver"
	android:exported="false">
	<intent-filter>
	<action android:name="android.intent.action.USER_INITIALIZE" />
	</intent-filter>
	</receiver>

	<receiver android:name="com.android.launcher3.PackageChangedReceiver" >
	<intent-filter>
	<action android:name="android.intent.action.PACKAGE_CHANGED"/>
	<action android:name="android.intent.action.PACKAGE_REPLACED"/>
	<action android:name="android.intent.action.PACKAGE_REMOVED"/>
	<data android:scheme="package"></data>
	</intent-filter>
	</receiver>

	<receiver android:name="com.android.launcher3.StartupReceiver" >		<receiver android:name="com.android.launcher3.StartupReceiver" >
	<intent-filter>		<intent-filter>
	<action android:name="android.intent.action.BOOT_COMPLETED" />		<action android:name="android.intent.action.BOOT_COMPLETED" />

WallpaperPicker/AndroidManifest.xml

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5,6 +5,6 @@
	android:versionName="1.0"		android:versionName="1.0"
	>		>

	<uses-sdk android:minSdkVersion="15" android:targetSdkVersion="19" />		<uses-sdk android:minSdkVersion="16" android:targetSdkVersion="21" />
			<application/>
	</manifest>		</manifest>

WallpaperPicker/res/drawable-hdpi/ic_images.png

−1.54 KiB (354 B)

Loading image diff...