PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update preview border. Bug: 27396174" into nyc-dev

Browse Source 
am: c4d7bc85dc

* commit 'c4d7bc85dc21a3acae5e7d5c4303cdaad6e3e76a':
  Update preview border. Bug: 27396174
This commit is contained in:
Anna Galusza
2016-03-11 17:53:03 +00:00
committed by android-build-merger
parent 4efdb256b8 c4d7bc85dc
commit 33d21803cb
4 changed files with 39 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
res/drawable/preview_seek_bar_outline.xml
View File

@@ -14,9 +14,28 @@
limitations under the License.
-->
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke
android:width="8dp"
android:color="@color/seek_bar_preference_preview_border_tint" />
</shape>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:top="0dp"
android:bottom="0dp"
android:right="0dp"
android:left="0dp" >
<shape
android:shape="rectangle" >
<stroke
android:width="@dimen/preview_pager_padding"
android:color="?android:attr/colorPrimary" />
</shape>
</item>
<item
android:bottom="0dp"
android:right="0dp"
android:left="0dp" >
<shape
android:shape="rectangle"
android:height="?android:attr/actionBarSize" >
<solid
android:color="?android:attr/colorPrimary" />
</shape>
</item>
</layer-list>

31
res/layout/preview_seek_bar_view_pager.xml
View File

@@ -14,37 +14,28 @@
limitations under the License.
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:foreground="@drawable/preview_seek_bar_outline" >
android:orientation="vertical"
android:padding="@dimen/preview_pager_padding"
android:background="@drawable/preview_seek_bar_outline" >
<android.support.v4.view.ViewPager
android:id="@+id/preview_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="?android:attr/colorBackgroundFloating" />
<View
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_alignParentTop="false"
android:layout_alignParentBottom="true"
android:layout_margin="8dp"
android:background="@color/seek_bar_preference_preview_border_tint" />
<TextView
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="?android:attr/actionBarSize"
android:layout_marginStart="32dp"
android:layout_alignParentStart="true"
android:layout_alignParentTop="false"
android:layout_alignParentBottom="true"
android:gravity="center"
android:paddingStart="32dp"
android:gravity="start|center"
android:text="@string/screen_zoom_preview_title"
android:textAppearance="@android:style/TextAppearance.Material.Widget.ActionBar.Title"
android:textColor="@color/seek_bar_preference_preview_text"
android:elevation="2dp"/>
</RelativeLayout>
android:textColor="@color/seek_bar_preference_preview_text" />
</LinearLayout>

2
res/values/colors.xml
View File

@@ -124,7 +124,5 @@
<color name="message_icon_text_outgoing">#ffffffff</color>
<color name="seek_bar_preference_preview_text">#fff</color>
<!-- Black at 80% opacity -->
<color name="seek_bar_preference_preview_border_tint">#cc000000</color>
</resources>

3
res/values/dimens.xml
View File

@@ -291,4 +291,7 @@
<!-- Restricted icon in switch bar -->
<dimen name="restricted_icon_margin_end">16dp</dimen>
<!-- Display Size and Font Size preview screen -->
<dimen name="preview_pager_padding">8dp</dimen>
</resources>