Fix misc style issue in "Open by default" screen.
Fix: 35960603 Test: visual Change-Id: I6d3f471bb31e8c945d4d3346ad9512cda095ed64
This commit is contained in:
@@ -14,36 +14,27 @@
|
|||||||
See the License for the specific language governing permissions and
|
See the License for the specific language governing permissions and
|
||||||
limitations under the License.
|
limitations under the License.
|
||||||
-->
|
-->
|
||||||
|
<LinearLayout
|
||||||
<ScrollView
|
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="wrap_content"
|
||||||
android:clipToPadding="false"
|
android:paddingStart="@dimen/preference_no_icon_padding_start"
|
||||||
android:scrollbarStyle="@integer/preference_scrollbar_style">
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||||
|
android:paddingBottom="5dip"
|
||||||
|
android:orientation="vertical">
|
||||||
|
|
||||||
<LinearLayout
|
<TextView android:id="@+id/auto_launch"
|
||||||
android:layout_width="match_parent"
|
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||||
|
android:layout_alignParentStart="true"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingTop="6dip" />
|
||||||
|
|
||||||
|
<Button
|
||||||
|
android:id="@+id/clear_activities_button"
|
||||||
|
android:layout_marginStart="-4dip"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
android:text="@string/clear_activities" />
|
||||||
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
|
||||||
android:paddingBottom="5dip"
|
|
||||||
android:orientation="vertical">
|
|
||||||
|
|
||||||
<TextView android:id="@+id/auto_launch"
|
</LinearLayout>
|
||||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
|
||||||
android:layout_alignParentStart="true"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:paddingTop="6dip" />
|
|
||||||
|
|
||||||
<Button
|
|
||||||
android:id="@+id/clear_activities_button"
|
|
||||||
android:layout_marginStart="-4dip"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:text="@string/clear_activities" />
|
|
||||||
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
||||||
</ScrollView>
|
|
||||||
|
@@ -37,8 +37,7 @@
|
|||||||
android:title="@string/app_launch_other_defaults_title">
|
android:title="@string/app_launch_other_defaults_title">
|
||||||
|
|
||||||
<com.android.settings.applications.ClearDefaultsPreference
|
<com.android.settings.applications.ClearDefaultsPreference
|
||||||
android:key="app_launch_clear_defaults"
|
android:key="app_launch_clear_defaults" />
|
||||||
/>
|
|
||||||
|
|
||||||
</PreferenceCategory>
|
</PreferenceCategory>
|
||||||
|
|
||||||
|
@@ -24,6 +24,7 @@ import android.os.IBinder;
|
|||||||
import android.os.RemoteException;
|
import android.os.RemoteException;
|
||||||
import android.os.ServiceManager;
|
import android.os.ServiceManager;
|
||||||
import android.os.UserHandle;
|
import android.os.UserHandle;
|
||||||
|
import android.support.v4.content.res.TypedArrayUtils;
|
||||||
import android.support.v7.preference.Preference;
|
import android.support.v7.preference.Preference;
|
||||||
import android.support.v7.preference.PreferenceViewHolder;
|
import android.support.v7.preference.PreferenceViewHolder;
|
||||||
import android.text.SpannableString;
|
import android.text.SpannableString;
|
||||||
@@ -68,7 +69,9 @@ public class ClearDefaultsPreference extends Preference {
|
|||||||
}
|
}
|
||||||
|
|
||||||
public ClearDefaultsPreference(Context context, AttributeSet attrs) {
|
public ClearDefaultsPreference(Context context, AttributeSet attrs) {
|
||||||
this(context, attrs, 0);
|
this(context, attrs, TypedArrayUtils.getAttr(context,
|
||||||
|
android.support.v7.preference.R.attr.preferenceStyle,
|
||||||
|
android.R.attr.preferenceStyle));
|
||||||
}
|
}
|
||||||
|
|
||||||
public ClearDefaultsPreference(Context context) {
|
public ClearDefaultsPreference(Context context) {
|
||||||
|
Reference in New Issue
Block a user