diff options
author | Diogo Ferreira <diogo@underdev.org> | 2015-11-16 13:58:33 +0000 |
---|---|---|
committer | Danesh M <daneshm90@gmail.com> | 2016-02-17 15:16:11 -0800 |
commit | fb1255bb6e4d0af5c37cd56ac53da7cae5d5318a (patch) | |
tree | 30d521b3ab2e2ed897f35ee8533bd0f82212beff | |
parent | 3ac48ea998a9191fdc9ead18088c3e33961e0630 (diff) | |
download | packages_apps_Settings-fb1255bb6e4d0af5c37cd56ac53da7cae5d5318a.tar.gz packages_apps_Settings-fb1255bb6e4d0af5c37cd56ac53da7cae5d5318a.tar.bz2 packages_apps_Settings-fb1255bb6e4d0af5c37cd56ac53da7cae5d5318a.zip |
Settings: regulatory: Wrap the layout in a ScrollView
This screen allows an optional image to be provided via overlay,
this image might be bigger than the screen height, and usually is
when the phone is in landscape. This cuts the image and only
shows what the screen allows.
This patch wraps it in a ScrollView to ensure that the user can
read the whole image.
Additionally, it changes the ImageView width to take the full width
of the parent, making centerCrop work as expected and centering the
image.
Change-Id: Ie8433767fe333cb4b019608208a45cd0a653641b
CYNGNOS-2050
-rwxr-xr-x | res/layout/regulatory_info.xml | 57 |
1 files changed, 31 insertions, 26 deletions
diff --git a/res/layout/regulatory_info.xml b/res/layout/regulatory_info.xml index 2af43d825..90821835a 100755 --- a/res/layout/regulatory_info.xml +++ b/res/layout/regulatory_info.xml @@ -13,33 +13,38 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - <TextView - android:id="@+id/sarValues" - android:textColor="@color/regulatory_text_color" - android:textSize="14sp" - android:padding="5dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"/> - <TextView - android:id="@+id/icCodes" - android:textColor="@color/regulatory_text_color" - android:textSize="14sp" - android:padding="5dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center"/> - <ImageView - android:id="@+id/regulatoryInfo" - android:adjustViewBounds="true" + android:layout_height="match_parent"> + <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:scaleType="centerCrop" - android:src="@drawable/regulatory_info" - android:visibility="gone"/> -</LinearLayout> + android:orientation="vertical" + > + <TextView + android:id="@+id/sarValues" + android:textColor="@color/regulatory_text_color" + android:textSize="14sp" + android:padding="5dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> + <TextView + android:id="@+id/icCodes" + android:textColor="@color/regulatory_text_color" + android:textSize="14sp" + android:padding="5dp" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center"/> + <ImageView + android:id="@+id/regulatoryInfo" + android:adjustViewBounds="true" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scaleType="centerCrop" + android:src="@drawable/regulatory_info" + android:visibility="gone"/> + </LinearLayout> +</ScrollView> |