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

Commit fd3cf87c authored by /e/ robot's avatar /e/ robot
Browse files

Merge remote-tracking branch 'origin/lineage-17.1' into v1-q

parents 40a2847b 09bdc8ed

Android.bp

0 → 100644
+63 −0
Original line number Diff line number Diff line 
//

// Copyright (C) 2020 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.

//



android_app {

    name: "Eleven",



    srcs: [

        "src/org/lineageos/eleven/IElevenService.aidl",

        "src/**/*.java",

        "src_aosp/**/*.java",

    ],



    resource_dirs: ["res"],



    static_libs: [

        "androidx.appcompat_appcompat",

        "androidx.cardview_cardview",

        "androidx-constraintlayout_constraintlayout",

        "androidx.core_core",

        "androidx.legacy_legacy-support-v4",

        "androidx.palette_palette",

        "androidx.preference_preference",

        "androidx.recyclerview_recyclerview",

    ],



    overrides: ["Music"],



    sdk_version: "current",



    privileged: true,



    product_specific: true,



    jni_libs: ["librsjni"],



    optimize: {

        proguard_flags_files: ["proguard.cfg"],

        enabled: false,

    },



    required: ["privapp_whitelist_org.lineageos.eleven"],

}



prebuilt_etc {

    name: "privapp_whitelist_org.lineageos.eleven",

    product_specific: true,

    src: "privapp_whitelist_org.lineageos.eleven.xml",

    sub_dir: "permissions",

    filename_from_src: true,

}

Android.mk

deleted100644 → 0
+0 −49
Original line number Diff line number Diff line 
LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)



LOCAL_MODULE_TAGS := optional



LOCAL_SRC_FILES := src/org/lineageos/eleven/IElevenService.aidl

LOCAL_SRC_FILES += $(call all-java-files-under, src)

LOCAL_SRC_FILES += $(call all-java-files-under, src_aosp)



LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, res)



LOCAL_STATIC_ANDROID_LIBRARIES := \

    androidx.appcompat_appcompat \

    androidx.cardview_cardview \

    androidx-constraintlayout_constraintlayout \

    androidx.core_core \

    androidx.legacy_legacy-support-v4 \

    androidx.palette_palette \

    androidx.preference_preference \

    androidx.recyclerview_recyclerview



LOCAL_USE_AAPT2 := true



LOCAL_PACKAGE_NAME := Eleven

LOCAL_OVERRIDES_PACKAGES := Music



LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_PRIVILEGED_MODULE := true



LOCAL_PRODUCT_MODULE := true



LOCAL_JNI_SHARED_LIBRARIES := librsjni



LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.cfg

LOCAL_PROGUARD_ENABLED := disabled



LOCAL_REQUIRED_MODULES := privapp_whitelist_org.lineageos.eleven.xml



include $(BUILD_PACKAGE)



include $(CLEAR_VARS)

LOCAL_MODULE := privapp_whitelist_org.lineageos.eleven.xml

LOCAL_MODULE_CLASS := ETC

LOCAL_MODULE_TAGS := optional

LOCAL_MODULE_PATH := $(TARGET_OUT_PRODUCT_ETC)/permissions

LOCAL_PRODUCT_MODULE := true

LOCAL_SRC_FILES := $(LOCAL_MODULE)

include $(BUILD_PREBUILT)

AndroidManifest-gradle.xml

+2 −3
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 Andrew Neal

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2019 The LineageOS Project

     Copyright (C) 2019-2020 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.
@@ -24,8 +24,6 @@ 
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <!-- Used to check for a network connection -->

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <!-- Used to download images -->

    <uses-permission android:name="android.permission.INTERNET" />

    <!-- Used to keep the service running when the phone sleeps -->

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <!-- The main service uses a sticky broadcast -->
@@ -55,6 +53,7 @@ 
        android:name="org.lineageos.eleven.ElevenApplication"

        android:allowBackup="true"

        android:allowTaskReparenting="true"

        android:requestLegacyExternalStorage="true"

        android:hardwareAccelerated="@bool/config_hardwareAccelerated"

        android:appCategory="audio"

        android:icon="@mipmap/ic_launcher"

AndroidManifest.xml

+3 −4
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 Andrew Neal

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2019 The LineageOS Project

     Copyright (C) 2019-2020 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.
@@ -24,7 +24,7 @@ 


    <uses-sdk

        android:minSdkVersion="26"

        android:targetSdkVersion="28" />

        android:targetSdkVersion="29" />



    <original-package android:name="com.cyanogenmod.eleven" />
@@ -32,8 +32,6 @@ 
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

    <!-- Used to check for a network connection -->

    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

    <!-- Used to download images -->

    <uses-permission android:name="android.permission.INTERNET" />

    <!-- Used to keep the service running when the phone sleeps -->

    <uses-permission android:name="android.permission.WAKE_LOCK" />

    <!-- The main service uses a sticky broadcast -->
@@ -63,6 +61,7 @@ 
        android:name="org.lineageos.eleven.ElevenApplication"

        android:allowBackup="true"

        android:allowTaskReparenting="true"

        android:requestLegacyExternalStorage="true"

        android:hardwareAccelerated="@bool/config_hardwareAccelerated"

        android:appCategory="audio"

        android:icon="@mipmap/ic_launcher"

res/values/dimens.xml

+2 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2012 Andrew Neal

     Copyright (C) 2014 The CyanogenMod Project

     Copyright (C) 2020 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.
@@ -167,7 +168,7 @@ 
    <dimen name="color_scheme_dialog_row_padding">8.0dip</dimen>



    <!-- Sliding Panel -->

    <dimen name="sliding_panel_indicator_height">20.0dip</dimen>

    <dimen name="sliding_panel_indicator_height">60.0dip</dimen>

    <dimen name="sliding_panel_shadow_height">0.0dip</dimen>



    <!-- Header Bar -->