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

Commit d0266888 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Snap for 12969164 from 50cee5bf to 25Q2-release 

Change-Id: Ie34d2da1f3bed1d1d49103cb9e4ca69358e8dcc8
parents 66c95992 50cee5bf

aconfig/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ java_aconfig_library { 
aconfig_declarations {

    name: "settings_connectivity_flags",

    package: "com.android.settings.connectivity",

    container: "system",

    container: "system_ext",

    srcs: ["connectivity/*.aconfig"],

}

aconfig/connectivity/settings_ethernet_declarations.aconfig

+1 −1
Original line number Diff line number Diff line 
package: "com.android.settings.connectivity"

container: "system"

container: "system_ext"



flag {

  name: "ethernet_settings"

res/drawable/display_block_selection_marker_background.xml

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

  ~ Copyright (C) 2025 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.

  ~

  -->



<layer-list xmlns:android="http://schemas.android.com/apk/res/android">



    <!-- Inner border -->

    <item>

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/display_topology_background_color"

                android:width="@dimen/display_block_padding" />

            <corners android:radius="@dimen/display_block_corner_radius" />

        </shape>

    </item>



    <!-- Outer border -->

    <item>

        <shape android:shape="rectangle">

            <stroke

                android:color="@color/system_secondary"

                android:width="@dimen/display_block_highlight_width" />

            <corners android:radius="@dimen/display_block_corner_radius" />

        </shape>

    </item>

</layer-list>

res/drawable/display_block_unselected_background.xml

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

  ~ Copyright (C) 2025 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.

  ~

  -->



<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <stroke

        android:color="@color/display_topology_background_color"

        android:width="@dimen/display_block_padding" />

    <corners android:radius="@dimen/display_block_corner_radius" />

</shape>

res/values-night/colors.xml

+1 −0
Original line number Diff line number Diff line
@@ -82,5 +82,6 @@ 


    <!-- Connected displays -->

    <color name="display_topology_background_color">@color/settingslib_color_charcoal</color>

    <color name="system_secondary">@android:color/system_secondary_dark</color>

</resources>