PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a grey shade under progress spinner in wifi settings

Browse Source 
Change-Id: I1c3fa3a05fe66924989607d73e77ca2616a898e6
Fix: 62545533
Test: visual
This commit is contained in:
Fan Zhang
2017-07-10 14:46:29 -07:00
parent 250595ae11
commit 62a3220efb
2 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
res/layout/wifi_progress_header.xml
View File

@@ -15,8 +15,20 @@
limitations under the License. limitations under the License.
--> -->
<ProgressBar xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout
style="@style/TrimmedHorizontalProgressBar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="3dp"
android:indeterminate="true" /> 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>

8
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -49,7 +49,6 @@ import android.view.ContextMenu.ContextMenuInfo;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.ProgressBar;
import android.widget.Toast; import android.widget.Toast;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
@@ -140,7 +139,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private WifiDialog mDialog; private WifiDialog mDialog;
private WriteWifiConfigToNfcDialog mWifiToNfcDialog; private WriteWifiConfigToNfcDialog mWifiToNfcDialog;
private ProgressBar mProgressHeader; private View mProgressHeader;
// this boolean extra specifies whether to disable the Next button when not connected. Used by // this boolean extra specifies whether to disable the Next button when not connected. Used by
// account creation outside of setup wizard. // account creation outside of setup wizard.
@@ -187,7 +186,8 @@ public class WifiSettings extends RestrictedSettingsFragment
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
final Activity activity = getActivity(); final Activity activity = getActivity();
if (activity != null) { 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); setProgressBarVisible(false);
} }
} }
@@ -909,7 +909,7 @@ public class WifiSettings extends RestrictedSettingsFragment
protected void setProgressBarVisible(boolean visible) { protected void setProgressBarVisible(boolean visible) {
if (mProgressHeader != null) { if (mProgressHeader != null) {
mProgressHeader.setVisibility(visible ? View.VISIBLE : View.INVISIBLE); mProgressHeader.setVisibility(visible ? View.VISIBLE : View.GONE);
} }
} }