From 857c1ca1d1ec1f1ded3c72171ae56c59d11a0221 Mon Sep 17 00:00:00 2001
From: Stanley Wang <stanleytfwang@google.com>
Date: Wed, 29 Aug 2018 17:25:33 +0800
Subject: [PATCH] "Dsiabled" text aligns to textview right

Change-Id: Id0c2b9de8355e977d1954998266079ba065c8c0b
Fixes: 112123106
Test: manual
---
 .../manageapplications/ApplicationViewHolder.java             | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
index 021a953db33..e46f294d531 100644
--- a/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
+++ b/src/com/android/settings/applications/manageapplications/ApplicationViewHolder.java
@@ -73,8 +73,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
     static View newView(ViewGroup parent, boolean twoTarget) {
         ViewGroup view = (ViewGroup) LayoutInflater.from(parent.getContext())
                 .inflate(R.layout.preference_app, parent, false);
+        final ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
         if (twoTarget) {
-            final ViewGroup widgetFrame = view.findViewById(android.R.id.widget_frame);
             if (widgetFrame != null) {
                LayoutInflater.from(parent.getContext())
                        .inflate(R.layout.preference_widget_master_switch, widgetFrame, true);
@@ -84,6 +84,8 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
                // second to last, before widget frame
                view.addView(divider, view.getChildCount() - 1);
             }
+        } else if (widgetFrame != null) {
+            widgetFrame.setVisibility(View.GONE);
         }
         return view;
     }