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

Merge "Redo the empty states in print settings"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-09-25 23:10:02 +00:00
committed by Android (Google) Code Review
parent 25d95e0dec 2f4f269264
commit c22c1be236
6 changed files with 60 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
res/drawable-hdpi/ic_grayedout_printer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
res/drawable-mdpi/ic_grayedout_printer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

BIN
res/drawable-xhdpi/ic_grayedout_printer.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.3 KiB

50
res/layout/empty_print_state.xml
View File

@@ -14,48 +14,40 @@
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/empty_print_state" android:layout_width="match_parent"
android:layout_width="fill_parent" android:layout_height="match_parent"
android:layout_height="fill_parent" android:layout_marginStart="16dp"
android:visibility="gone"> android:layout_marginEnd="16dp"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:id="@+id/icon" android:layout_width="120dp"
android:layout_width="wrap_content" android:layout_height="110dp"
android:layout_height="wrap_content" android:layout_marginBottom="12dp"
android:layout_marginBottom="12dip" android:src="@*android:drawable/ic_print"
android:src="@drawable/ic_grayedout_printer" android:scaleType="fitEnd"
android:contentDescription="@null"> android:alpha="0.1"
</ImageView> android:tint="?android:colorForeground"
android:importantForAccessibility="no" />
<TextView <TextView
android:id="@+id/message" android:id="@+id/message"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorSecondary"> android:textColor="?android:attr/textColorSecondary" />
</TextView>
<Button android:id="@+id/add_new_service" <Button
android:id="@+id/add_new_service"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" style="?android:attr/borderlessButtonStyle"
android:gravity="center" android:textColor="?android:attr/textColorSecondary"
android:visibility="gone"
style="?android:attr/buttonBarButtonStyle"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="@string/print_menu_item_add_service" android:text="@string/print_menu_item_add_service"
android:textAllCaps="true" android:visibility="gone" />
/>
</LinearLayout> </LinearLayout>
</FrameLayout>

43
res/layout/empty_printers_list_service_enabled.xml
View File

@@ -14,45 +14,38 @@
limitations under the License. limitations under the License.
--> -->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/empty_printers_list_service_enabled" android:layout_width="match_parent"
android:layout_width="fill_parent" android:layout_height="match_parent"
android:layout_height="fill_parent" android:layout_marginStart="16dp"
android:visibility="gone"> android:layout_marginEnd="16dp"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<ImageView <ImageView
android:layout_width="wrap_content" android:layout_width="120dp"
android:layout_height="wrap_content" android:layout_height="110dp"
android:layout_marginBottom="12dip" android:layout_marginBottom="12dp"
android:src="@drawable/ic_grayedout_printer" android:src="@*android:drawable/ic_print"
android:importantForAccessibility="no"> android:scaleType="fitEnd"
</ImageView> android:alpha="0.1"
android:tint="?android:colorForeground"
android:importantForAccessibility="no"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginLeft="32dip" android:layout_marginBottom="16dp"
android:layout_marginRight="32dip"
android:gravity="center" android:gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary"
android:text="@string/print_searching_for_printers"> android:text="@string/print_searching_for_printers"/>
</TextView>
<ProgressBar <ProgressBar
android:layout_width="fill_parent" android:layout_width="300dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:indeterminate="true" android:indeterminate="true"
style="?android:attr/progressBarStyleHorizontal"> android:importantForAccessibility="no"
</ProgressBar> style="?android:attr/progressBarStyleHorizontal"/>
</LinearLayout> </LinearLayout>
</FrameLayout>

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

@@ -190,8 +190,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
if (emptyView == null) { if (emptyView == null) {
emptyView = getActivity().getLayoutInflater().inflate( emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false); R.layout.empty_print_state, contentRoot, false);
ImageView iconView = (ImageView) emptyView.findViewById(R.id.icon);
iconView.setContentDescription(getString(R.string.print_service_disabled));
TextView textView = (TextView) emptyView.findViewById(R.id.message); TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_service_disabled); textView.setText(R.string.print_service_disabled);
contentRoot.addView(emptyView); contentRoot.addView(emptyView);
@@ -216,8 +214,6 @@ public class PrintServiceSettingsFragment extends SettingsPreferenceFragment
if (emptyView == null) { if (emptyView == null) {
emptyView = getActivity().getLayoutInflater().inflate( emptyView = getActivity().getLayoutInflater().inflate(
R.layout.empty_print_state, contentRoot, false); R.layout.empty_print_state, contentRoot, false);
ImageView iconView = (ImageView) emptyView.findViewById(R.id.icon);
iconView.setContentDescription(getString(R.string.print_no_printers_found));
TextView textView = (TextView) emptyView.findViewById(R.id.message); TextView textView = (TextView) emptyView.findViewById(R.id.message);
textView.setText(R.string.print_no_printers_found); textView.setText(R.string.print_no_printers_found);
contentRoot.addView(emptyView); contentRoot.addView(emptyView);