Merging from ub-launcher3-qt-future-dev @ build 6018744 (8b406b8d) · Commits · e / os / BlissLauncher3

Android.mk

+4 −12

Original line number	Original line	Diff line number	Diff line
	@@ -23,12 +23,7 @@ include $(CLEAR_VARS)
	LOCAL_USE_AAPT2 := true		LOCAL_USE_AAPT2 := true
	LOCAL_AAPT2_ONLY := true		LOCAL_AAPT2_ONLY := true
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	ifneq (,$(wildcard frameworks/base))
	LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib		LOCAL_STATIC_JAVA_LIBRARIES:= PluginCoreLib
	else
	LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore
	endif

	LOCAL_SRC_FILES := \		LOCAL_SRC_FILES := \
	$(call all-java-files-under, src_plugins)		$(call all-java-files-under, src_plugins)
	@@ -151,11 +146,10 @@ LOCAL_USE_AAPT2 := true
	LOCAL_AAPT2_ONLY := true		LOCAL_AAPT2_ONLY := true
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	ifneq (,$(wildcard frameworks/base))
	LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
			ifneq (,$(wildcard frameworks/base))
	LOCAL_PRIVATE_PLATFORM_APIS := true		LOCAL_PRIVATE_PLATFORM_APIS := true
	else		else
	LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
	LOCAL_SDK_VERSION := system_current		LOCAL_SDK_VERSION := system_current
	LOCAL_MIN_SDK_VERSION := 26		LOCAL_MIN_SDK_VERSION := 26
	endif		endif
	@@ -224,11 +218,10 @@ include $(CLEAR_VARS)
	LOCAL_USE_AAPT2 := true		LOCAL_USE_AAPT2 := true
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	ifneq (,$(wildcard frameworks/base))
	LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
			ifneq (,$(wildcard frameworks/base))
	LOCAL_PRIVATE_PLATFORM_APIS := true		LOCAL_PRIVATE_PLATFORM_APIS := true
	else		else
	LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
	LOCAL_SDK_VERSION := system_current		LOCAL_SDK_VERSION := system_current
	LOCAL_MIN_SDK_VERSION := 26		LOCAL_MIN_SDK_VERSION := 26
	endif		endif
	@@ -271,11 +264,10 @@ include $(CLEAR_VARS)
	LOCAL_USE_AAPT2 := true		LOCAL_USE_AAPT2 := true
	LOCAL_MODULE_TAGS := optional		LOCAL_MODULE_TAGS := optional

	ifneq (,$(wildcard frameworks/base))
	LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano		LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano
			ifneq (,$(wildcard frameworks/base))
	LOCAL_PRIVATE_PLATFORM_APIS := true		LOCAL_PRIVATE_PLATFORM_APIS := true
	else		else
	LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos
	LOCAL_SDK_VERSION := system_current		LOCAL_SDK_VERSION := system_current
	LOCAL_MIN_SDK_VERSION := 26		LOCAL_MIN_SDK_VERSION := 26
	endif		endif

AndroidManifest-common.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -169,7 +169,7 @@
	<activity		<activity
	android:name="com.android.launcher3.settings.SettingsActivity"		android:name="com.android.launcher3.settings.SettingsActivity"
	android:label="@string/settings_button_text"		android:label="@string/settings_button_text"
	android:theme="@android:style/Theme.DeviceDefault.Settings"		android:theme="@style/HomeSettingsTheme"
	android:autoRemoveFromRecents="true">		android:autoRemoveFromRecents="true">
	<intent-filter>		<intent-filter>
	<action android:name="android.intent.action.APPLICATION_PREFERENCES" />		<action android:name="android.intent.action.APPLICATION_PREFERENCES" />

PREUPLOAD.cfg

0 → 100644

+2 −0

Original line number	Original line	Diff line number	Diff line
			[Hook Scripts]
			checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}

SecondaryDisplayLauncher/res/values-ar/strings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -21,5 +21,5 @@
	xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
	<string name="couldnt_launch" msgid="7873588052226763866">"تعذَّر تشغيل النشاط."</string>		<string name="couldnt_launch" msgid="7873588052226763866">"تعذَّر تشغيل النشاط."</string>
	<string name="add_app_shortcut" msgid="2756755330707509435">"إضافة اختصار التطبيق"</string>		<string name="add_app_shortcut" msgid="2756755330707509435">"إضافة اختصار التطبيق"</string>
	<string name="set_wallpaper" msgid="6475195450505435904">"تعيين الخلفية"</string>		<string name="set_wallpaper" msgid="6475195450505435904">"ضبط الخلفية"</string>
	</resources>		</resources>

SecondaryDisplayLauncher/res/values-en-rCA/strings.xml

0 → 100644

+25 −0

Original line number	Original line	Diff line number	Diff line
			<?xml version="1.0" encoding="UTF-8"?>
			<!--
			/*
			* Copyright (C) 2018 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.
			*/
			-->

			<resources xmlns:android="http://schemas.android.com/apk/res/android"
			xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
			<string name="couldnt_launch" msgid="7873588052226763866">"Couldn\'t launch the activity"</string>
			<string name="add_app_shortcut" msgid="2756755330707509435">"Add app shortcut"</string>
			<string name="set_wallpaper" msgid="6475195450505435904">"Set wallpaper"</string>
			</resources>