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

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

Snap for 13241370 from 158549ab to 25Q2-release 

Change-Id: I37bafce136d2bf56eab1e8499ee522aae41a46c4
parents 93278a6b 158549ab

aconfig/catalyst/display.aconfig

+42 −0
Original line number Diff line number Diff line
@@ -8,6 +8,13 @@ flag { 
  bug: "323791114"

}



flag {

  name: "catalyst_display_settings_screen_25q3"

  namespace: "android_settings"

  description: "Flag for Display in 25Q3"

  bug: "352179685"

}



flag {

  name: "catalyst_screen_timeout"

  namespace: "android_settings"
@@ -35,3 +42,38 @@ flag { 
  description: "Flag for Adaptive brightness"

  bug: "323791114"

}



flag {

  name: "catalyst_night_display"

  namespace: "android_settings"

  description: "Flag for Night Light in 25Q3"

  bug: "352179685"

}



flag {

  name: "catalyst_color_mode"

  namespace: "android_settings"

  description: "Flag for Colors in 25Q3"

  bug: "352179685"

}



flag {

  name: "catalyst_gesture_system_navigation_input_summary"

  namespace: "android_settings"

  description: "Flag for Navigation mode in 25Q3"

  bug: "352179685"

}



flag {

  name: "catalyst_screen_resolution"

  namespace: "android_settings"

  description: "Flag for Screen resolution in 25Q3"

  bug: "352179685"

}



flag {

  name: "catalyst_auto_rotate"

  namespace: "android_settings"

  description: "Flag for Auto-rotate screen in 25Q3"

  bug: "352179685"

}

aconfig/catalyst/network_and_internet.aconfig

+7 −0
Original line number Diff line number Diff line
@@ -29,6 +29,13 @@ flag { 
  bug: "323791114"

}



flag {

  name: "catalyst_tether_settings_25q3"

  namespace: "android_settings"

  description: "Flag for widgets inside Hotspot & tethering for 25q3 release"

  bug: "352179685"

}



flag {

  name: "catalyst_adaptive_connectivity"

  namespace: "android_settings"

aconfig/catalyst/sound_screen.aconfig

+19 −5
Original line number Diff line number Diff line
@@ -4,27 +4,41 @@ container: "system_ext" 
flag {

    name: "catalyst_sound_screen"

    namespace: "android_settings"

    description: "Flag for sound and vibration page"

    description: "Flag for Sound & vibration"

    bug: "323791114"

}



flag {

    name: "catalyst_sound_screen_25q3"

    namespace: "android_settings"

    description: "Flag for Sound & vibration in 25Q3"

    bug: "352179685"

}



flag {

    name: "catalyst_media_controls"

    namespace: "android_settings"

    description: "Flag for media page"

    description: "Flag for Media"

    bug: "337243570"

}



flag {

    name: "catalyst_vibration_intensity_screen"

    namespace: "android_settings"

    description: "Flag for vibration and haptics page"

    description: "Flag for Vibration & haptics"

    bug: "323791114"

}



flag {

    name: "catalyst_vibration_screen"

    namespace: "android_settings"

    description: "Flag for vibration and haptics full page migration"

    description: "Flag for Vibration & haptics full page migration"

    bug: "323791114"

}



flag {

    name: "catalyst_spatial_audio"

    namespace: "android_settings"

    description: "Flag for Spatial audio in 25Q3"

    bug: "352179685"

}

aconfig/settings_flag_declarations.aconfig

+10 −0
Original line number Diff line number Diff line
@@ -80,3 +80,13 @@ flag { 
    purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "extended_screenshots_exclude_nested_scrollables"

  namespace: "systemui"

  description: "Sets a flag on the main scrollable container to exclude any nested scrollable views as potential targets for extended screenshots."

  bug: "399810823"

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}

res/drawable/bluetooth_details_banner_background.xml

0 → 100644
+32 −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.

  -->



<ripple xmlns:android="http://schemas.android.com/apk/res/android"

    android:color="?android:colorControlHighlight">

    <item

        android:start="16dp"

        android:end="16dp"

        android:top="16dp"

        android:bottom="16dp">

        <shape android:shape="rectangle">

            <solid

                android:color="@color/settingslib_materialColorSurfaceVariant" />

            <corners

                android:radius="28dp" />

        </shape>

    </item>

</ripple>
 
 No newline at end of file