openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moving autority definition to a separate file, so 

that it can be easily customized using android studio

Change-Id: I17f4f4511c2af5d382727769d1b74413f233d500
Bug: 120079798
This commit is contained in:
Sunny Goyal 2018-11-26 23:44:41 -08:00
parent 4a5bc9f8b0
commit 4276e7b649
5 changed files with 25 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Android.mk
View File

@ -82,7 +82,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := LauncherPluginLib
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(call all-proto-files-under, protos) \ $(call all-proto-files-under, protos) \
$(call all-proto-files-under, proto_overrides) $(call all-proto-files-under, proto_overrides) \
$(call all-java-files-under, src_build_config) \
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res

1
quickstep/AndroidManifest.xml
View File

@ -22,7 +22,6 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
package="com.android.launcher3" > package="com.android.launcher3" >
<uses-sdk android:targetSdkVersion="28" android:minSdkVersion="28"/>
<uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" /> <uses-permission android:name="android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
<application <application

2
src/com/android/launcher3/LauncherProvider.java
View File

@ -82,7 +82,7 @@ public class LauncherProvider extends ContentProvider {
*/ */
public static final int SCHEMA_VERSION = 27; public static final int SCHEMA_VERSION = 27;
public static final String AUTHORITY = FeatureFlags.AUTHORITY; public static final String AUTHORITY = BuildConfig.APPLICATION_ID + ".settings";
static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED"; static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED";

9
src/com/android/launcher3/config/BaseFlags.java
View File

@ -58,7 +58,6 @@ abstract class BaseFlags {
} }
public static final boolean IS_DOGFOOD_BUILD = false; public static final boolean IS_DOGFOOD_BUILD = false;
public static final String AUTHORITY = "com.android.launcher3.settings".intern();
// When enabled the promise icon is visible in all apps while installation an app. // When enabled the promise icon is visible in all apps while installation an app.
public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false; public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false;
@ -104,12 +103,6 @@ abstract class BaseFlags {
flag.initialize(context); flag.initialize(context);
} }
} }
} else {
synchronized (sLock) {
for (TogglableFlag flag : sFlags) {
flag.currentValue = flag.defaultValue;
}
}
} }
} }
@ -139,7 +132,7 @@ abstract class BaseFlags {
boolean defaultValue, boolean defaultValue,
String description) { String description) {
this.key = checkNotNull(key); this.key = checkNotNull(key);
this.defaultValue = defaultValue; this.currentValue = this.defaultValue = defaultValue;
this.description = checkNotNull(description); this.description = checkNotNull(description);
synchronized (sLock) { synchronized (sLock) {
sFlags.add(this); sFlags.add(this);

21
src_build_config/BuildConfig.java Normal file
View File

@ -0,0 +1,21 @@
/*
* 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.
*/
package com.android.launcher3;
public final class BuildConfig {
public static final String APPLICATION_ID = "com.android.launcher3";
}