Merge "[WifiSetup] Use framework AutoMirrored" into lmp-dev

This commit is contained in:
Maurice Lam
2014-08-15 20:29:32 +00:00
committed by Android (Google) Code Review
8 changed files with 48 additions and 14 deletions

View File

Before

Width:  |  Height:  |  Size: 41 KiB

After

Width:  |  Height:  |  Size: 41 KiB

View File

Before

Width:  |  Height:  |  Size: 20 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -0,0 +1,20 @@
<?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.
-->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true"
android:src="@drawable/setup_illustration_wifi_image" />

View File

@@ -0,0 +1,20 @@
<?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.
-->
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
android:autoMirrored="true"
android:src="@drawable/setup_illustration_wifi_wide_image" />

View File

@@ -16,7 +16,6 @@
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res/com.android.settings"
android:id="@+id/fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -27,8 +26,7 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:foreground="@drawable/setup_illustration_wifi_wide"
android:background="@drawable/setup_illustration_bg"
settings:autoMirrored="true">
android:background="@drawable/setup_illustration_bg">
<LinearLayout
android:layout_width="match_parent"

View File

@@ -24,8 +24,7 @@
android:background="@drawable/setup_illustration_bg"
android:foreground="@drawable/setup_illustration_wifi"
android:tag="stickyContainer"
settings:aspectRatio="2.0"
settings:autoMirrored="true">
settings:aspectRatio="2.0">
<TextView
android:id="@+id/title"

View File

@@ -24,7 +24,6 @@
<declare-styleable name="SetupWizardIllustration">
<attr name="aspectRatio" format="float" />
<attr name="autoMirrored" format="boolean" />
</declare-styleable>
<declare-styleable name="BatteryHistoryChart">