From ab50974aa2e19ecc482d6236c1d81dd1afaeb743 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Tue, 24 Nov 2015 14:39:53 -0800
Subject: We shall call it Trebuchet

Change-Id: I068d7e025bb01fd4216be3ffcf3cdfd3285be9da

Trebuchet: lineage launcher icon

Change-Id: Ibf4e1add2f9dc88907430070bbbf74751dec2070

Rename permissions as suggested in AndroidManifest

* Avoid conflicts with different launchers

Change-Id: I0560c2ea1a82cb4f58074d31ca6f12518ac09ea7

Finalize rebranding from Launcher3 to Trebuchet

Change-Id: If3af3a32db2281372dc1beb47e13a2ce0dc380af
---
 Android.mk                                         |   8 +++++---
 AndroidManifest.xml                                |  17 ++++++++++-------
 build.gradle                                       |   8 ++++----
 res/mipmap-hdpi/ic_launcher_home.png               | Bin 236 -> 4070 bytes
 res/mipmap-hdpi/ic_launcher_home_foreground.png    | Bin 236 -> 4070 bytes
 res/mipmap-mdpi/ic_launcher_home.png               | Bin 216 -> 2503 bytes
 res/mipmap-mdpi/ic_launcher_home_foreground.png    | Bin 339 -> 2503 bytes
 res/mipmap-xhdpi/ic_launcher_home.png              | Bin 235 -> 5549 bytes
 res/mipmap-xhdpi/ic_launcher_home_foreground.png   | Bin 357 -> 5549 bytes
 res/mipmap-xxhdpi/ic_launcher_home.png             | Bin 266 -> 8626 bytes
 res/mipmap-xxhdpi/ic_launcher_home_foreground.png  | Bin 485 -> 8626 bytes
 res/mipmap-xxxhdpi/ic_launcher_home.png            | Bin 0 -> 11652 bytes
 res/mipmap-xxxhdpi/ic_launcher_home_foreground.png | Bin 0 -> 11652 bytes
 res/values/config.xml                              |   2 +-
 res/values/lineage_strings.xml                     |  21 +++++++++++++++++++++
 src_config/com/android/launcher3/BuildConfig.java  |   2 +-
 tests/Android.mk                                   |   6 ++++--
 17 files changed, 46 insertions(+), 18 deletions(-)
 create mode 100644 res/mipmap-xxxhdpi/ic_launcher_home.png
 create mode 100644 res/mipmap-xxxhdpi/ic_launcher_home_foreground.png
 create mode 100644 res/values/lineage_strings.xml

diff --git a/Android.mk b/Android.mk
index d41e184f0..084eaa516 100644
--- a/Android.mk
+++ b/Android.mk
@@ -52,9 +52,11 @@ LOCAL_AAPT_FLAGS := \
 
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 21
-LOCAL_PACKAGE_NAME := Launcher3
+LOCAL_PACKAGE_NAME := Trebuchet
 LOCAL_PRIVILEGED_MODULE := true
-LOCAL_OVERRIDES_PACKAGES := Home Launcher2
+LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
+
+LOCAL_AAPT_FLAGS += --rename-manifest-package org.lineageos.trebuchet
 
 LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 
@@ -125,7 +127,7 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PA
 LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java
 
 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 23bddf62f..a86d1506b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -20,6 +20,9 @@
 <manifest
     xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.launcher3">
+
+    <original-package android:name="com.cyanogenmod.trebuchet" />
+
     <uses-sdk android:targetSdkVersion="23" android:minSdkVersion="21"/>
     <!--
     Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.
