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

Commit 1eafed51 authored by Romain Hunault's avatar Romain Hunault 💻
Browse files

Merge branch 'pie_1721' into 'v1-pie' 

Pie 1721

See merge request !7
parents 38e258d4 640cdeb6

res/layout/item_dir_grid.xml

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
     when touch mode is not enable. So, if you, heroic engineer of the future,

     decide to rip these out, please be sure to check out focus and keyboards. -->

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

    android:id="@+id/layout_grid_item"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_margin="@dimen/grid_item_margin"

res/layout/item_doc_list.xml

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ 




    <LinearLayout

        android:id="@+id/layout_list_item"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:baselineAligned="false"

res/values/colors.xml

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 


    <color name="primary_dark">#ff254FAE</color>

    <color name="primary">@color/tool_bar_color</color>

    <color name="accent">@color/tool_bar_color</color>

<!--    <color name="accent">@color/tool_bar_color</color>-->

    <color name="accent">@*android:color/accent_device_default</color>

    <color name="colorAccent">@*android:color/accent_device_default</color>

    <color name="accent_dark">@*android:color/accent_device_default_dark</color>



    <color name="text_cursor">@*android:color/white</color>

src/com/android/documentsui/ActionModeController.java

+2 −0
Original line number Diff line number Diff line
@@ -91,6 +91,8 @@ public class ActionModeController extends SelectionObserver 
                    R.plurals.elements_selected, mSelected.size());

            mActionMode.setTitle(title);

            mActivity.getWindow().setTitle(title);





        }

    }

src/com/android/documentsui/BaseActivity.java

+44 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ import android.content.Intent; 
import android.content.pm.PackageInfo;

import android.content.pm.PackageManager;

import android.content.pm.ProviderInfo;

import android.content.res.TypedArray;

import android.graphics.drawable.ColorDrawable;

import android.net.Uri;

import android.os.Build;

import android.os.Bundle;

import android.os.MessageQueue.IdleHandler;

import android.preference.PreferenceManager;
@@ -35,10 +38,13 @@ import android.support.annotation.CallSuper; 
import android.support.annotation.LayoutRes;

import android.support.annotation.VisibleForTesting;

import android.util.Log;

import android.util.TypedValue;

import android.view.KeyEvent;

import android.view.Menu;

import android.view.MenuItem;

import android.view.View;

import android.view.Window;

import android.view.WindowManager;

import android.widget.Toolbar;



import com.android.documentsui.AbstractActionHandler.CommonAddons;
@@ -71,6 +77,7 @@ import java.util.List; 


import javax.annotation.Nullable;





public abstract class BaseActivity

        extends Activity implements CommonAddons, NavigationViewManager.Environment {
@@ -101,6 +108,8 @@ public abstract class BaseActivity 
    private long mStartTime;



    private PreferencesMonitor mPreferencesMonitor;

    private Toolbar toolbar;

    public static int accentColor;



    public BaseActivity(@LayoutRes int layoutId, String tag) {

        mLayoutId = layoutId;
@@ -140,7 +149,7 @@ public abstract class BaseActivity 
        mProviders = DocumentsApplication.getProvidersCache(this);

        mDocs = DocumentsAccess.create(this);



        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

        toolbar = (Toolbar) findViewById(R.id.toolbar);

        setActionBar(toolbar);



        Breadcrumb breadcrumb =
@@ -200,6 +209,8 @@ public abstract class BaseActivity 


        // Base classes must update result in their onCreate.

        setResult(Activity.RESULT_CANCELED);



        accentColor=fetchAccentColor();

    }



    public void onPreferenceChanged(String pref) {
@@ -675,4 +686,36 @@ public abstract class BaseActivity 
         */

        void onDirectoryLoaded(@Nullable Uri uri);

    }



    /*

     * get Accent color from OS

     * */



    private int fetchAccentColor() {

        TypedValue typedValue = new TypedValue();

        TypedArray a = this.obtainStyledAttributes(typedValue.data, new int[] { R.attr.colorAccent });

        int color = a.getColor(0, 0);

        a.recycle();

        Log.e("TAG", "accent Colour  #"+Integer.toHexString(color));

        //toolbar change color to accent color

        toolbar.setBackgroundColor(color);



        //change status bar color

        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {

            Window window = getWindow();

            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

            window.setStatusBarColor(darkenColor(color));

        }



        return color;

    }





    int darkenColor(int color) {

        float[] hsv = new float[3];

        android.graphics.Color.colorToHSV(color, hsv);

        hsv[2] *= 0.8f;

        return android.graphics.Color.HSVToColor(hsv);

    }



}