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

Commit e1c99a1f authored by Amith Yamasani's avatar Amith Yamasani Committed by Android (Google) Code Review
Browse files

Merge "Remove popup indicator for dialog style preference items." into honeycomb

parents 895eee7b d2a92272
Loading
Loading
Loading
Loading
+0 −23
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2006 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.
-->

<!-- Layout used by DialogPreference in a PreferenceActivity. -->
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_gravity="center"
    android:background="@drawable/btn_circle"
    android:src="@drawable/ic_btn_round_more" />
+0 −2
Original line number Diff line number Diff line
@@ -888,7 +888,6 @@
    <style name="Preference.DialogPreference">
        <item name="android:positiveButtonText">@android:string/ok</item>
        <item name="android:negativeButtonText">@android:string/cancel</item>
        <item name="android:widgetLayout">@android:layout/preference_dialog</item>
    </style>
    
    <style name="Preference.DialogPreference.YesNoPreference">
@@ -904,7 +903,6 @@
        <item name="android:ringtoneType">ringtone</item>
        <item name="android:showSilent">true</item>
        <item name="android:showDefault">true</item>
        <item name="android:widgetLayout">@android:layout/preference_dialog</item>
    </style>

    <!-- No margins or background by default. Could be different for x-large screens -->