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

Commit 950eaa29 authored by Christopher Tate's avatar Christopher Tate
Browse files

Use Material tinting for install result 

Bug 18507476

Change-Id: I5cfefa4be52306fee14b7fb163a730b1d39fc759
parent f40db6ce

res/drawable/ic_fail_material.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->

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

    android:src="@drawable/ic_fail"

    android:tint="?android:attr/colorControlNormal" />

res/drawable/ic_result_status.xml

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
-->

<level-list xmlns:android="http://schemas.android.com/apk/res/android">

    <!-- success state -->

    <item android:maxLevel="0" android:drawable="@drawable/ic_success"/>

    <item android:maxLevel="0" android:drawable="@drawable/ic_success_material"/>

    <!-- failure state -->

    <item android:maxLevel="1" android:drawable="@drawable/ic_fail"/>

    <item android:maxLevel="1" android:drawable="@drawable/ic_fail_material"/>

</level-list>
 
 No newline at end of file

res/drawable/ic_success_material.xml

0 → 100644
+18 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 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.

-->

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

    android:src="@drawable/ic_success"

    android:tint="?android:attr/colorControlNormal" />

src/com/android/packageinstaller/InstallAppProgress.java

+2 −2
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ public class InstallAppProgress extends Activity implements View.OnClickListener 
                    // Show the ok button

                    int centerTextLabel;

                    int centerExplanationLabel = -1;

                    LevelListDrawable centerTextDrawable = (LevelListDrawable) getResources()

                            .getDrawable(R.drawable.ic_result_status);

                    LevelListDrawable centerTextDrawable =

                            (LevelListDrawable) getDrawable(R.drawable.ic_result_status);

                    if (msg.arg1 == PackageManager.INSTALL_SUCCEEDED) {

                        mLaunchButton.setVisibility(View.VISIBLE);

                        centerTextDrawable.setLevel(0);