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

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

Snap for 13158768 from 0672209b to 25Q2-release 

Change-Id: Ief4c3bdca94c15d09773899343c70b9f5bb3eac4
parents 8c50e9bf 0672209b

PREUPLOAD.cfg

+1 −1
Original line number Diff line number Diff line 
[Hook Scripts]

checkstyle_hook = ${REPO_ROOT}/prebuilts/checkstyle/checkstyle.py --sha ${PREUPLOAD_COMMIT}



ktlint_hook = ${REPO_ROOT}/prebuilts/ktlint/ktlint.py -f ${PREUPLOAD_FILES}

flags.aconfig

+10 −5
Original line number Diff line number Diff line
@@ -17,31 +17,35 @@ flag { 
}



flag {

    name: "zip_ng"

    name: "zip_ng_ro"

    namespace: "documentsui"

    description: "Enables the next generation ZIP functionality."

    bug: "382550591"

    is_fixed_read_only: true

}



flag {

    name: "desktop_file_handling"

    name: "desktop_file_handling_ro"

    namespace: "documentsui"

    description: "Enables desktop file handling."

    bug: "381778967"

    is_fixed_read_only: true

}



flag {

    name: "visual_signals"

    name: "visual_signals_ro"

    namespace: "documentsui"

    description: "Enables in-app progress display of file operations"

    bug: "378011512"

    is_fixed_read_only: true

}



flag {

    name: "hide_roots_on_desktop"

    name: "hide_roots_on_desktop_ro"

    namespace: "documentsui"

    description: "Enables the hiding of the Images/Videos/Audio/Documents roots on desktop."

    bug: "381959330"

    is_fixed_read_only: true

}



flag {
@@ -53,8 +57,9 @@ flag { 
}



flag {

    name: "use_peek_preview"

    name: "use_peek_preview_ro"

    namespace: "documentsui"

    description: "Enables the Peek previewing capability as a substitute for the Inspector."

    bug: "373242058"

    is_fixed_read_only: true

}

proguard.flags

+5 −0
Original line number Diff line number Diff line
@@ -204,3 +204,8 @@ 


# Keep Apache Commons Compress classes

-keep class org.apache.commons.compress.** { *; }



# This is used in the unit test

-keep class com.google.android.material.chip.Chip {

  public android.graphics.drawable.Drawable getChipIcon();

}
 
 No newline at end of file

res/flag(com.android.documentsui.flags.use_material3)/color/item_action_icon.xml

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
     limitations under the License.

-->



<!-- TODO(b/379776735): remove this file after M3 uplift -->

<!-- TODO(b/379776735): remove this file after use_material3 flag is launched. -->

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

    <item android:state_enabled="false"

        android:alpha="@dimen/root_icon_disabled_alpha"

res/flag(com.android.documentsui.flags.use_material3)/color/list_item_ripple_color.xml

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

  -->



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

    <item android:state_enabled="false" android:color="@android:color/transparent" />

    <item android:state_selected="true" android:alpha="@dimen/ripple_overlay_alpha"

        android:color="?attr/colorOnPrimaryContainer" />

    <item android:alpha="@dimen/ripple_overlay_alpha"

        android:color="?attr/colorOnSurface" />

</selector>