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

Commit ebf7b888 authored by tmfang's avatar tmfang
Browse files

Change icons for disable and enable button 

Test: visual
Fixes: 124116610
Change-Id: Ia300eeba36d853117699d3bec724373df2e354d3
parent 41562c66

res/drawable/ic_settings_disable.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2019 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="#FF000000"

      android:pathData="M12,2c-1.78,0 -3.44,0.46 -4.89,1.28l1.48,1.48C9.63,4.28 10.78,4 12,4c4.41,0 8,3.59 8,8c0,1.22 -0.28,2.37 -0.76,3.41l1.48,1.48C21.54,15.44 22,13.78 22,12C22,6.48 17.52,2 12,2zM18.12,17.13L6.87,5.87L3.31,2.31L1.89,3.72l2.19,2.19C2.77,7.59 2,9.71 2,12c0,5.52 4.48,10 10,10c2.29,0 4.41,-0.77 6.09,-2.08l2.19,2.19l1.41,-1.41L18.12,17.13zM12,20c-4.41,0 -8,-3.59 -8,-8c0,-1.74 0.56,-3.35 1.51,-4.66l11.15,11.15C15.35,19.44 13.74,20 12,20zM8.59,4.76L7.11,3.28"/>

</vector>

res/drawable/ic_settings_enable.xml

0 → 100644
+25 −0
Original line number Diff line number Diff line 
<!--

  Copyright (C) 2019 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24">

  <path

      android:fillColor="#FF000000"

      android:pathData="M15.59,10.09L13,12.67V2h-2v10.67l-2.59,-2.58L7,11.5l5,5l5,-5L15.59,10.09zM15,2.46v2.13c2.93,1.19 5,4.06 5,7.41c0,4.41 -3.59,8 -8,8s-8,-3.59 -8,-8c0,-3.35 2.07,-6.22 5,-7.41V2.46C4.94,3.74 2,7.53 2,12c0,5.52 4.48,10 10,10s10,-4.48 10,-10C22,7.53 19.06,3.74 15,2.46z"/>

</vector>

src/com/android/settings/applications/appinfo/AppButtonsPreferenceController.java

+3 −3
Original line number Diff line number Diff line
@@ -560,15 +560,15 @@ public class AppButtonsPreferenceController extends BasePreferenceController imp 
                || isSystemPackage(mActivity.getResources(), mPm, mPackageInfo)) {

            // Disable button for core system applications.

            mButtonsPref.setButton2Text(R.string.disable_text)

                    .setButton2Icon(R.drawable.ic_settings_delete);

                    .setButton2Icon(R.drawable.ic_settings_disable);

        } else if (mAppEntry.info.enabled && !isDisabledUntilUsed()) {

            mButtonsPref.setButton2Text(R.string.disable_text)

                    .setButton2Icon(R.drawable.ic_settings_delete);

                    .setButton2Icon(R.drawable.ic_settings_disable);

            disableable = !mApplicationFeatureProvider.getKeepEnabledPackages()

                    .contains(mAppEntry.info.packageName);

        } else {

            mButtonsPref.setButton2Text(R.string.enable_text)

                    .setButton2Icon(R.drawable.ic_settings_install);

                    .setButton2Icon(R.drawable.ic_settings_enable);

            disableable = true;

        }