diff options
author | Nancy Chen <nancychen@google.com> | 2014-07-21 22:55:29 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-07-21 22:55:29 +0000 |
commit | 84eaffdf7994d23c132324fc01b1022007e15b55 (patch) | |
tree | dc021e08f0108c95a1264f5b1e723d283700c8ea /res | |
parent | a04ce8904598cf2a1614472201a8b9609dd2ef2a (diff) | |
parent | 344ec42ee64713bce0f8a9bf37979a9d2518992d (diff) |
am 344ec42e: am b17cb363: am bbde565a: Update call settings to mocks
* commit '344ec42ee64713bce0f8a9bf37979a9d2518992d':
Update call settings to mocks
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/dialer_preferences.xml | 68 | ||||
-rw-r--r-- | res/values/dimens.xml | 7 |
2 files changed, 75 insertions, 0 deletions
diff --git a/res/layout/dialer_preferences.xml b/res/layout/dialer_preferences.xml new file mode 100644 index 000000000..bbb79bcb7 --- /dev/null +++ b/res/layout/dialer_preferences.xml @@ -0,0 +1,68 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2014 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 of a header item in PreferenceActivity. This is modified from the platform + preference_header_item--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="48dp" + android:background="?android:attr/activatedBackgroundIndicator" + android:gravity="center_vertical" + android:paddingEnd="?android:attr/scrollbarSize"> + + <ImageView + android:id="@+id/icon" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="6dip" + android:layout_marginEnd="6dip" + android:layout_gravity="center" /> + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/preference_side_margin" + android:layout_marginEnd="@dimen/preference_side_margin" + android:layout_weight="1" + android:paddingTop="@dimen/preference_padding_top" + android:paddingBottom="@dimen/preference_padding_bottom"> + + <TextView android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearance" + android:textSize="16sp" + android:textColor="@color/setting_primary_color" + android:ellipsize="marquee" + android:fadingEdge="horizontal" /> + + <TextView android:id="@+id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/title" + android:layout_alignStart="@id/title" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="@color/setting_secondary_color" + android:lineSpacingExtra="@dimen/preference_summary_line_spacing_extra" + android:ellipsize="end" + android:maxLines="2" /> + + </RelativeLayout> + +</LinearLayout>
\ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 32cb852d8..1422420cb 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -130,4 +130,11 @@ <dimen name="shadow_length">10dp</dimen> <dimen name="empty_list_message_text_size">16sp</dimen> + + <!-- Dimensions for individual preference cards --> + <dimen name="preference_padding_top">18dp</dimen> + <dimen name="preference_padding_bottom">16dp</dimen> + <dimen name="preference_side_margin">16dp</dimen> + <dimen name="preference_list_top_padding">4dp</dimen> + <dimen name="preference_summary_line_spacing_extra">4dp</dimen> </resources> |