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

Change to use footer button of setupcompat

Browse Source 
Bug: 120805516
Test: RunSettingsRoboTests
Change-Id: I0eba5f8fff37bbb13b54a4d41290ae9363905f96
This commit is contained in:
pastychang
2018-12-13 23:00:17 +08:00
parent 887fa5c646
commit 103409bd4a
7 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout/face_enroll_introduction_footer.xml
View File

@@ -39,6 +39,6 @@
style="@style/SuwGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/suw_next_button_label" />
android:text="@string/wizard_next" />
</com.google.android.setupdesign.view.ButtonBarLayout>

2
res/layout/fingerprint_enroll_introduction_footer.xml
View File

@@ -39,6 +39,6 @@
style="@style/SuwGlifButton.Primary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/suw_next_button_label" />
android:text="@string/wizard_next" />
</com.google.android.setupdesign.view.ButtonBarLayout>

4
res/layout/storage_wizard_footer.xml
View File

@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:onClick="onNavigateBack"
android:visibility="gone"
android:text="@string/suw_back_button_label" />
android:text="@string/wizard_back" />
<Space
android:layout_width="0dp"
@@ -41,6 +41,6 @@
android:layout_height="wrap_content"
android:onClick="onNavigateNext"
android:visibility="gone"
android:text="@string/suw_next_button_label" />
android:text="@string/wizard_next" />
</LinearLayout>

2
res/values/strings.xml
View File

@@ -6733,7 +6733,7 @@
<string name="wizard_back">Back</string>
<!-- Wizard next button label [CHAR LIMIT=25] -->
<string name="wizard_next">Next</string>
<!-- Wizard next button label [CHAR LIMIT=25] -->
<!-- Wizard finish button label [CHAR LIMIT=25] -->
<string name="wizard_finish">Finish</string>
<!-- An option in a photo selection dialog, if there is no photo yet [CHAR LIMIT=50] -->

21
src/com/android/settings/MasterClear.java
View File

@@ -66,7 +66,9 @@ import com.android.settings.password.ConfirmLockPattern;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
import com.google.android.setupcompat.item.FooterButton;
import com.google.android.setupcompat.item.FooterButton.ButtonType;
import com.google.android.setupcompat.template.ButtonFooterMixin;
import java.util.List;
@@ -96,7 +98,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
private View mContentView;
@VisibleForTesting
Button mInitiateButton;
FooterButton mInitiateButton;
private View mExternalStorageContainer;
@VisibleForTesting
CheckBox mExternalStorage;
@@ -416,12 +418,15 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
buttonFooterMixin.removeAllViews();
buttonFooterMixin.addSpace();
buttonFooterMixin.addSpace();
mInitiateButton = buttonFooterMixin.addButton(R.string.master_clear_button_text,
R.style.SuwGlifButton_Primary);
mInitiateButton.setOnClickListener(mInitiateListener);
buttonFooterMixin.setPrimaryButton(
new FooterButton(
getActivity(),
R.string.master_clear_button_text,
mInitiateListener,
ButtonType.OTHER,
R.style.SuwGlifButton_Primary)
);
mInitiateButton = buttonFooterMixin.getPrimaryButton();
}
private void getContentDescription(View v, StringBuffer description) {

17
src/com/android/settings/MasterClearConfirm.java
View File

@@ -45,7 +45,9 @@ import com.android.settings.enterprise.ActionDisabledByAdminDialogHelper;
import com.android.settingslib.RestrictedLockUtilsInternal;
import com.google.android.setupcompat.TemplateLayout;
import com.google.android.setupdesign.template.ButtonFooterMixin;
import com.google.android.setupcompat.item.FooterButton;
import com.google.android.setupcompat.item.FooterButton.ButtonType;
import com.google.android.setupcompat.template.ButtonFooterMixin;
/**
* Confirm and execute a reset of the device to a clean "just out of the box"
@@ -153,11 +155,14 @@ public class MasterClearConfirm extends InstrumentedFragment {
final TemplateLayout layout = mContentView.findViewById(R.id.setup_wizard_layout);
final ButtonFooterMixin buttonFooterMixin = layout.getMixin(ButtonFooterMixin.class);
buttonFooterMixin.removeAllViews();
buttonFooterMixin.addSpace();
buttonFooterMixin.addSpace();
buttonFooterMixin.addButton(R.string.master_clear_button_text,
R.style.SuwGlifButton_Primary).setOnClickListener(mFinalClickListener);
buttonFooterMixin.setPrimaryButton(
new FooterButton(
getActivity(),
R.string.master_clear_button_text,
mFinalClickListener,
ButtonType.OTHER,
R.style.SuwGlifButton_Primary)
);
}
private void setUpActionBarAndTitle() {

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

@@ -51,6 +51,7 @@ 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;
@@ -386,7 +387,7 @@ public class MasterClearTest {
public void testOnGlobalLayout_shouldNotRemoveListener() {
final ViewTreeObserver viewTreeObserver = mock(ViewTreeObserver.class);
mMasterClear.mScrollView = mScrollView;
mMasterClear.mInitiateButton = mock(Button.class);
mMasterClear.mInitiateButton = mock(FooterButton.class);
doReturn(true).when(mMasterClear).hasReachedBottom(any());
when(mScrollView.getViewTreeObserver()).thenReturn(viewTreeObserver);