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

Commit f3a0d216 authored by Romain Hunault's avatar Romain Hunault 🚴🏻
Browse files

Merge branch 'issue_2563_pie' into 'v1-pie' 

Issue 2563 pie

See merge request !18
parents 37fe9cd9 b6c73d33

res/layout/fragment_pick.xml

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
        android:layout_width="@dimen/bottom_bar_negative_button_width"

        android:background="@android:color/transparent"

        android:text="@android:string/cancel"

        android:textColor="@color/primary"/>

        android:textColor="@color/accent"/>

    <TextView

        style="@style/BottomBarButton"

        android:id="@android:id/button1"
@@ -35,5 +35,5 @@ 
        android:layout_marginStart="@dimen/bottom_bar_positive_button_margin_start"

        android:background="@drawable/bottom_bar_positive_button_background"

        android:elevation="@dimen/bottom_bar_positive_button_elevation"

        android:textColor="@android:color/white"/>

        android:textColor="@color/accent"/>

</LinearLayout>

res/layout/fragment_save.xml

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ 
            android:background="@drawable/bottom_bar_positive_button_background"

            android:text="@string/menu_save"

            android:elevation="@dimen/bottom_bar_positive_button_elevation"

            android:textColor="@android:color/white"/>

            android:textColor="@color/accent"/>



        <ProgressBar

            android:id="@android:id/progress"

src/com/android/documentsui/ScopedAccessActivity.java

+9 −0
Original line number Diff line number Diff line
@@ -352,6 +352,15 @@ public class ScopedAccessActivity extends Activity { 
                    .setNegativeButton(R.string.deny, listener)

                    .create();



            mDialog.setOnShowListener(new DialogInterface.OnShowListener() {

                @Override

                public void onShow(DialogInterface dialogInterface) {

                    mDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(mActivity.getResources().getColor(R.color.accent));

                    mDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(mActivity.getResources().getColor(R.color.accent));

                }

            });





            mDontAskAgain = (CheckBox) view.findViewById(R.id.do_not_ask_checkbox);

            if (getScopedAccessPermissionStatus(context, mActivity.getCallingPackage(),

                    mVolumeUuid, directoryName) == PERMISSION_ASK_AGAIN) {

src/com/android/documentsui/ui/DialogController.java

+4 −0
Original line number Diff line number Diff line
@@ -100,10 +100,14 @@ public interface DialogController { 


            alertDialog.setOnShowListener(

                    (DialogInterface) -> {

                        alertDialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(mActivity.getResources().getColor(R.color.accent));

                        alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(mActivity.getResources().getColor(R.color.accent));

                        Button positive = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);

                        positive.setFocusable(true);

                        positive.requestFocus();

                    });





            alertDialog.show();

        }