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

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

Merge "Use a grey shade under progress spinner in wifi settings"

parents 740405a0 62a3220e

res/layout/wifi_progress_header.xml

+16 −4
Original line number Diff line number Diff line
@@ -15,8 +15,20 @@ 
    limitations under the License.

-->



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

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

src/com/android/settings/wifi/WifiSettings.java

+4 −4
Original line number Diff line number Diff line
@@ -49,7 +49,6 @@ import android.view.ContextMenu.ContextMenuInfo; 
import android.view.Menu;

import android.view.MenuItem;

import android.view.View;

import android.widget.ProgressBar;

import android.widget.Toast;



import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -140,7 +139,7 @@ public class WifiSettings extends RestrictedSettingsFragment 
    private WifiDialog mDialog;

    private WriteWifiConfigToNfcDialog mWifiToNfcDialog;



    private ProgressBar mProgressHeader;

    private View mProgressHeader;



    // this boolean extra specifies whether to disable the Next button when not connected. Used by

    // account creation outside of setup wizard.
@@ -187,7 +186,8 @@ public class WifiSettings extends RestrictedSettingsFragment 
        super.onViewCreated(view, savedInstanceState);

        final Activity activity = getActivity();

        if (activity != null) {

            mProgressHeader = (ProgressBar) setPinnedHeaderView(R.layout.wifi_progress_header);

            mProgressHeader = setPinnedHeaderView(R.layout.wifi_progress_header)

                    .findViewById(R.id.progress_bar_animation);

            setProgressBarVisible(false);

        }

    }
@@ -909,7 +909,7 @@ public class WifiSettings extends RestrictedSettingsFragment 


    protected void setProgressBarVisible(boolean visible) {

        if (mProgressHeader != null) {

            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.INVISIBLE);

            mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);

        }

    }