PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 72cfbcb4: Merge "Fix print icons in settings." into lmp-dev

Browse Source 
* commit '72cfbcb42952a8799daa497bf8034b2f033fad9e':
  Fix print icons in settings.
This commit is contained in:
Svetoslav
2014-09-11 17:39:26 +00:00
committed by Android Git Automerger
parent a8627dd88e 72cfbcb429
commit 842e9d04ad
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
res/drawable/ic_print.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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="@*android:drawable/ic_print"
android:tint="@*android:color/material_deep_teal_500" />

19
res/drawable/ic_print_error.xml Normal file
View File

@@ -0,0 +1,19 @@
<?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="@*android:drawable/ic_print_error"
android:tint="@*android:color/material_deep_teal_500" />

4
src/com/android/settings/print/PrintJobSettingsFragment.java
View File

@@ -204,12 +204,12 @@ public class PrintJobSettingsFragment extends SettingsPreferenceFragment {
switch (info.getState()) {
case PrintJobInfo.STATE_QUEUED:
case PrintJobInfo.STATE_STARTED: {
mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print);
mPrintJobPreference.setIcon(R.drawable.ic_print);
} break;
case PrintJobInfo.STATE_FAILED:
case PrintJobInfo.STATE_BLOCKED: {
mPrintJobPreference.setIcon(com.android.internal.R.drawable.ic_print_error);
mPrintJobPreference.setIcon(R.drawable.ic_print_error);
} break;
}

4
src/com/android/settings/print/PrintSettingsFragment.java
View File

@@ -423,12 +423,12 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
switch (printJob.getState()) {
case PrintJobInfo.STATE_QUEUED:
case PrintJobInfo.STATE_STARTED: {
preference.setIcon(com.android.internal.R.drawable.ic_print);
preference.setIcon(R.drawable.ic_print);
} break;
case PrintJobInfo.STATE_FAILED:
case PrintJobInfo.STATE_BLOCKED: {
preference.setIcon(com.android.internal.R.drawable.ic_print_error);
preference.setIcon(R.drawable.ic_print_error);
} break;
}