Skip to content

Commit

Permalink
Adapt Android Go variant to be buildable with Pixel features
Browse files Browse the repository at this point in the history
  • Loading branch information
amirzaidi committed Mar 26, 2018
1 parent f0ef4f8 commit c1e9a4c
Show file tree
Hide file tree
Showing 5 changed files with 29 additions and 23 deletions.
6 changes: 4 additions & 2 deletions Android.mk
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ LOCAL_SRC_FILES := \
$(call all-java-files-under, src_config) \
$(call all-java-files-under, go/src_flags) \
$(call all-proto-files-under, protos) \
$(call all-proto-files-under, proto_overrides)
$(call all-proto-files-under, proto_overrides) \
$(call all-proto-files-under, proto_pixel)

LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/go/res \
Expand All @@ -93,10 +94,11 @@ LOCAL_RESOURCE_DIR := \
LOCAL_PROGUARD_FLAG_FILES := proguard.flags

LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PATH)/proto_overrides/ --proto_path=$(LOCAL_PATH)/proto_pixel/
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java

LOCAL_AAPT_FLAGS := \
--rename-manifest-package com.google.android.apps.nexuslauncher \
--auto-add-overlay \
--extra-packages android.support.v7.recyclerview \

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {
}

l3go {
applicationId 'com.android.launcher3'
applicationId 'com.google.android.apps.nexuslauncher'
testApplicationId 'com.android.launcher3.tests'
flavorDimensions 'default'
}
Expand Down
21 changes: 21 additions & 0 deletions go/res/values-v23/bools.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/* Copyright 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>
<bool name="notification_badging_enabled">false</bool>
</resources>
20 changes: 0 additions & 20 deletions go/res/values/dimens.xml

This file was deleted.

3 changes: 3 additions & 0 deletions go/src_flags/com/android/launcher3/config/FeatureFlags.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,7 @@ private FeatureFlags() {}
// Features to control Launcher3Go behavior
public static final boolean GO_DISABLE_WIDGETS = true;
public static final boolean LAUNCHER3_SPRING_ICONS = false;

// Feature flag to enable moving the QSB on the 0th screen of the workspace.
public static boolean QSB_ON_FIRST_SCREEN = true;
}

0 comments on commit c1e9a4c

Please sign in to comment.