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

Change layout prefix of setupdesign from suw to sud

Browse Source 
Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: Icd24f0336191c4575838cb1b9d131c885304b527
This commit is contained in:
pastychang
2018-12-21 14:01:18 +08:00
parent ed889a3788
commit 8d2dc16d7f
8 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/choose_lock_pattern.xml
View File

@@ -21,7 +21,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:layout="@layout/suw_glif_blank_template"
android:layout="@layout/sud_glif_blank_template"
settings:suwHeaderText="@string/lock_settings_picker_title">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

2
res/layout-land/confirm_lock_pattern_normal.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:layout="@layout/suw_glif_blank_template">
android:layout="@layout/sud_glif_blank_template">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout"

2
res/layout-land/fingerprint_enroll_enrolling.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/suw_glif_blank_template"
android:layout="@layout/sud_glif_blank_template"
style="?attr/fingerprint_layout_theme">
<ScrollView

2
res/layout-land/fingerprint_enroll_find_sensor.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/suw_glif_blank_template"
android:layout="@layout/sud_glif_blank_template"
style="?attr/fingerprint_layout_theme">
<LinearLayout

2
res/layout-land/fingerprint_enroll_finish.xml
View File

@@ -20,7 +20,7 @@
android:id="@+id/setup_wizard_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout="@layout/suw_glif_blank_template"
android:layout="@layout/sud_glif_blank_template"
style="?attr/fingerprint_layout_theme">
<ScrollView

2
res/layout/choose_lock_pattern_common.xml
View File

@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:layout="@layout/suw_glif_blank_template"
android:layout="@layout/sud_glif_blank_template"
settings:sucFooter="@layout/choose_lock_pattern_common_footer"
settings:suwHeaderText="@string/lockpassword_choose_your_screen_lock_header">

2
res/layout/confirm_lock_pattern_normal_base.xml
View File

@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:icon="@drawable/ic_lock"
android:layout="@layout/suw_glif_blank_template">
android:layout="@layout/sud_glif_blank_template">
<com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient
android:id="@+id/topLayout"

4
tests/robotests/src/com/android/settings/MasterClearTest.java
View File

@@ -43,7 +43,6 @@ import android.provider.Settings;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewTreeObserver;
import android.widget.Button;
import android.widget.CheckBox;
import android.widget.LinearLayout;
import android.widget.ScrollView;
@@ -51,7 +50,6 @@ import android.widget.ScrollView;
import androidx.fragment.app.FragmentActivity;
import com.android.settings.testutils.shadow.ShadowUtils;
import com.google.android.setupcompat.item.FooterButton;
import org.junit.Before;
import org.junit.Test;
@@ -387,7 +385,7 @@ public class MasterClearTest {
public void testOnGlobalLayout_shouldNotRemoveListener() {
final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
mMasterClear.mScrollView = mScrollView;
mMasterClear.mInitiateButton = mock(FooterButton.class);
doNothing().when(mMasterClear).onGlobalLayout();
doReturn(true).when(mMasterClear).hasReachedBottom(any());
when(mScrollView.getViewTreeObserver()).thenReturn(viewTreeObserver);