@@ -32,13 +35,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 +49,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"
@@ -107,10 +110,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 886ccace6..0883f87b1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -31,9 +31,9 @@ android {
     }
 
     productFlavors {
-        aosp {
-            applicationId 'com.android.launcher3'
-            testApplicationId 'com.android.launcher3.tests'
+        trebuchet {
+            applicationId 'org.lineageos.trebuchet'
+            testApplicationId 'org.lineageos.trebuchet.tests'
         }
 
         l3go {
@@ -58,7 +58,7 @@ android {
             manifest.srcFile "tests/AndroidManifest-common.xml"
         }
 
-        aosp {
+        trebuchet {
             java.srcDirs = ['src_flags']
             manifest.srcFile "AndroidManifest.xml"
         }
diff --git a/res/mipmap-hdpi/ic_launcher_home.png b/res/mipmap-hdpi/ic_launcher_home.png
index d068d9236..251f09d6d 100644
Binary files a/res/mipmap-hdpi/ic_launcher_home.png and b/res/mipmap-hdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-hdpi/ic_launcher_home_foreground.png b/res/mipmap-hdpi/ic_launcher_home_foreground.png
index d068d9236..251f09d6d 100644
Binary files a/res/mipmap-hdpi/ic_launcher_home_foreground.png and b/res/mipmap-hdpi/ic_launcher_home_foreground.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png
index 16c8ec2e5..c72f83543 100644
Binary files a/res/mipmap-mdpi/ic_launcher_home.png and b/res/mipmap-mdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-mdpi/ic_launcher_home_foreground.png b/res/mipmap-mdpi/ic_launcher_home_foreground.png
index 0ed9f4d81..c72f83543 100644
Binary files a/res/mipmap-mdpi/ic_launcher_home_foreground.png and b/res/mipmap-mdpi/ic_launcher_home_foreground.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png
index 8b2671bdd..ea8eaeb1a 100644
Binary files a/res/mipmap-xhdpi/ic_launcher_home.png and b/res/mipmap-xhdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-xhdpi/ic_launcher_home_foreground.png b/res/mipmap-xhdpi/ic_launcher_home_foreground.png
index 7a9daf5bf..ea8eaeb1a 100644
Binary files a/res/mipmap-xhdpi/ic_launcher_home_foreground.png and b/res/mipmap-xhdpi/ic_launcher_home_foreground.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png
index 43d8b7d88..0f3fb9a2c 100644
Binary files a/res/mipmap-xxhdpi/ic_launcher_home.png and b/res/mipmap-xxhdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png
index 03b493e4a..0f3fb9a2c 100644
Binary files a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png and b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_home.png b/res/mipmap-xxxhdpi/ic_launcher_home.png
new file mode 100644
index 000000000..a9f3a64da
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_home.png differ
diff --git a/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png
new file mode 100644
index 000000000..a9f3a64da
Binary files /dev/null and b/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png differ
diff --git a/res/values/config.xml b/res/values/config.xml
index 10b612ba2..996e831f3 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -13,7 +13,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>
 
     <!-- String representing the intent for search on the apps market. To specify a query, add
     q=<query> to the data to the intent -->
diff --git a/res/values/lineage_strings.xml b/res/values/lineage_strings.xml
new file mode 100644
index 000000000..bbc30c371
--- /dev/null
+++ b/res/values/lineage_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/BuildConfig.java b/src_config/com/android/launcher3/BuildConfig.java
index 4df75a1a1..c8189c480 100644
--- a/src_config/com/android/launcher3/BuildConfig.java
+++ b/src_config/com/android/launcher3/BuildConfig.java
@@ -20,5 +20,5 @@ package com.android.launcher3;
  * Config file used by Make. This file is automatically generated when using gradle.
  */
 public class BuildConfig {
-    public static final String APPLICATION_ID = "com.android.launcher3";
+    public static final String APPLICATION_ID = "org.lineageos.trebuchet";
 }
diff --git a/tests/Android.mk b/tests/Android.mk
index e8797a75c..14ea1ec70 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -25,8 +25,10 @@ LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml
 LOCAL_SDK_VERSION := current
 LOCAL_MIN_SDK_VERSION := 21
 
-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)
-- 
cgit v1.2.3