diff options
author | cretin45 <cretin45@gmail.com> | 2015-11-24 14:39:53 -0800 |
---|---|---|
committer | Michael Bestas <mkbestas@lineageos.org> | 2017-08-27 15:13:01 +0300 |
commit | 955320347454f06b2fb3c1f18ab491fc13b629c5 (patch) | |
tree | 03ec8bbb4926f5ed8cf82f444f6265edeb05f51c | |
parent | ed358c89c81370019215d9e81748afca877396e5 (diff) | |
download | android_packages_apps_Trebuchet-955320347454f06b2fb3c1f18ab491fc13b629c5.tar.gz android_packages_apps_Trebuchet-955320347454f06b2fb3c1f18ab491fc13b629c5.tar.bz2 android_packages_apps_Trebuchet-955320347454f06b2fb3c1f18ab491fc13b629c5.zip |
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
-rw-r--r-- | Android.mk | 8 | ||||
-rw-r--r-- | AndroidManifest.xml | 17 | ||||
-rw-r--r-- | build.gradle | 8 | ||||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_home.png | bin | 236 -> 4070 bytes | |||
-rw-r--r-- | res/mipmap-hdpi/ic_launcher_home_foreground.png | bin | 236 -> 4070 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_home.png | bin | 216 -> 2503 bytes | |||
-rw-r--r-- | res/mipmap-mdpi/ic_launcher_home_foreground.png | bin | 339 -> 2503 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_home.png | bin | 235 -> 5549 bytes | |||
-rw-r--r-- | res/mipmap-xhdpi/ic_launcher_home_foreground.png | bin | 357 -> 5549 bytes | |||
-rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_home.png | bin | 266 -> 8626 bytes | |||
-rw-r--r-- | res/mipmap-xxhdpi/ic_launcher_home_foreground.png | bin | 485 -> 8626 bytes | |||
-rw-r--r-- | res/mipmap-xxxhdpi/ic_launcher_home.png | bin | 0 -> 11652 bytes | |||
-rw-r--r-- | res/mipmap-xxxhdpi/ic_launcher_home_foreground.png | bin | 0 -> 11652 bytes | |||
-rw-r--r-- | res/values/config.xml | 2 | ||||
-rw-r--r-- | res/values/lineageos_strings.xml | 21 | ||||
-rw-r--r-- | src_config/com/android/launcher3/config/ProviderConfig.java | 2 | ||||
-rw-r--r-- | tests/Android.mk | 6 |
17 files changed, 46 insertions, 18 deletions
diff --git a/Android.mk b/Android.mk index 713d0828a..5e33159be 100644 --- a/Android.mk +++ b/Android.mk @@ -49,9 +49,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 @@ -71,7 +73,7 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ 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 bcb522b21..50de7de51 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" @@ -106,10 +109,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 9c71693f7..11d30d1e1 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' } } sourceSets { @@ -50,7 +50,7 @@ android { manifest.srcFile "tests/AndroidManifest-common.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 Binary files differindex d068d9236..251f09d6d 100644 --- a/res/mipmap-hdpi/ic_launcher_home.png +++ b/res/mipmap-hdpi/ic_launcher_home.png diff --git a/res/mipmap-hdpi/ic_launcher_home_foreground.png b/res/mipmap-hdpi/ic_launcher_home_foreground.png Binary files differindex d068d9236..251f09d6d 100644 --- a/res/mipmap-hdpi/ic_launcher_home_foreground.png +++ b/res/mipmap-hdpi/ic_launcher_home_foreground.png diff --git a/res/mipmap-mdpi/ic_launcher_home.png b/res/mipmap-mdpi/ic_launcher_home.png Binary files differindex 16c8ec2e5..c72f83543 100644 --- a/res/mipmap-mdpi/ic_launcher_home.png +++ b/res/mipmap-mdpi/ic_launcher_home.png diff --git a/res/mipmap-mdpi/ic_launcher_home_foreground.png b/res/mipmap-mdpi/ic_launcher_home_foreground.png Binary files differindex 0ed9f4d81..c72f83543 100644 --- a/res/mipmap-mdpi/ic_launcher_home_foreground.png +++ b/res/mipmap-mdpi/ic_launcher_home_foreground.png diff --git a/res/mipmap-xhdpi/ic_launcher_home.png b/res/mipmap-xhdpi/ic_launcher_home.png Binary files differindex 8b2671bdd..ea8eaeb1a 100644 --- a/res/mipmap-xhdpi/ic_launcher_home.png +++ b/res/mipmap-xhdpi/ic_launcher_home.png diff --git a/res/mipmap-xhdpi/ic_launcher_home_foreground.png b/res/mipmap-xhdpi/ic_launcher_home_foreground.png Binary files differindex 7a9daf5bf..ea8eaeb1a 100644 --- a/res/mipmap-xhdpi/ic_launcher_home_foreground.png +++ b/res/mipmap-xhdpi/ic_launcher_home_foreground.png diff --git a/res/mipmap-xxhdpi/ic_launcher_home.png b/res/mipmap-xxhdpi/ic_launcher_home.png Binary files differindex 43d8b7d88..0f3fb9a2c 100644 --- a/res/mipmap-xxhdpi/ic_launcher_home.png +++ b/res/mipmap-xxhdpi/ic_launcher_home.png diff --git a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png Binary files differindex 03b493e4a..0f3fb9a2c 100644 --- a/res/mipmap-xxhdpi/ic_launcher_home_foreground.png +++ b/res/mipmap-xxhdpi/ic_launcher_home_foreground.png diff --git a/res/mipmap-xxxhdpi/ic_launcher_home.png b/res/mipmap-xxxhdpi/ic_launcher_home.png Binary files differnew file mode 100644 index 000000000..a9f3a64da --- /dev/null +++ b/res/mipmap-xxxhdpi/ic_launcher_home.png diff --git a/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png b/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png Binary files differnew file mode 100644 index 000000000..a9f3a64da --- /dev/null +++ b/res/mipmap-xxxhdpi/ic_launcher_home_foreground.png diff --git a/res/values/config.xml b/res/values/config.xml index 5a8da7618..2fcb96faf 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> <!-- Values for icon shape overrides. These should correspond to entries defined in icon_shape_override_paths_names --> diff --git a/res/values/lineageos_strings.xml b/res/values/lineageos_strings.xml new file mode 100644 index 000000000..bbc30c371 --- /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 491fa657a..367320b9c 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 final boolean IS_DOGFOOD_BUILD = true; } diff --git a/tests/Android.mk b/tests/Android.mk index c7d473714..a4bc2e582 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -29,8 +29,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) |