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

Commit cc1ca999 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "New SettingsLibColor" into main

parents 765ad192 b9b2b170
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
build
+15 −0
Original line number Diff line number Diff line
package {
    default_applicable_licenses: ["frameworks_base_license"],
}

android_library {
    name: "SettingsLibColor",
    use_resource_processor: true,
    sdk_version: "current",
    min_sdk_version: "28",

    apex_available: [
        "//apex_available:platform",
        "com.android.permission",
    ],
}
+18 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2023 The Android Open Source 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.
-->

<manifest package="com.android.settingslib.color" />
+30 −0
Original line number Diff line number Diff line
/*
 * Copyright 2023 The Android Open Source 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.
 */

plugins {
    alias(libs.plugins.android.library)
}

android {
    namespace = "com.android.settingslib.color"

    sourceSets {
        sourceSets.getByName("main") {
            res.setSrcDirs(listOf("res"))
            manifest.srcFile("AndroidManifest.xml")
        }
    }
}
+0 −2
Original line number Diff line number Diff line
@@ -16,8 +16,6 @@
  -->

<resources>
    <color name="settingslib_protection_color">@android:color/white</color>

    <!-- Dynamic colors-->
    <color name="settingslib_color_blue600">#1a73e8</color>
    <color name="settingslib_color_blue400">#669df6</color>
Loading