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

Merge "Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size." into nyc-dev am: 7f4892f

Browse Source 
am: 5a9cff7

* commit '5a9cff708f3c83a71c9610ec52453acf21aff649':
  Changing dimensions and margins for fingerprint image in portrait mode. Landscape layout remains the same with fixed size.

Change-Id: I12d6c2c7fe63f1bc7a3a6798a3070f8cef2bf541
This commit is contained in:
Ido Ofir
2016-04-15 23:29:13 +00:00
committed by android-build-merger
parent c3e8ae2e6f 5a9cff708f
commit f472716ba2
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
res/layout/fingerprint_enroll_finish_base.xml
View File

@@ -49,20 +49,25 @@
android:visibility="gone" />
<View
android:layout_height="0dp"
android:layout_height="24dp"
android:layout_width="match_parent"
android:layout_weight="1"/>
<ImageView
android:id="@+id/fingerprint_in_app_indicator"
android:layout_width="@dimen/fingerprint_in_app_indicator_size"
android:layout_height="@dimen/fingerprint_in_app_indicator_size"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_weight="5"
android:minHeight="@dimen/fingerprint_in_app_indicator_min_size"
android:minWidth="@dimen/fingerprint_in_app_indicator_min_size"
android:maxHeight="@dimen/fingerprint_in_app_indicator_max_size"
android:maxWidth="@dimen/fingerprint_in_app_indicator_max_size"
android:layout_gravity="center_horizontal"
android:contentDescription="@android:string/fingerprint_icon_content_description"
android:src="@drawable/fp_app_indicator" />
<View
android:layout_height="0dp"
android:layout_height="24dp"
android:layout_width="match_parent"
android:layout_weight="1"/>

4
res/values/dimens.xml
View File

@@ -230,7 +230,9 @@
<dimen name="fingerprint_animation_size">88dp</dimen>
<dimen name="fingerprint_progress_bar_size">192dp</dimen>
<dimen name="fingerprint_enrolling_content_margin_top">36dp</dimen>
<dimen name="fingerprint_in_app_indicator_size">120dp</dimen>
<dimen name="fingerprint_in_app_indicator_size">124dp</dimen>
<dimen name="fingerprint_in_app_indicator_min_size">124dp</dimen>
<dimen name="fingerprint_in_app_indicator_max_size">264dp</dimen>
<dimen name="setup_fingerprint_ring_radius">80dip</dimen>
<dimen name="setup_fingerprint_progress_bar_size">168dp</dimen>