Merge "Fix lock pattern is truncated during SUW in folded state" into udc-qpr-dev am: f733b7b0ff
am: de251cc896
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23737990 Change-Id: Id6bc8a4b0545fb21f339d1eccf1c131c375de82d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -28,6 +28,7 @@ import android.content.res.Resources;
|
||||
import android.os.UserHandle;
|
||||
import android.util.TypedValue;
|
||||
import android.view.View;
|
||||
import android.view.ViewGroup;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
@@ -114,6 +115,14 @@ public class SetupChooseLockPatternTest {
|
||||
assertThat(button.getVisibility()).isEqualTo(View.VISIBLE);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void headerView_noBottomMargin() {
|
||||
final View header = mActivity.findViewById(R.id.sud_layout_header);
|
||||
final ViewGroup.MarginLayoutParams lp =
|
||||
(ViewGroup.MarginLayoutParams) header.getLayoutParams();
|
||||
assertThat(lp.bottomMargin).isEqualTo(0);
|
||||
}
|
||||
|
||||
private void verifyScreenLockOptionsShown() {
|
||||
final Button button = mActivity.findViewById(R.id.screen_lock_options);
|
||||
assertThat(button).isNotNull();
|
||||
|
Reference in New Issue
Block a user