File tree 5 files changed +25
-11
lines changed
src/com/android/launcher3
5 files changed +25
-11
lines changed Original file line number Diff line number Diff line change @@ -82,7 +82,8 @@ LOCAL_STATIC_JAVA_LIBRARIES := LauncherPluginLib
82
82
83
83
LOCAL_SRC_FILES := \
84
84
$(call all-proto-files-under, protos) \
85
- $(call all-proto-files-under, proto_overrides)
85
+ $(call all-proto-files-under, proto_overrides) \
86
+ $(call all-java-files-under, src_build_config) \
86
87
87
88
LOCAL_RESOURCE_DIR := $(LOCAL_PATH ) /res
88
89
Original file line number Diff line number Diff line change 22
22
xmlns : tools =" http://schemas.android.com/tools"
23
23
package =" com.android.launcher3" >
24
24
25
- <uses-sdk android : targetSdkVersion =" 28" android : minSdkVersion =" 28" />
26
25
<uses-permission android : name =" android.permission.CONTROL_REMOTE_APP_TRANSITION_ANIMATIONS" />
27
26
28
27
<application
Original file line number Diff line number Diff line change @@ -82,7 +82,7 @@ public class LauncherProvider extends ContentProvider {
82
82
*/
83
83
public static final int SCHEMA_VERSION = 27 ;
84
84
85
- public static final String AUTHORITY = FeatureFlags . AUTHORITY ;
85
+ public static final String AUTHORITY = BuildConfig . APPLICATION_ID + ".settings" ;
86
86
87
87
static final String EMPTY_DATABASE_CREATED = "EMPTY_DATABASE_CREATED" ;
88
88
Original file line number Diff line number Diff line change @@ -58,7 +58,6 @@ public static boolean showFlagTogglerUi(Context context) {
58
58
}
59
59
60
60
public static final boolean IS_DOGFOOD_BUILD = false ;
61
- public static final String AUTHORITY = "com.android.launcher3.settings" .intern ();
62
61
63
62
// When enabled the promise icon is visible in all apps while installation an app.
64
63
public static final boolean LAUNCHER3_PROMISE_APPS_IN_ALL_APPS = false ;
@@ -104,12 +103,6 @@ public static void initialize(Context context) {
104
103
flag .initialize (context );
105
104
}
106
105
}
107
- } else {
108
- synchronized (sLock ) {
109
- for (TogglableFlag flag : sFlags ) {
110
- flag .currentValue = flag .defaultValue ;
111
- }
112
- }
113
106
}
114
107
}
115
108
@@ -139,7 +132,7 @@ public static class TogglableFlag {
139
132
boolean defaultValue ,
140
133
String description ) {
141
134
this .key = checkNotNull (key );
142
- this .defaultValue = defaultValue ;
135
+ this .currentValue = this . defaultValue = defaultValue ;
143
136
this .description = checkNotNull (description );
144
137
synchronized (sLock ) {
145
138
sFlags .add (this );
Original file line number Diff line number Diff line change
1
+ /*
2
+ * Copyright (C) 2018 The Android Open Source Project
3
+ *
4
+ * Licensed under the Apache License, Version 2.0 (the "License");
5
+ * you may not use this file except in compliance with the License.
6
+ * You may obtain a copy of the License at
7
+ *
8
+ * http://www.apache.org/licenses/LICENSE-2.0
9
+ *
10
+ * Unless required by applicable law or agreed to in writing, software
11
+ * distributed under the License is distributed on an "AS IS" BASIS,
12
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
+ * See the License for the specific language governing permissions and
14
+ * limitations under the License.
15
+ */
16
+
17
+ package com .android .launcher3 ;
18
+
19
+ public final class BuildConfig {
20
+ public static final String APPLICATION_ID = "com.android.launcher3" ;
21
+ }
You can’t perform that action at this time.
0 commit comments