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

Commit d62b2251 authored by cretin45's avatar cretin45 Committed by Steve Kondik
Browse files

CaptivePortalLogin: Allow overriding of progress color 

Change-Id: I6246b8b354c124dc672efb1f18492c133208660d
parent 033595a5

packages/CaptivePortalLogin/src/com/android/captiveportallogin/CaptivePortalLoginActivity.java

+10 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Activity; 
import android.app.LoadedApk;

import android.content.Context;

import android.content.Intent;

import android.content.res.ColorStateList;

import android.graphics.Bitmap;

import android.graphics.drawable.ColorDrawable;

import android.net.ConnectivityManager;
@@ -61,6 +62,7 @@ public class CaptivePortalLoginActivity extends Activity { 


    private static final String EXTRA_STATUS_BAR_COLOR = "status_bar_color";

    private static final String EXTRA_ACTION_BAR_COLOR = "action_bar_color";

    private static final String EXTRA_PROGRESS_COLOR = "progress_bar_color";



    private static final int SOCKET_TIMEOUT_MS = 10000;
@@ -128,6 +130,14 @@ public class CaptivePortalLoginActivity extends Activity { 


        getActionBar().setDisplayShowHomeEnabled(false);



        ProgressBar myProgressBar = (ProgressBar) findViewById(R.id.progress_bar);

        if (intent.hasExtra(EXTRA_PROGRESS_COLOR)) {

            int color = intent.getIntExtra(EXTRA_PROGRESS_COLOR, -1);

            if (color != -1) {

                myProgressBar.setProgressTintList(ColorStateList.valueOf(color));

            }

        }



        // Exit app if Network disappears.

        final NetworkCapabilities networkCapabilities = cm.getNetworkCapabilities(network);

        if (networkCapabilities == null) {