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

Commit 58da63ee authored by David Liu's avatar David Liu
Browse files

[Settingslib][Expressive] Add SimpleProgressBar preference 

Bug:394699044
Test: manual + visual
Flag: EXEMPT resource only
Change-Id: I0cc53a1bea94334ac08a83e7d7389986e1e9a64d
parent dc393b4e

packages/SettingsLib/ProgressBar/Android.bp

+11 −2
Original line number Diff line number Diff line
@@ -10,10 +10,19 @@ package { 
android_library {

    name: "SettingsLibProgressBar",

    use_resource_processor: true,

    defaults: [

        "SettingsLintDefaults",

    ],



    srcs: ["src/**/*.java"],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

    resource_dirs: ["res"],



    static_libs: [

        "SettingsLibSettingsTheme",

        "androidx.preference_preference",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

    apex_available: [

packages/SettingsLib/ProgressBar/res/layout/settingslib_expressive_simple_progress_bar.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.

-->

<LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

    android:paddingStart="?android:attr/listPreferredItemPaddingStart"

    android:paddingVertical="@dimen/settingslib_expressive_space_extrasmall4">



    <com.google.android.material.progressindicator.LinearProgressIndicator

        android:theme="@style/Theme.Material3.DynamicColors.DayNight"

        android:id="@+id/settingslib_progress"

        android:layout_width="match_parent"

        android:max="100"

        style="@style/SettingsLibProgressBarStyle.Linear.Expressive"/>

</LinearLayout>

packages/SettingsLib/ProgressBar/src/com/android/settingslib/widget/SimpleProgressBarPreference.kt

0 → 100644
+59 −0
Original line number Diff line number Diff line 
/*

 * 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.

 */

package com.android.settingslib.widget



import android.content.Context

import android.util.AttributeSet

import android.widget.ProgressBar

import androidx.preference.Preference

import androidx.preference.PreferenceViewHolder

import com.android.settingslib.widget.progressbar.R



/**

 * The SimpleProgressBarPreference shows a progress style preference. Support to show the progress

 * set with [setProgress].

 */

class SimpleProgressBarPreference @JvmOverloads constructor(

    context: Context,

    attrs: AttributeSet? = null,

    defStyleAttr: Int = 0,

    defStyleRes: Int = 0

) : Preference(context, attrs, defStyleAttr, defStyleRes), GroupSectionDividerMixin {



    private var progress: Int = 0



    init {

        layoutResource = R.layout.settingslib_expressive_simple_progress_bar

    }



    override fun onBindViewHolder(holder: PreferenceViewHolder) {

        super.onBindViewHolder(holder)

        holder.isDividerAllowedBelow = false

        holder.isDividerAllowedAbove = false



        val progressBar = holder.findViewById(R.id.settingslib_progress) as? ProgressBar

        progressBar?.progress = this.progress

    }



    /**

     * Set the progress of the progress bar.

     *

     * @param progress The progress of the progress bar.

     */

    fun setProgress(progress: Int) {

        this.progress = progress

    }

}

packages/SettingsLib/SettingsTheme/res/values/styles_expressive.xml

+11 −1
Original line number Diff line number Diff line
@@ -288,4 +288,14 @@ 
        <item name="android:textDirection">locale</item>

        <item name="android:textAppearance">@style/TextAppearance.SettingsLib.TitleLarge.Emphasized</item>

    </style>



    <style name="SettingsLibProgressBarStyle.Linear.Expressive"

        parent="Widget.Material3.LinearProgressIndicator">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">@dimen/settingslib_expressive_space_medium3</item>

        <item name="trackThickness">@dimen/settingslib_expressive_space_medium3</item>

        <item name="trackColor">@color/settingslib_materialColorSecondaryContainer</item>

        <item name="trackCornerRadius">@dimen/settingslib_expressive_radius_large1</item>

        <item name="trackInnerCornerRadius">@dimen/settingslib_expressive_radius_extrasmall1</item>

    </style>

</resources>