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

Commit cd15971f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move horizontal progress bar into SettingsLib."

parents 3eaa0ac0 ad0e49bd

res/drawable/progress_indeterminate_horizontal_material_trimmed.xml

deleted100644 → 0
+0 −28
Original line number 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>

res/drawable/vector_drawable_progress_indeterminate_horizontal_trimmed.xml

deleted100644 → 0
+0 −53
Original line number 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>

res/layout/wifi_progress_header.xml

deleted100644 → 0
+0 −34
Original line number 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.

-->



<FrameLayout

    android:layout_width="match_parent"

    android:layout_height="3dp"

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

    <View

        android:id="@+id/progress_bar_background"

        style="@style/TrimmedHorizontalProgressBar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:background="?android:attr/colorSecondary" />

    <ProgressBar

        android:id="@+id/progress_bar_animation"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        style="@style/TrimmedHorizontalProgressBar"

        android:indeterminate="true" />

</FrameLayout>

res/values/styles.xml

+0 −9
Original line number Diff line number Diff line
@@ -82,15 +82,6 @@ 
        <item name="android:scrollbarStyle">outsideOverlay</item>

    </style>



    <style name="TrimmedHorizontalProgressBar"

           parent="android:Widget.Material.ProgressBar.Horizontal">

        <item name="android:indeterminateDrawable">

            @drawable/progress_indeterminate_horizontal_material_trimmed

        </item>

        <item name="android:minHeight">3dip</item>

        <item name="android:maxHeight">3dip</item>

    </style>



    <style name="bt_item">

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

        <item name="android:layout_height">wrap_content</item>

src/com/android/settings/network/telephony/NetworkSelectSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ public class NetworkSelectSettings extends DashboardFragment { 


        final Activity activity = getActivity();

        if (activity != null) {

            mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)

            mProgressHeader = setPinnedHeaderView(R.layout.progress_header)

                    .findViewById(R.id.progress_bar_animation);

            setProgressBarVisible(false);

        }