(SHIFT) Branding

Change-Id: Iae2c9722e4b6ede55380f3160b2e88beba0f36e4
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/Android.bp b/Android.bp
index 177ba1c..cb4981e 100644
--- a/Android.bp
+++ b/Android.bp
@@ -194,7 +194,7 @@
 // Build rule for Launcher3 app.
 //
 android_app {
-    name: "Trebuchet",
+    name: "SHIFT-Home",
 
     static_libs: [
         "Launcher3CommonDepsLib",
@@ -223,6 +223,7 @@
     overrides: [
         "Home",
         "Launcher2",
+        "Trebuchet",
         "QuickSearchBox",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
@@ -327,7 +328,7 @@
 
 // Build rule for Launcher3 Go app for Android Go devices.
 android_app {
-    name: "TrebuchetGo",
+    name: "SHIFT-HomeGo",
 
     static_libs: ["Launcher3CommonDepsLib"],
 
@@ -354,6 +355,7 @@
         "Launcher3",
         "Launcher3QuickStep",
         "Launcher3Go",
+        "TrebuchetGo",
         "QuickSearchBox",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
@@ -372,7 +374,7 @@
 
 // Build rule for Quickstep app.
 android_app {
-    name: "TrebuchetQuickStep",
+    name: "SHIFT-HomeQuickStep",
 
     static_libs: ["Launcher3QuickStepLib"],
     optimize: {
@@ -390,6 +392,7 @@
         "Launcher2",
         "Launcher3",
         "Launcher3QuickStep",
+        "TrebuchetQuickStep",
         "QuickSearchBox",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
@@ -410,7 +413,7 @@
 
 // Build rule for Launcher3 Go app with quickstep for Android Go devices.
 android_app {
-    name: "TrebuchetQuickStepGo",
+    name: "SHIFT-HomeQuickStepGo",
 
     static_libs: [
         "SystemUI-statsd",
@@ -443,6 +446,7 @@
         "Launcher3",
         "Launcher3QuickStep",
         "Launcher3QuickStepGo",
+        "TrebuchetQuickStepGo",
         "QuickSearchBox",
     ],
     required: ["privapp_whitelist_com.android.launcher3"],
diff --git a/quickstep/res/values/strings.xml b/quickstep/res/values/strings.xml
index 530d369..6398d58 100644
--- a/quickstep/res/values/strings.xml
+++ b/quickstep/res/values/strings.xml
@@ -19,7 +19,7 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
 
     <!-- Application name -->
-    <string name="derived_app_name" translatable="false">@string/lineageos_app_name</string>
+    <string name="derived_app_name" translatable="false">@string/shiftos_app_name</string>
 
     <!-- Options for recent tasks -->
     <!-- Title for an option to keep an app pinned to the screen until it is unpinned -->
diff --git a/res/values/config.xml b/res/values/config.xml
index 52e35d6..14812a8 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -21,7 +21,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/lineageos_app_name</string>
+    <string name="derived_app_name" translatable="false">@string/shiftos_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/shift_strings.xml b/res/values/shift_strings.xml
new file mode 100644
index 0000000..dfd2988
--- /dev/null
+++ b/res/values/shift_strings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018-2019 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>
+    <!-- Application name -->
+    <string name="shiftos_app_name" translatable="false">SHIFT Home</string>
+</resources>
diff --git a/tests/Android.bp b/tests/Android.bp
index 6c0ec4a..89e38e6 100644
--- a/tests/Android.bp
+++ b/tests/Android.bp
@@ -112,11 +112,11 @@
     ],
     use_embedded_native_libs: false,
     compile_multilib: "both",
-    instrumentation_for: "Trebuchet",
+    instrumentation_for: "SHIFT-Home",
     manifest: "AndroidManifest.xml",
     platform_apis: true,
     test_config: "Launcher3Tests.xml",
-    data: [":Trebuchet"],
+    data: [":SHIFT-Home"],
     test_suites: ["general-tests"],
 }
 
@@ -130,4 +130,4 @@
     manifest: "shared/AndroidManifest.xml",
     sdk_version: "current",
     min_sdk_version: min_launcher3_sdk_version,
- }
\ No newline at end of file
+ }