Merge "The activity launch preference should align to the padding style of the main switch."
This commit is contained in:
@@ -14,26 +14,33 @@
|
|||||||
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.
|
||||||
-->
|
-->
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
||||||
android:minHeight="@dimen/settingslib_min_switch_bar_height"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_margin="@dimen/settingslib_switchbar_margin"
|
android:minHeight="?android:attr/listPreferredItemHeight"
|
||||||
android:paddingStart="@dimen/settingslib_switchbar_padding_left"
|
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
|
||||||
android:paddingEnd="@dimen/settingslib_switchbar_padding_right"
|
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
|
||||||
android:background="@drawable/settingslib_switch_bar_bg_on">
|
android:paddingVertical="@dimen/settingslib_switchbar_margin"
|
||||||
|
android:background="@android:color/transparent"
|
||||||
|
android:importantForAccessibility="no">
|
||||||
|
|
||||||
<TextView
|
<FrameLayout
|
||||||
android:id="@android:id/title"
|
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="match_parent"
|
||||||
android:layout_marginEnd="@dimen/settingslib_switch_title_margin"
|
android:paddingStart="@dimen/settingslib_switchbar_padding_left"
|
||||||
android:layout_marginVertical="@dimen/settingslib_switch_title_margin"
|
android:paddingEnd="@dimen/settingslib_switchbar_padding_right"
|
||||||
android:layout_gravity="center_vertical"
|
android:background="@drawable/settingslib_switch_bar_bg_on">
|
||||||
android:ellipsize="end"
|
|
||||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
<TextView
|
||||||
android:hyphenationFrequency="normalFast"
|
android:id="@android:id/title"
|
||||||
android:lineBreakWordStyle="phrase"
|
android:layout_height="wrap_content"
|
||||||
style="@style/MainSwitchText.Settingslib" />
|
android:layout_width="wrap_content"
|
||||||
</LinearLayout>
|
android:layout_gravity="center_vertical"
|
||||||
|
android:paddingVertical="@dimen/settingslib_switch_title_margin"
|
||||||
|
android:ellipsize="end"
|
||||||
|
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||||
|
android:hyphenationFrequency="normalFast"
|
||||||
|
android:lineBreakWordStyle="phrase"
|
||||||
|
style="@style/MainSwitchText.Settingslib"/>
|
||||||
|
</FrameLayout>
|
||||||
|
</FrameLayout>
|
||||||
|
Reference in New Issue
Block a user