summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Coucheron <arco68@gmail.com>2017-06-29 04:35:22 (GMT)
committerArne Coucheron <arco68@gmail.com>2017-07-02 01:24:36 (GMT)
commit27fcaa36f6db0825541b2be9c3875547f21f3131 (patch)
tree23743dce8e5126fc6889bcb96b83ee6af6121daa
parent28a64381b67d72fcc8b994343507ed9c5821df53 (diff)
downloadandroid_packages_apps_Trebuchet-27fcaa36f6db0825541b2be9c3875547f21f3131.zip
android_packages_apps_Trebuchet-27fcaa36f6db0825541b2be9c3875547f21f3131.tar.gz
android_packages_apps_Trebuchet-27fcaa36f6db0825541b2be9c3875547f21f3131.tar.bz2
Rebrand from Launcher3 to Trebuchet
Change-Id: If3af3a32db2281372dc1beb47e13a2ce0dc380af
-rw-r--r--Android.mk8
-rw-r--r--AndroidManifest.xml14
-rw-r--r--build.gradle8
-rw-r--r--res/mipmap-hdpi/ic_launcher_home.pngbin236 -> 4070 bytes
-rw-r--r--res/mipmap-mdpi/ic_launcher_home.pngbin216 -> 2503 bytes
-rw-r--r--res/mipmap-xhdpi/ic_launcher_home.pngbin235 -> 5549 bytes
-rw-r--r--res/mipmap-xxhdpi/ic_launcher_home.pngbin266 -> 8626 bytes
-rw-r--r--res/mipmap-xxxhdpi/ic_launcher_home.pngbin0 -> 11652 bytes
-rw-r--r--res/values/config.xml2
-rw-r--r--res/values/lineageos_strings.xml21
-rw-r--r--src_config/com/android/launcher3/config/ProviderConfig.java2
-rw-r--r--tests/Android.mk6
12 files changed, 43 insertions, 18 deletions
diff --git a/Android.mk b/Android.mk
index ad8ce02..c0cf938 100644
--- a/Android.mk
+++ b/Android.mk
@@ -47,8 +47,10 @@ LOCAL_AAPT_FLAGS := \
LOCAL_SDK_VERSION := current
LOCAL_MIN_SDK_VERSION := 21
-LOCAL_PACKAGE_NAME := Launcher3
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2
+LOCAL_PACKAGE_NAME := Trebuchet
+LOCAL_OVERRIDES_PACKAGES := Launcher3
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package org.lineageos.trebuchet
LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
@@ -67,7 +69,7 @@ LOCAL_PROTOC_OPTIMIZE_TYPE := nano
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/
LOCAL_MODULE_TAGS := optional
-LOCAL_MODULE := launcher_proto_lib
+LOCAL_MODULE := trebuchet_proto_lib
LOCAL_IS_HOST_MODULE := true
LOCAL_STATIC_JAVA_LIBRARIES := host-libprotobuf-java-nano
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 6c5990d..5f949d9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -32,13 +32,13 @@
name in the permissions. eq com.mypackage.permission.READ_SETTINGS
-->
<permission
- android:name="com.android.launcher3.permission.READ_SETTINGS"
+ android:name="org.lineageos.trebuchet.permission.READ_SETTINGS"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="normal"
android:label="@string/permlab_read_settings"
android:description="@string/permdesc_read_settings"/>
<permission
- android:name="com.android.launcher3.permission.WRITE_SETTINGS"
+ android:name="org.lineageos.trebuchet.permission.WRITE_SETTINGS"
android:permissionGroup="android.permission-group.SYSTEM_TOOLS"
android:protectionLevel="signatureOrSystem"
android:label="@string/permlab_write_settings"
@@ -46,8 +46,8 @@
<uses-permission android:name="com.android.launcher.permission.READ_SETTINGS" />
<uses-permission android:name="com.android.launcher.permission.WRITE_SETTINGS" />
- <uses-permission android:name="com.android.launcher3.permission.READ_SETTINGS" />
- <uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
+ <uses-permission android:name="org.lineageos.trebuchet.permission.READ_SETTINGS" />
+ <uses-permission android:name="org.lineageos.trebuchet.permission.WRITE_SETTINGS" />
<application
android:backupAgent="com.android.launcher3.LauncherBackupAgent"
@@ -104,10 +104,10 @@
-->
<provider
android:name="com.android.launcher3.LauncherProvider"
- android:authorities="com.android.launcher3.settings"
+ android:authorities="org.lineageos.trebuchet.settings"
android:exported="true"
- android:writePermission="com.android.launcher3.permission.WRITE_SETTINGS"
- android:readPermission="com.android.launcher3.permission.READ_SETTINGS" />
+ android:writePermission="org.lineageos.trebuchet.permission.WRITE_SETTINGS"
+ android:readPermission="org.lineageos.trebuchet.permission.READ_SETTINGS" />
<!-- ENABLE_FOR_TESTING
diff --git a/build.gradle b/build.gradle
index e103d79..9bf1d89 100644
--- a/build.gradle
+++ b/build.gradle
@@ -30,9 +30,9 @@ android {
}
productFlavors {
- aosp {
- applicationId 'com.android.launcher3'
- testApplicationId 'com.android.launcher3.tests'
+ trebuchet {
+ applicationId 'org.lineageos.trebuchet'
+ testApplicationId 'org.lineageos.trebuchet.tests'
}
}
sourceSets {
@@ -48,7 +48,7 @@ android {
manifest.srcFile "tests/AndroidManifest.xml"
}
- aosp {
+ trebuchet {
manifest.srcFile "AndroidManifest.xml"
}
}
diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png
index d068d92..251f09d 100644
--- a/res/mipmap-hdpi/ic_launcher_home.png
+++ b/res/mipmap-hdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
index 16c8ec2..c72f835 100644
--- a/res/mipmap-mdpi/ic_launcher_home.png
+++ b/res/mipmap-mdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
index 8b2671b..ea8eaeb 100644
--- a/res/mipmap-xhdpi/ic_launcher_home.png
+++ b/res/mipmap-xhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png
index 43d8b7d..0f3fb9a 100644
--- a/res/mipmap-xxhdpi/ic_launcher_home.png
+++ b/res/mipmap-xxhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_home.png b/res/mipmap-xxxhdpi/ic_launcher_home.png
new file mode 100644
index 0000000..a9f3a64
--- /dev/null
+++ b/res/mipmap-xxxhdpi/ic_launcher_home.png
Binary files differ
diff --git a/res/values/config.xml b/res/values/config.xml
index a942f02..94c4ab7 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -11,7 +11,7 @@
<!-- A string pointer to the original app name string. This allows derived projects to
easily override the app name without providing all translations -->
- <string name="derived_app_name" translatable="false">@string/app_name</string>
+ <string name="derived_app_name" translatable="false">@string/lineageos_app_name</string>
<!-- DragController -->
<item type="id" name="drag_event_parity" />
diff --git a/res/values/lineageos_strings.xml b/res/values/lineageos_strings.xml
new file mode 100644
index 0000000..bbc30c3
--- /dev/null
+++ b/res/values/lineageos_strings.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ Copyright (C) 2017 The LineageOS 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:xliff="urn:oasis:names:tc:xliff:document:1.2">
+ <!-- Application name -->
+ <string name="lineageos_app_name" translatable="false">Trebuchet</string>
+
+</resources>
diff --git a/src_config/com/android/launcher3/config/ProviderConfig.java b/src_config/com/android/launcher3/config/ProviderConfig.java
index 1d964b1..4e41d5d 100644
--- a/src_config/com/android/launcher3/config/ProviderConfig.java
+++ b/src_config/com/android/launcher3/config/ProviderConfig.java
@@ -18,7 +18,7 @@ package com.android.launcher3.config;
public class ProviderConfig {
- public static final String AUTHORITY = "com.android.launcher3.settings".intern();
+ public static final String AUTHORITY = "org.lineageos.trebuchet.settings".intern();
public static boolean IS_DOGFOOD_BUILD = true;
}
diff --git a/tests/Android.mk b/tests/Android.mk
index 61ee220..61de810 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -23,8 +23,10 @@ LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := current
-LOCAL_PACKAGE_NAME := Launcher3Tests
+LOCAL_PACKAGE_NAME := TrebuchetTests
-LOCAL_INSTRUMENTATION_FOR := Launcher3
+LOCAL_AAPT_FLAGS += --rename-manifest-package org.lineageos.trebuchet.tests
+
+LOCAL_INSTRUMENTATION_FOR := Trebuchet
include $(BUILD_PACKAGE)