Merge "Changing minimum supported Launcher version to 26" into ub-launcher3-master (cb89edcb) · Commits · e / os / android_packages_apps_Trebuchet

Android.mk

+3 −3

Original line number	Diff line number	Diff line
		@@ -48,7 +48,7 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PA
		LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java

		LOCAL_SDK_VERSION := current
		LOCAL_MIN_SDK_VERSION := 21
		LOCAL_MIN_SDK_VERSION := 26
		LOCAL_MODULE := Launcher3CommonDepsLib
		LOCAL_PRIVILEGED_MODULE := true
		LOCAL_MANIFEST_FILE := AndroidManifest-common.xml
		@@ -77,7 +77,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags
		LOCAL_PROGUARD_ENABLED := disabled

		LOCAL_SDK_VERSION := current
		LOCAL_MIN_SDK_VERSION := 21
		LOCAL_MIN_SDK_VERSION := 26
		LOCAL_PACKAGE_NAME := Launcher3
		LOCAL_PRIVILEGED_MODULE := true
		LOCAL_SYSTEM_EXT_MODULE := true
		@@ -108,7 +108,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res
		LOCAL_PROGUARD_FLAG_FILES := proguard.flags

		LOCAL_SDK_VERSION := current
		LOCAL_MIN_SDK_VERSION := 21
		LOCAL_MIN_SDK_VERSION := 26
		LOCAL_PACKAGE_NAME := Launcher3Go
		LOCAL_PRIVILEGED_MODULE := true
		LOCAL_SYSTEM_EXT_MODULE := true

AndroidManifest-common.xml

+0 −18

Original line number	Diff line number	Diff line
		@@ -29,12 +29,6 @@
		at compile time. Note that the components defined in AndroidManifest.xml are also required,
		with some minor changed based on the derivative app.
		-->
		<permission
		android:name="com.android.launcher.permission.INSTALL_SHORTCUT"
		android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
		android:protectionLevel="dangerous"
		android:label="@string/permlab_install_shortcut"
		android:description="@string/permdesc_install_shortcut" />

		<uses-permission android:name="android.permission.CALL_PHONE" />
		<uses-permission android:name="android.permission.SET_WALLPAPER" />
		@@ -79,17 +73,6 @@
		android:restoreAnyVersion="true"
		android:supportsRtl="true" >

		<!-- Intent received used to install shortcuts from other applications -->
		<receiver
		android:name="com.android.launcher3.InstallShortcutReceiver"
		android:permission="com.android.launcher.permission.INSTALL_SHORTCUT"
		android:exported="true"
		android:enabled="@bool/enable_install_shortcut_api" >
		<intent-filter>
		<action android:name="com.android.launcher.action.INSTALL_SHORTCUT" />
		</intent-filter>
		</receiver>

		<!-- Intent received when a session is committed -->
		<receiver
		android:name="com.android.launcher3.SessionCommitReceiver"
		@@ -116,7 +99,6 @@
		<service
		android:name="com.android.launcher3.notification.NotificationListener"
		android:label="@string/notification_dots_service_title"
		android:enabled="@bool/notification_dots_enabled"
		android:exported="true"
		android:permission="android.permission.BIND_NOTIFICATION_LISTENER_SERVICE">
		<intent-filter>

AndroidManifest.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		<manifest
		xmlns:android="http://schemas.android.com/apk/res/android"
		package="com.android.launcher3">
		<uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>
		<uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>
		<!--
		Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
		Refer comments around specific entries on how to extend individual components.

quickstep/src/com/android/launcher3/QuickstepAppTransitionManagerImpl.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -45,7 +45,6 @@ import android.animation.AnimatorListenerAdapter;
		import android.animation.AnimatorSet;
		import android.animation.ObjectAnimator;
		import android.animation.ValueAnimator;
		import android.annotation.TargetApi;
		import android.app.ActivityOptions;
		import android.content.Context;
		import android.content.pm.PackageManager;
		@@ -55,7 +54,6 @@ import android.graphics.Point;
		import android.graphics.Rect;
		import android.graphics.RectF;
		import android.graphics.drawable.Drawable;
		import android.os.Build;
		import android.os.CancellationSignal;
		import android.os.Handler;
		import android.os.Looper;
		@@ -94,7 +92,6 @@ import com.android.systemui.shared.system.WindowManagerWrapper;
		* {@link LauncherAppTransitionManager} with Quickstep-specific app transitions for launching from
		* home and/or all-apps. Not used for 3p launchers.
		*/
		@TargetApi(Build.VERSION_CODES.O)
		@SuppressWarnings("unused")
		public abstract class QuickstepAppTransitionManagerImpl extends LauncherAppTransitionManager
		implements OnDeviceProfileChangeListener {

res/animator-v23/discovery_bounce.xml

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		** Copyright 2017, 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.
		*/
		-->
		<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
		android:duration="2166"
		android:repeatCount="5">
		<propertyValuesHolder
		android:propertyName="progress"
		android:valueType="floatType">
		<keyframe
		android:fraction="0"
		android:value="1f" />
		<keyframe
		android:fraction="0.246"
		android:value="1f" />
		<keyframe
		android:fraction=".423"
		android:interpolator="@interpolator/disco_bounce"
		android:value="0.9738f" />
		<keyframe
		android:fraction="0.754"
		android:interpolator="@interpolator/disco_bounce"
		android:value="1f" />
		<keyframe
		android:fraction="1"
		android:value="1f" />
		</propertyValuesHolder>
		</objectAnimator>