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

Commit 2c8d05c7 authored by Joel Galenson's avatar Joel Galenson
Browse files

Add horizontal progress bar SettingsLib library.

Move the logic for a horizontal progress bar into its own library in
SettingsLib.

Bug: 123538370
Test: Code using this library still works.
Change-Id: I700c5e481bf32077e19e606d797e5b698b2cc33a
parent d224e240
Loading
Loading
Loading
Loading
+1 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,7 @@ android_library {
        "SettingsLibActionButtonsPreference",
        "SettingsLibActionButtonsPreference",
        "SettingsLibEntityHeaderWidgets",
        "SettingsLibEntityHeaderWidgets",
        "SettingsLibBarChartPreference",
        "SettingsLibBarChartPreference",
        "SettingsLibProgressBar",
    ],
    ],


    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
    // ANDROIDMK TRANSLATION ERROR: unsupported assignment to LOCAL_SHARED_JAVA_LIBRARIES
+9 −0
Original line number Original line Diff line number Diff line
android_library {
    name: "SettingsLibProgressBar",

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

    sdk_version: "system_current",
    min_sdk_version: "21",
}
 No newline at end of file
+23 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  Copyright (C) 2019 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 xmlns:android="http://schemas.android.com/apk/res/android"
          package="com.android.settingslib.widget">

    <uses-sdk android:minSdkVersion="21" />

</manifest>
+28 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 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.
-->

<!-- Variant of progress_indeterminate_horizontal_material in frameworks/base/core/res, which
     draws the whole height of the progress bar instead having blank space above and below the
     bar. -->
<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
                 android:drawable="@drawable/vector_drawable_progress_indeterminate_horizontal_trimmed" >
    <target
        android:name="rect2_grp"
        android:animation="@*android:anim/progress_indeterminate_horizontal_rect2" />
    <target
        android:name="rect1_grp"
        android:animation="@*android:anim/progress_indeterminate_horizontal_rect1" />
</animated-vector>
 No newline at end of file
+53 −0
Original line number Original line Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 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.
-->

<!-- Variant of vector_drawable_progress_indeterminate_horizontal in frameworks/base/core/res, which
     draws the whole height of the progress bar instead having blank space above and below the
     bar. -->
<vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:height="10dp"
        android:width="360dp"
        android:viewportHeight="10"
        android:viewportWidth="360" >
    <group
        android:name="progress_group"
        android:translateX="180"
        android:translateY="5" >
        <path
            android:name="background_track"
            android:pathData="M -180.0,-5.0 l 360.0,0 l 0,10.0 l -360.0,0 Z"
            android:fillColor="?android:attr/colorControlActivated"
            android:fillAlpha="?android:attr/disabledAlpha"/>
        <group
            android:name="rect2_grp"
            android:translateX="-197.60001"
            android:scaleX="0.1" >
            <path
                android:name="rect2"
                android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z"
                android:fillColor="?android:attr/colorControlActivated" />
        </group>
        <group
            android:name="rect1_grp"
            android:translateX="-522.59998"
            android:scaleX="0.1" >
            <path
                android:name="rect1"
                android:pathData="M -144.0,-5.0 l 288.0,0 l 0,10.0 l -288.0,0 Z"
                android:fillColor="?android:attr/colorControlActivated" />
        </group>
    </group>
</vector>
 No newline at end of file
Loading