Change to use setupcompat and setupdesign for suw pages
1. remove the dependence of setupwizardlib. 2. add to use setupcompat and setupdesign. 3. modify new footer button in following up cl. Bug: 120805516 Bug: 120872944 Test: RunSettingsRoboTests Change-Id: I463dd35b799d4250b2aabce0cb0b8102cf9dd7d6
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
limitations under the License.
|
||||
-->
|
||||
|
||||
<com.android.setupwizardlib.GlifLayout
|
||||
<com.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
@@ -164,7 +164,7 @@
|
||||
</LinearLayout>
|
||||
|
||||
<!-- right side: lock pattern -->
|
||||
<com.android.setupwizardlib.view.FillContentLayout
|
||||
<com.google.android.setupdesign.view.FillContentLayout
|
||||
style="@style/LockPatternContainerStyle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
@@ -177,8 +177,8 @@
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/lock_pattern_background" />
|
||||
|
||||
</com.android.setupwizardlib.view.FillContentLayout>
|
||||
</com.google.android.setupdesign.view.FillContentLayout>
|
||||
|
||||
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
||||
|
||||
</com.android.setupwizardlib.GlifLayout>
|
||||
</com.google.android.setupdesign.GlifLayout>
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<com.android.setupwizardlib.GlifLayout
|
||||
<com.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/setup_wizard_layout"
|
||||
android:layout_width="match_parent"
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
</ScrollView>
|
||||
|
||||
<com.android.setupwizardlib.view.FillContentLayout
|
||||
<com.google.android.setupdesign.view.FillContentLayout
|
||||
style="@style/LockPatternContainerStyle"
|
||||
android:layout_width="0dp"
|
||||
android:layout_height="match_parent"
|
||||
@@ -102,7 +102,7 @@
|
||||
android:layout_gravity="center"
|
||||
android:background="@color/lock_pattern_background" />
|
||||
|
||||
</com.android.setupwizardlib.view.FillContentLayout>
|
||||
</com.google.android.setupdesign.view.FillContentLayout>
|
||||
|
||||
</com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient>
|
||||
</com.android.setupwizardlib.GlifLayout>
|
||||
</com.google.android.setupdesign.GlifLayout>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
~ limitations under the License
|
||||
-->
|
||||
|
||||
<com.android.setupwizardlib.GlifLayout
|
||||
<com.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/setup_wizard_layout"
|
||||
android:layout_width="match_parent"
|
||||
@@ -108,7 +108,7 @@
|
||||
android:gravity="center"
|
||||
android:orientation="vertical">
|
||||
|
||||
<com.android.setupwizardlib.view.FillContentLayout
|
||||
<com.google.android.setupdesign.view.FillContentLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginVertical="24dp"
|
||||
@@ -120,7 +120,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center" />
|
||||
</com.android.setupwizardlib.view.FillContentLayout>
|
||||
</com.google.android.setupdesign.view.FillContentLayout>
|
||||
|
||||
<TextView
|
||||
style="@style/TextAppearance.FingerprintErrorText"
|
||||
@@ -139,4 +139,4 @@
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</com.android.setupwizardlib.GlifLayout>
|
||||
</com.google.android.setupdesign.GlifLayout>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
~ limitations under the License
|
||||
-->
|
||||
|
||||
<com.android.setupwizardlib.GlifLayout
|
||||
<com.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/setup_wizard_layout"
|
||||
android:layout_width="match_parent"
|
||||
@@ -112,4 +112,4 @@
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</com.android.setupwizardlib.GlifLayout>
|
||||
</com.google.android.setupdesign.GlifLayout>
|
||||
|
||||
@@ -15,7 +15,7 @@
|
||||
~ limitations under the License
|
||||
-->
|
||||
|
||||
<com.android.setupwizardlib.GlifLayout
|
||||
<com.google.android.setupdesign.GlifLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:id="@+id/setup_wizard_layout"
|
||||
android:layout_width="match_parent"
|
||||
@@ -75,7 +75,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1" />
|
||||
|
||||
<com.android.setupwizardlib.view.ButtonBarLayout
|
||||
<com.google.android.setupdesign.view.ButtonBarLayout
|
||||
style="@style/SuwGlifButtonBar.Stackable"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
@@ -103,11 +103,11 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/security_settings_fingerprint_enroll_done" />
|
||||
|
||||
</com.android.setupwizardlib.view.ButtonBarLayout>
|
||||
</com.google.android.setupdesign.view.ButtonBarLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<com.android.setupwizardlib.view.FillContentLayout
|
||||
<com.google.android.setupdesign.view.FillContentLayout
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="match_parent">
|
||||
@@ -120,8 +120,8 @@
|
||||
android:contentDescription="@android:string/fingerprint_icon_content_description"
|
||||
android:src="@drawable/fingerprint_enroll_finish" />
|
||||
|
||||
</com.android.setupwizardlib.view.FillContentLayout>
|
||||
</com.google.android.setupdesign.view.FillContentLayout>
|
||||
|
||||
</LinearLayout>
|
||||
</ScrollView>
|
||||
</com.android.setupwizardlib.GlifLayout>
|
||||
</com.google.android.setupdesign.GlifLayout>
|
||||
|
||||
Reference in New Issue
Block a user