Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a15b4b93 authored by Asher Simonds's avatar Asher Simonds Committed by Michael Bestas
Browse files

Trebuchet: adaptive icon 



Squashed with the following:

Author: Bruno Martins <bgcngm@gmail.com>
Date:   Sat Oct 5 23:00:56 2019 +0100

    Trebuchet: Bump min SDK to 26 as required for adaptive icons

    Addresses the following compilation error:

      packages/apps/Trebuchet/res/mipmap-anydpi/ic_launcher.xml: error: <adaptive-icon> elements require a sdk version of at least 26.

    Change-Id: I5684e917ef0b691d99e2e59fd742d7570dfd1007

Change-Id: I84662d7cb35ed751c61c6223dc02f256f5ab3311
Signed-off-by: default avatarJoey <joey@lineageos.org>
parent 589bcaed

Android.mk

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)/protos/ --proto_path=$(LOCAL_PA 
LOCAL_PROTO_JAVA_OUTPUT_PARAMS := enum_style=java



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 26

LOCAL_MODULE := Launcher3CommonDepsLib

LOCAL_PRIVILEGED_MODULE := true

LOCAL_MANIFEST_FILE := AndroidManifest-common.xml
@@ -77,7 +77,7 @@ LOCAL_PROGUARD_FLAG_FILES := proguard.flags 
LOCAL_PROGUARD_ENABLED := disabled



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := Trebuchet

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true
@@ -108,7 +108,7 @@ LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/go/res 
LOCAL_PROGUARD_FLAG_FILES := proguard.flags



LOCAL_SDK_VERSION := current

LOCAL_MIN_SDK_VERSION := 21

LOCAL_MIN_SDK_VERSION := 26

LOCAL_PACKAGE_NAME := TrebuchetGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

AndroidManifest.xml

+4 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    package="com.android.launcher3">

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="25"/>

    <uses-sdk android:targetSdkVersion="29" android:minSdkVersion="26"/>

    <!--

    Manifest entries specific to Launcher3. This is merged with AndroidManifest-common.xml.

    Refer comments around specific entries on how to extend individual components.
@@ -32,13 +32,14 @@ 
        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:icon="@drawable/ic_launcher_home"

        android:icon="@mipmap/ic_launcher"

        android:label="@string/derived_app_name"

        android:theme="@style/AppTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:supportsRtl="true"

        tools:ignore="GoogleAppIndexingWarning">

        tools:ignore="GoogleAppIndexingWarning"

        tools:replace="android:icon">



        <!--

        Main launcher activity. When extending only change the name, and keep all the

quickstep/AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -37,12 +37,13 @@ 
        android:fullBackupOnly="true"

        android:fullBackupContent="@xml/backupscheme"

        android:hardwareAccelerated="true"

        android:icon="@drawable/ic_launcher_home"

        android:icon="@mipmap/ic_launcher"

        android:label="@string/derived_app_name"

        android:theme="@style/AppTheme"

        android:largeHeap="@bool/config_largeHeap"

        android:restoreAnyVersion="true"

        android:supportsRtl="true" >

        android:supportsRtl="true"

        tools:replace="android:icon">



        <service

            android:name="com.android.quickstep.TouchInteractionService"

res/mipmap-anydpi/ic_launcher.xml

0 → 100644
+20 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (c) 2018 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.

-->

<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

    <background android:drawable="@mipmap/ic_background"/>

    <foreground android:drawable="@mipmap/ic_foreground"/>

</adaptive-icon>

res/mipmap-hdpi/ic_background.png

0 → 100644
+5.99 KiB
Loading image diff...