From 6c08d882d3866436d1bf5ce9e07fd02db9657ba6 Mon Sep 17 00:00:00 2001
From: Rajat Talesra <rajattalesra4914@gmail.com>
Date: Thu, 12 May 2022 23:49:22 +0530
Subject: [PATCH] Fix #3453 & #3454: Optimise UI pin related screens -
 pin_password_activity, admin_auth_activity, admin_pin_activity  (#4355)

* Fixed UI for mobile view

* Optimised pin-password-activity.xml

* admin_pin_activity.xml + nits

* admin_auth_activity optimised

* Nit fixes

* Nit fixes
---
 .../profile/PinPasswordActivityPresenter.kt   |   2 +-
 .../res/layout-land/admin_auth_activity.xml   | 138 ----------
 .../res/layout-land/admin_pin_activity.xml    | 126 ---------
 .../admin_auth_activity.xml                   | 136 ----------
 .../admin_pin_activity.xml                    | 127 ---------
 .../admin_auth_activity.xml                   | 125 ---------
 .../admin_pin_activity.xml                    | 134 ---------
 .../main/res/layout/admin_auth_activity.xml   |  56 ++--
 .../main/res/layout/admin_pin_activity.xml    | 203 +++++++-------
 .../main/res/layout/pin_password_activity.xml | 255 +++++++++---------
 app/src/main/res/values-land/dimens.xml       |  35 ++-
 .../main/res/values-sw600dp-land/dimens.xml   |  35 ++-
 .../main/res/values-sw600dp-port/dimens.xml   |  43 ++-
 app/src/main/res/values/dimens.xml            |  38 ++-
 14 files changed, 384 insertions(+), 1069 deletions(-)
 delete mode 100644 app/src/main/res/layout-land/admin_auth_activity.xml
 delete mode 100644 app/src/main/res/layout-land/admin_pin_activity.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
 delete mode 100644 app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml

diff --git a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
index 1894391df81..1a7ba8e23dc 100644
--- a/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
+++ b/app/src/main/java/org/oppia/android/app/profile/PinPasswordActivityPresenter.kt
@@ -52,7 +52,7 @@ class PinPasswordActivityPresenter @Inject constructor(
       viewModel = pinViewModel
     }
 
-    binding.pinPassordToolbar.setNavigationOnClickListener {
+    binding.pinPasswordToolbar.setNavigationOnClickListener {
       (activity as PinPasswordActivity).finish()
     }
 
diff --git a/app/src/main/res/layout-land/admin_auth_activity.xml b/app/src/main/res/layout-land/admin_auth_activity.xml
deleted file mode 100644
index d8033a9423a..00000000000
--- a/app/src/main/res/layout-land/admin_auth_activity.xml
+++ /dev/null
@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.profile.AdminAuthViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/admin_auth_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/component_color_admin_auth_layout_background_color">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/admin_auth_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/admin_auth_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/component_color_admin_auth_activity_toolbar_color"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/admin_auth_close"
-        app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:title="@string/admin_auth_toolbar"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/color_def_white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/admin_auth_app_bar_layout">
-
-      <ScrollView
-        android:id="@+id/admin_auth_landscape_scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:scrollbars="none">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:paddingBottom="92dp">
-
-          <TextView
-            android:id="@+id/admin_auth_heading_textview"
-            style="@style/Heading2ViewStart"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="72dp"
-            android:layout_marginTop="44dp"
-            android:layout_marginEnd="72dp"
-            android:maxLines="2"
-            android:text="@string/admin_auth_heading"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-          <TextView
-            android:id="@+id/admin_auth_sub_text"
-            style="@style/Subtitle1ViewStart"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/admin_auth_sub"
-            android:textColor="@color/component_color_admin_auth_secondary_text_color"
-            app:layout_constraintEnd_toEndOf="@+id/admin_auth_heading_textview"
-            app:layout_constraintStart_toStartOf="@+id/admin_auth_heading_textview"
-            app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
-
-          <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/admin_auth_input_pin"
-            style="@style/TextInputLayout"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="168dp"
-            android:layout_marginTop="48dp"
-            android:layout_marginEnd="168dp"
-            android:layout_marginBottom="4dp"
-            android:hint="@string/admin_auth_pin"
-            app:errorMessage="@{viewModel.errorMessage}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/admin_auth_sub_text">
-
-            <com.google.android.material.textfield.TextInputEditText
-              android:id="@+id/admin_auth_input_pin_edit_text"
-              style="@style/TextInputEditText"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:imeOptions="actionDone"
-              android:inputType="numberPassword"
-              android:maxLength="5"
-              app:textChangedListener="@{viewModel.inputPinTextWatcher}" />
-          </com.google.android.material.textfield.TextInputLayout>
-
-          <Button
-            android:id="@+id/admin_auth_submit_button"
-            style="@style/StateButtonActive"
-            android:layout_marginTop="44dp"
-            android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
-            android:enabled="@{viewModel.isSubmitButtonActive}"
-            android:minHeight="48dp"
-            android:text="@string/admin_auth_submit"
-            android:textColor="@{viewModel.isSubmitButtonActive ? @color/color_def_white : @color/submit_button_inactive_text }"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/admin_auth_input_pin"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="@id/admin_auth_input_pin"
-            app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-      </ScrollView>
-
-      <View
-        android:id="@+id/admin_auth_toolbar_shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-land/admin_pin_activity.xml b/app/src/main/res/layout-land/admin_pin_activity.xml
deleted file mode 100644
index 9b1603d8833..00000000000
--- a/app/src/main/res/layout-land/admin_pin_activity.xml
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.profile.AdminPinViewModel" />
-  </data>
-
-  <androidx.core.widget.NestedScrollView
-    android:id="@+id/scrollViewAdminPin"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/admin_auth_container"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:background="@color/component_color_admin_pin_activity_layout_background_color"
-      android:paddingBottom="108dp">
-
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-      <TextView
-        android:id="@+id/admin_pin_main_text"
-        style="@style/Subtitle1ViewStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="72dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="72dp"
-        android:text="@string/admin_pin_requirement_description"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-      <TextView
-        android:id="@+id/admin_pin_warning_text"
-        style="@style/Subtitle1ViewStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="72dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="72dp"
-        android:text="@string/admin_pin_pin_description"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_main_text" />
-
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/admin_pin_input_pin"
-        style="@style/TextInputLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="168dp"
-        android:layout_marginTop="48dp"
-        android:layout_marginEnd="168dp"
-        android:hint="@string/admin_pin_new_pin"
-        app:errorMessage="@{viewModel.pinErrorMsg}"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_warning_text">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/admin_pin_input_pin_edit_text"
-          style="@style/TextInputEditText"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:imeOptions="actionNext"
-          android:inputType="numberPassword"
-          android:maxLength="5"
-          android:text="@{viewModel.savedPin}" />
-      </com.google.android.material.textfield.TextInputLayout>
-
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/admin_pin_input_confirm_pin"
-        style="@style/TextInputLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="168dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="168dp"
-        android:hint="@string/admin_pin_new_confirm"
-        app:errorMessage="@{viewModel.confirmPinErrorMsg}"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_pin">
-
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/admin_pin_input_confirm_pin_edit_text"
-          style="@style/TextInputEditText"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:imeOptions="actionDone"
-          android:inputType="numberPassword"
-          android:maxLength="5"
-          android:text="@{viewModel.savedConfirmPin}" />
-      </com.google.android.material.textfield.TextInputLayout>
-
-      <Button
-        android:id="@+id/submit_button"
-        style="@style/StateButtonActive"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="24dp"
-        android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
-        android:clickable="@{viewModel.isButtonActive()}"
-        android:enabled="@{viewModel.isButtonActive()}"
-        android:minHeight="48dp"
-        android:text="@string/save"
-        android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }"
-        app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </androidx.core.widget.NestedScrollView>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
deleted file mode 100644
index de1d6cae36b..00000000000
--- a/app/src/main/res/layout-sw600dp-land/admin_auth_activity.xml
+++ /dev/null
@@ -1,136 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.profile.AdminAuthViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/admin_auth_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/component_color_admin_auth_layout_background_color">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/admin_auth_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/admin_auth_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/component_color_admin_auth_activity_toolbar_color"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/admin_auth_close"
-        app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:title="@string/admin_auth_toolbar"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/color_def_white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/admin_auth_app_bar_layout">
-
-      <ScrollView
-        android:id="@+id/admin_auth_landscape_scrollView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:overScrollMode="never"
-        android:scrollbars="none">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_gravity="center_horizontal"
-          android:minWidth="360dp"
-          android:paddingBottom="92dp">
-
-          <TextView
-            android:id="@+id/admin_auth_heading_textview"
-            style="@style/Heading2ViewStart"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="48dp"
-            android:maxLines="2"
-            android:text="@string/admin_auth_heading"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-          <TextView
-            android:id="@+id/admin_auth_sub_text"
-            style="@style/Subtitle1ViewStart"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="12dp"
-            android:text="@string/admin_auth_sub"
-            android:textColor="@color/component_color_admin_auth_secondary_text_color"
-            app:layout_constraintEnd_toEndOf="@+id/admin_auth_heading_textview"
-            app:layout_constraintStart_toStartOf="@+id/admin_auth_heading_textview"
-            app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
-
-          <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/admin_auth_input_pin"
-            style="@style/TextInputLayout"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="40dp"
-            android:layout_marginBottom="4dp"
-            android:hint="@string/admin_auth_pin"
-            app:errorMessage="@{viewModel.errorMessage}"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/admin_auth_sub_text">
-
-            <com.google.android.material.textfield.TextInputEditText
-              android:id="@+id/admin_auth_input_pin_edit_text"
-              style="@style/TextInputEditText"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:imeOptions="actionDone"
-              android:inputType="numberPassword"
-              android:maxLength="5"
-              app:textChangedListener="@{viewModel.inputPinTextWatcher}" />
-          </com.google.android.material.textfield.TextInputLayout>
-
-          <Button
-            android:id="@+id/admin_auth_submit_button"
-            style="@style/StateButtonActive"
-            android:layout_marginTop="58dp"
-            android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
-            android:enabled="@{viewModel.isSubmitButtonActive}"
-            android:minHeight="36dp"
-            android:text="@string/admin_auth_submit"
-            android:textColor="@{viewModel.isSubmitButtonActive ? @color/color_def_white : @color/submit_button_inactive_text }"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="@id/admin_auth_input_pin"
-            app:layout_constraintHorizontal_bias="1.0"
-            app:layout_constraintStart_toStartOf="@id/admin_auth_input_pin"
-            app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin" />
-        </androidx.constraintlayout.widget.ConstraintLayout>
-      </ScrollView>
-
-      <View
-        android:id="@+id/admin_auth_toolbar_shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml b/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml
deleted file mode 100644
index 95ab00c94f6..00000000000
--- a/app/src/main/res/layout-sw600dp-land/admin_pin_activity.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.profile.AdminPinViewModel" />
-  </data>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/component_color_admin_pin_activity_layout_background_color"
-    android:orientation="vertical">
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="6dp"
-      android:background="@drawable/toolbar_drop_shadow"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.core.widget.NestedScrollView
-      android:id="@+id/scrollViewAdminPin"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:fillViewport="true">
-
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/admin_auth_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:clipToPadding="false"
-        android:minWidth="360dp"
-        android:paddingBottom="148dp">
-
-        <TextView
-          android:id="@+id/admin_pin_main_text"
-          style="@style/Subtitle1ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="32dp"
-          android:text="@string/admin_pin_requirement_description"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-          android:id="@+id/admin_pin_warning_text"
-          style="@style/Subtitle1ViewStart"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="16dp"
-          android:text="@string/admin_pin_pin_description"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_main_text" />
-
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/admin_pin_input_pin"
-          style="@style/TextInputLayout"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="48dp"
-          android:hint="@string/admin_pin_new_pin"
-          app:errorMessage="@{viewModel.pinErrorMsg}"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_warning_text">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/admin_pin_input_pin_edit_text"
-            style="@style/TextInputEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionNext"
-            android:inputType="numberPassword"
-            android:maxLength="5"
-            android:text="@{viewModel.savedPin}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/admin_pin_input_confirm_pin"
-          style="@style/TextInputLayout"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="16dp"
-          android:hint="@string/admin_pin_new_confirm"
-          app:errorMessage="@{viewModel.confirmPinErrorMsg}"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintHorizontal_bias="0.0"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_pin">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/admin_pin_input_confirm_pin_edit_text"
-            style="@style/TextInputEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="numberPassword"
-            android:maxLength="5"
-            android:text="@{viewModel.savedConfirmPin}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <Button
-          android:id="@+id/submit_button"
-          style="@style/StateButtonActive"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="24dp"
-          android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
-          android:clickable="@{viewModel.isButtonActive()}"
-          android:enabled="@{viewModel.isButtonActive()}"
-          android:minHeight="48dp"
-          android:text="@string/save"
-          android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }"
-          app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-  </LinearLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml b/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
deleted file mode 100644
index ecee792b990..00000000000
--- a/app/src/main/res/layout-sw600dp-port/admin_auth_activity.xml
+++ /dev/null
@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.profile.AdminAuthViewModel" />
-  </data>
-
-  <androidx.constraintlayout.widget.ConstraintLayout
-    android:id="@+id/admin_auth_container"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/component_color_admin_auth_layout_background_color">
-
-    <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/admin_auth_app_bar_layout"
-      android:layout_width="0dp"
-      android:layout_height="wrap_content"
-      android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent">
-
-      <androidx.appcompat.widget.Toolbar
-        android:id="@+id/admin_auth_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="?attr/actionBarSize"
-        android:background="@color/component_color_admin_auth_activity_toolbar_color"
-        android:fontFamily="sans-serif"
-        android:minHeight="?attr/actionBarSize"
-        app:navigationContentDescription="@string/admin_auth_close"
-        app:navigationIcon="@drawable/ic_close_white_24dp"
-        app:title="@string/admin_auth_toolbar"
-        app:titleTextAppearance="@style/ToolbarTextAppearance"
-        app:titleTextColor="@color/color_def_white" />
-    </com.google.android.material.appbar.AppBarLayout>
-
-    <FrameLayout
-      android:layout_width="0dp"
-      android:layout_height="0dp"
-      app:layout_constraintBottom_toBottomOf="parent"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/admin_auth_app_bar_layout">
-
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="center_horizontal"
-        android:minWidth="360dp">
-
-        <TextView
-          android:id="@+id/admin_auth_heading_textview"
-          style="@style/Heading2ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="48dp"
-          android:maxLines="2"
-          android:text="@string/admin_auth_heading"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-          android:id="@+id/admin_auth_sub_text"
-          style="@style/Subtitle1ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="12dp"
-          android:text="@string/admin_auth_sub"
-          android:textColor="@color/component_color_admin_auth_secondary_text_color"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
-
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/admin_auth_input_pin"
-          style="@style/TextInputLayout"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="40dp"
-          android:hint="@string/admin_auth_pin"
-          app:errorMessage="@{viewModel.errorMessage}"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@id/admin_auth_sub_text">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/admin_auth_input_pin_edit_text"
-            style="@style/TextInputEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="numberPassword"
-            android:maxLength="5"
-            app:textChangedListener="@{viewModel.inputPinTextWatcher}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <Button
-          android:id="@+id/admin_auth_submit_button"
-          style="@style/StateButtonActive"
-          android:layout_marginTop="48dp"
-          android:layout_marginBottom="44dp"
-          android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
-          android:enabled="@{viewModel.isSubmitButtonActive}"
-          android:minHeight="36dp"
-          android:text="@string/admin_auth_submit"
-          android:textColor="@{viewModel.isSubmitButtonActive ? @color/color_def_white : @color/submit_button_inactive_text }"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="@+id/admin_auth_input_pin"
-          app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin"
-          app:layout_constraintVertical_bias="0.0" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-
-      <View
-        android:id="@+id/admin_auth_toolbar_shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
-  </androidx.constraintlayout.widget.ConstraintLayout>
-</layout>
diff --git a/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml b/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml
deleted file mode 100644
index 082d826e5dd..00000000000
--- a/app/src/main/res/layout-sw600dp-port/admin_pin_activity.xml
+++ /dev/null
@@ -1,134 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:app="http://schemas.android.com/apk/res-auto">
-
-  <data>
-
-    <variable
-      name="viewModel"
-      type="org.oppia.android.app.profile.AdminPinViewModel" />
-  </data>
-
-  <LinearLayout
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/component_color_admin_pin_activity_layout_background_color"
-    android:orientation="vertical">
-
-    <View
-      android:layout_width="match_parent"
-      android:layout_height="6dp"
-      android:background="@drawable/toolbar_drop_shadow"
-      app:layout_constraintEnd_toEndOf="parent"
-      app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.core.widget.NestedScrollView
-      android:id="@+id/scrollViewAdminPin"
-      android:layout_width="match_parent"
-      android:layout_height="match_parent"
-      android:fillViewport="true">
-
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/admin_auth_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:clipToPadding="false"
-        android:minWidth="360dp"
-        android:paddingBottom="224dp">
-
-        <TextView
-          android:id="@+id/admin_pin_main_text"
-          style="@style/Subtitle1ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
-          android:layout_marginTop="32dp"
-          android:layout_marginEnd="28dp"
-          android:text="@string/admin_pin_requirement_description"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-          android:id="@+id/admin_pin_warning_text"
-          style="@style/Subtitle1ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
-          android:layout_marginTop="16dp"
-          android:layout_marginEnd="28dp"
-          android:text="@string/admin_pin_pin_description"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_main_text" />
-
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/admin_pin_input_pin"
-          style="@style/TextInputLayout"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
-          android:layout_marginTop="28dp"
-          android:layout_marginEnd="28dp"
-          android:hint="@string/admin_pin_new_pin"
-          app:errorMessage="@{viewModel.pinErrorMsg}"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_warning_text">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/admin_pin_input_pin_edit_text"
-            style="@style/TextInputEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionNext"
-            android:inputType="numberPassword"
-            android:maxLength="5"
-            android:text="@{viewModel.savedPin}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <com.google.android.material.textfield.TextInputLayout
-          android:id="@+id/admin_pin_input_confirm_pin"
-          style="@style/TextInputLayout"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
-          android:layout_marginTop="16dp"
-          android:layout_marginEnd="28dp"
-          android:hint="@string/admin_pin_new_confirm"
-          app:errorMessage="@{viewModel.confirmPinErrorMsg}"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_pin">
-
-          <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/admin_pin_input_confirm_pin_edit_text"
-            style="@style/TextInputEditText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="numberPassword"
-            android:maxLength="5"
-            android:text="@{viewModel.savedConfirmPin}" />
-        </com.google.android.material.textfield.TextInputLayout>
-
-        <Button
-          android:id="@+id/submit_button"
-          style="@style/StateButtonActive"
-          android:layout_width="wrap_content"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="48dp"
-          android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
-          android:clickable="@{viewModel.isButtonActive()}"
-          android:enabled="@{viewModel.isButtonActive()}"
-          android:minHeight="48dp"
-          android:text="@string/save"
-          android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }"
-          app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin"
-          app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" />
-      </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-  </LinearLayout>
-</layout>
diff --git a/app/src/main/res/layout/admin_auth_activity.xml b/app/src/main/res/layout/admin_auth_activity.xml
index 6bb08456331..58d219619ca 100644
--- a/app/src/main/res/layout/admin_auth_activity.xml
+++ b/app/src/main/res/layout/admin_auth_activity.xml
@@ -38,9 +38,13 @@
         app:titleTextColor="@color/color_def_white" />
     </com.google.android.material.appbar.AppBarLayout>
 
-    <FrameLayout
-      android:layout_width="0dp"
+    <androidx.core.widget.NestedScrollView
+      android:id="@+id/scrollViewAdminPin"
+      android:layout_width="@dimen/admin_auth_activity_layout_width"
       android:layout_height="0dp"
+      android:fillViewport="true"
+      android:overScrollMode="never"
+      android:scrollbars="none"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
@@ -48,16 +52,20 @@
 
       <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="0dp"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="@dimen/admin_auth_activity_margin_start"
+        android:layout_marginEnd="@dimen/admin_auth_activity_margin_end"
+        android:paddingBottom="@dimen/admin_auth_activity_padding_bottom">
 
         <TextView
           android:id="@+id/admin_auth_heading_textview"
           style="@style/Heading2ViewStart"
-          android:layout_width="match_parent"
+          android:layout_width="0dp"
           android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
+          android:layout_marginStart="@dimen/admin_auth_activity_admin_pin_main_text_view_margin_start"
           android:layout_marginTop="40dp"
-          android:layout_marginEnd="28dp"
+          android:layout_marginEnd="@dimen/admin_auth_activity_admin_pin_main_text_view_margin_end"
           android:maxLines="2"
           android:text="@string/admin_auth_heading"
           app:layout_constraintEnd_toEndOf="parent"
@@ -69,23 +77,19 @@
           style="@style/Subtitle1ViewStart"
           android:layout_width="0dp"
           android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
           android:layout_marginTop="12dp"
-          android:layout_marginEnd="28dp"
           android:text="@string/admin_auth_sub"
           android:textColor="@color/component_color_admin_auth_secondary_text_color"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintEnd_toEndOf="@id/admin_auth_heading_textview"
+          app:layout_constraintStart_toStartOf="@id/admin_auth_heading_textview"
           app:layout_constraintTop_toBottomOf="@id/admin_auth_heading_textview" />
 
         <com.google.android.material.textfield.TextInputLayout
           android:id="@+id/admin_auth_input_pin"
           style="@style/TextInputLayout"
-          android:layout_width="match_parent"
+          android:layout_width="@dimen/admin_auth_activity_input_width"
           android:layout_height="wrap_content"
-          android:layout_marginStart="28dp"
           android:layout_marginTop="48dp"
-          android:layout_marginEnd="28dp"
           android:hint="@string/admin_auth_pin"
           app:errorMessage="@{viewModel.errorMessage}"
           app:layout_constraintEnd_toEndOf="parent"
@@ -106,27 +110,27 @@
         <Button
           android:id="@+id/admin_auth_submit_button"
           style="@style/StateButtonActive"
+          android:layout_marginStart="0dp"
           android:layout_marginTop="48dp"
-          android:layout_marginEnd="28dp"
-          android:layout_marginBottom="44dp"
+          android:layout_marginEnd="0dp"
           android:background="@{viewModel.isSubmitButtonActive ? @drawable/state_button_primary_background :@drawable/start_button_transparent_background}"
           android:enabled="@{viewModel.isSubmitButtonActive}"
           android:minHeight="48dp"
           android:text="@string/admin_auth_submit"
           android:textColor="@{viewModel.isSubmitButtonActive ? @color/color_def_white : @color/submit_button_inactive_text }"
-          app:layout_constraintBottom_toBottomOf="parent"
-          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintEnd_toEndOf="@id/admin_auth_input_pin"
           app:layout_constraintHorizontal_bias="1.0"
-          app:layout_constraintStart_toStartOf="@+id/admin_auth_sub_text"
-          app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin"
-          app:layout_constraintVertical_bias="0.0" />
+          app:layout_constraintTop_toBottomOf="@id/admin_auth_input_pin" />
       </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 
-      <View
-        android:id="@+id/admin_auth_toolbar_shadow_view"
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
-    </FrameLayout>
+    <View
+      android:id="@+id/admin_auth_toolbar_shadow_view"
+      android:layout_width="match_parent"
+      android:layout_height="6dp"
+      android:background="@drawable/toolbar_drop_shadow"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toBottomOf="@id/admin_auth_app_bar_layout" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/admin_pin_activity.xml b/app/src/main/res/layout/admin_pin_activity.xml
index cba726cacf4..bc63e17ab7c 100644
--- a/app/src/main/res/layout/admin_pin_activity.xml
+++ b/app/src/main/res/layout/admin_pin_activity.xml
@@ -9,118 +9,123 @@
       type="org.oppia.android.app.profile.AdminPinViewModel" />
   </data>
 
-  <androidx.core.widget.NestedScrollView
-    android:id="@+id/scrollViewAdminPin"
+  <androidx.constraintlayout.widget.ConstraintLayout
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fillViewport="true">
+    android:layout_height="match_parent">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-      android:id="@+id/admin_auth_container"
+    <androidx.core.widget.NestedScrollView
+      android:id="@+id/scrollViewAdminPin"
       android:layout_width="match_parent"
       android:layout_height="match_parent"
       android:background="@color/component_color_admin_pin_activity_layout_background_color"
-      android:paddingBottom="96dp">
+      android:fillViewport="true"
+      android:overScrollMode="never"
+      android:scrollbars="none">
 
-      <View
-        android:layout_width="0dp"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+      <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/admin_auth_container"
+        android:layout_width="@dimen/admin_pin_activity_layout_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_horizontal"
+        android:layout_marginStart="@dimen/admin_pin_activity_margin_start"
+        android:layout_marginEnd="@dimen/admin_pin_activity_margin_end"
+        android:paddingBottom="@dimen/admin_pin_activity_padding_bottom">
 
-      <TextView
-        android:id="@+id/admin_pin_main_text"
-        style="@style/Subtitle1ViewStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="32dp"
-        android:layout_marginEnd="28dp"
-        android:text="@string/admin_pin_requirement_description"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        <TextView
+          android:id="@+id/admin_pin_main_text"
+          style="@style/Subtitle1ViewStart"
+          android:layout_width="match_parent"
+          android:layout_height="wrap_content"
+          android:layout_marginStart="@dimen/admin_pin_activity_admin_pin_main_text_view_margin_start"
+          android:layout_marginTop="32dp"
+          android:layout_marginEnd="@dimen/admin_pin_activity_admin_pin_main_text_view_margin_end"
+          android:text="@string/admin_pin_requirement_description"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toTopOf="parent" />
 
-      <TextView
-        android:id="@+id/admin_pin_warning_text"
-        style="@style/Subtitle1ViewStart"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="28dp"
-        android:text="@string/admin_pin_pin_description"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_main_text" />
+        <TextView
+          android:id="@+id/admin_pin_warning_text"
+          style="@style/Subtitle1ViewStart"
+          android:layout_width="0dp"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="16dp"
+          android:text="@string/admin_pin_pin_description"
+          app:layout_constraintEnd_toEndOf="@id/admin_pin_main_text"
+          app:layout_constraintStart_toStartOf="@+id/admin_pin_main_text"
+          app:layout_constraintTop_toBottomOf="@+id/admin_pin_main_text" />
 
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/admin_pin_input_pin"
-        style="@style/TextInputLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="28dp"
-        android:layout_marginEnd="28dp"
-        android:hint="@string/admin_pin_new_pin"
-        app:errorMessage="@{viewModel.pinErrorMsg}"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_warning_text">
+        <com.google.android.material.textfield.TextInputLayout
+          android:id="@+id/admin_pin_input_pin"
+          style="@style/TextInputLayout"
+          android:layout_width="@dimen/admin_pin_activity_input_width"
+          android:layout_height="wrap_content"
+          android:layout_marginTop="28dp"
+          android:hint="@string/admin_pin_new_pin"
+          app:errorMessage="@{viewModel.pinErrorMsg}"
+          app:layout_constraintEnd_toEndOf="parent"
+          app:layout_constraintStart_toStartOf="parent"
+          app:layout_constraintTop_toBottomOf="@+id/admin_pin_warning_text">
 
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/admin_pin_input_pin_edit_text"
-          style="@style/TextInputEditText"
-          android:layout_width="match_parent"
+          <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/admin_pin_input_pin_edit_text"
+            style="@style/TextInputEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionNext"
+            android:inputType="numberPassword"
+            android:maxLength="5"
+            android:text="@{viewModel.savedPin}" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+          android:id="@+id/admin_pin_input_confirm_pin"
+          style="@style/TextInputLayout"
+          android:layout_width="@dimen/admin_pin_activity_input_width"
           android:layout_height="wrap_content"
-          android:imeOptions="actionNext"
-          android:inputType="numberPassword"
-          android:maxLength="5"
-          android:text="@{viewModel.savedPin}" />
-      </com.google.android.material.textfield.TextInputLayout>
+          android:layout_marginTop="16dp"
+          android:hint="@string/admin_pin_new_confirm"
+          app:errorMessage="@{viewModel.confirmPinErrorMsg}"
+          app:layout_constraintEnd_toEndOf="@id/admin_pin_input_pin"
+          app:layout_constraintStart_toStartOf="@id/admin_pin_input_pin"
+          app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_pin">
 
-      <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/admin_pin_input_confirm_pin"
-        style="@style/TextInputLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="28dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="28dp"
-        android:hint="@string/admin_pin_new_confirm"
-        app:errorMessage="@{viewModel.confirmPinErrorMsg}"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_pin">
+          <com.google.android.material.textfield.TextInputEditText
+            android:id="@+id/admin_pin_input_confirm_pin_edit_text"
+            style="@style/TextInputEditText"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:imeOptions="actionDone"
+            android:inputType="numberPassword"
+            android:maxLength="5"
+            android:text="@{viewModel.savedConfirmPin}" />
+        </com.google.android.material.textfield.TextInputLayout>
 
-        <com.google.android.material.textfield.TextInputEditText
-          android:id="@+id/admin_pin_input_confirm_pin_edit_text"
-          style="@style/TextInputEditText"
-          android:layout_width="match_parent"
+        <Button
+          android:id="@+id/submit_button"
+          style="@style/StateButtonActive"
+          android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:imeOptions="actionDone"
-          android:inputType="numberPassword"
-          android:maxLength="5"
-          android:text="@{viewModel.savedConfirmPin}" />
-      </com.google.android.material.textfield.TextInputLayout>
+          android:layout_marginStart="0dp"
+          android:layout_marginTop="48dp"
+          android:layout_marginEnd="0dp"
+          android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
+          android:clickable="@{viewModel.isButtonActive()}"
+          android:enabled="@{viewModel.isButtonActive()}"
+          android:minHeight="48dp"
+          android:text="@string/save"
+          android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }"
+          app:layout_constraintEnd_toEndOf="@id/admin_pin_input_confirm_pin"
+          app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" />
+      </androidx.constraintlayout.widget.ConstraintLayout>
+    </androidx.core.widget.NestedScrollView>
 
-      <Button
-        android:id="@+id/submit_button"
-        style="@style/StateButtonActive"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="48dp"
-        android:layout_marginEnd="28dp"
-        android:background="@{viewModel.isButtonActive() ? @drawable/state_button_primary_background : @drawable/start_button_transparent_background}"
-        android:clickable="@{viewModel.isButtonActive()}"
-        android:enabled="@{viewModel.isButtonActive()}"
-        android:minHeight="48dp"
-        android:text="@string/save"
-        android:textColor="@{viewModel.isButtonActive() ? @color/color_def_white : @color/submit_button_inactive_text }"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/admin_pin_input_confirm_pin" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-  </androidx.core.widget.NestedScrollView>
+    <View
+      android:layout_width="0dp"
+      android:layout_height="6dp"
+      android:background="@drawable/toolbar_drop_shadow"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="parent" />
+  </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/layout/pin_password_activity.xml b/app/src/main/res/layout/pin_password_activity.xml
index 663b3a311f4..ec69e39a879 100644
--- a/app/src/main/res/layout/pin_password_activity.xml
+++ b/app/src/main/res/layout/pin_password_activity.xml
@@ -20,7 +20,7 @@
     android:background="@color/component_color_pin_password_activity_layout_background_color">
 
     <com.google.android.material.appbar.AppBarLayout
-      android:id="@+id/pin_passord_app_bar_layout"
+      android:id="@+id/pin_password_app_bar_layout"
       android:layout_width="0dp"
       android:layout_height="wrap_content"
       android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
@@ -29,7 +29,7 @@
       app:layout_constraintTop_toTopOf="parent">
 
       <androidx.appcompat.widget.Toolbar
-        android:id="@+id/pin_passord_toolbar"
+        android:id="@+id/pin_password_toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
         android:background="?attr/colorPrimary"
@@ -43,158 +43,165 @@
     </com.google.android.material.appbar.AppBarLayout>
 
     <FrameLayout
-      android:layout_width="0dp"
+      android:id="@+id/pin_password_main_frame_layout"
+      android:layout_width="@dimen/pin_password_activity_layout_width"
       android:layout_height="0dp"
       android:background="@color/color_def_oppia_light_yellow"
       app:layout_constraintBottom_toBottomOf="parent"
       app:layout_constraintEnd_toEndOf="parent"
       app:layout_constraintStart_toStartOf="parent"
-      app:layout_constraintTop_toBottomOf="@id/pin_passord_app_bar_layout">
+      app:layout_constraintTop_toBottomOf="@id/pin_password_app_bar_layout">
+
       <ScrollView
         android:id="@+id/pin_password_scrollView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:overScrollMode="never"
         android:scrollbars="none">
-      <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:minWidth="@dimen/pin_password_min_width"
-        android:paddingTop="48dp">
-
-        <TextView
-          android:id="@+id/hello_text_view"
-          style="@style/Heading1ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:fontFamily="sans-serif-medium"
-          android:text="@{viewModel.helloText}"
-          android:textColor="@color/oppia_primary_text"
-          app:layout_constraintEnd_toEndOf="parent"
-          app:layout_constraintHorizontal_bias="0.0"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-          android:id="@+id/enter_text_view"
-          style="@style/Heading4ViewStart"
-          android:layout_width="0dp"
-          android:layout_height="wrap_content"
-          android:layout_marginTop="12dp"
-          android:text="@{viewModel.profile.isAdmin ? @string/pin_password_admin_enter : @string/pin_password_user_enter}"
-          android:textColor="@color/oppia_primary_text"
-          app:layout_constraintEnd_toEndOf="@+id/hello_text_view"
-          app:layout_constraintStart_toStartOf="@+id/hello_text_view"
-          app:layout_constraintTop_toBottomOf="@id/hello_text_view" />
 
         <androidx.constraintlayout.widget.ConstraintLayout
-          android:layout_width="wrap_content"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          app:layout_constraintEnd_toEndOf="parent"
-          android:layout_marginTop="24dp"
-          app:layout_constraintHorizontal_bias="@integer/pin_password_constraintHorizontal_bias"
-          app:layout_constraintStart_toStartOf="parent"
-          app:layout_constraintTop_toBottomOf="@+id/enter_text_view">
-
-          <com.google.android.material.textfield.TextInputLayout
-            android:id="@+id/pin_password_input_pin"
-            style="@style/TextInputLayout"
-            android:layout_width="@dimen/pin_password_text_input_layout_width"
-            android:layout_height="56dp"
-            android:layout_marginTop="2dp"
-            android:hint="@{viewModel.profile.isAdmin ? @string/input_pin_password_as_admin : @string/input_pin_password_as_user}"
-            app:layout_constraintEnd_toStartOf="@id/show_pin"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-            <com.google.android.material.textfield.TextInputEditText
-              android:id="@+id/pin_password_input_pin_edit_text"
-              style="@style/TextInputEditText"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:imeOptions="actionNext"
-              android:inputType="numberPassword"
-              android:maxLength="@{viewModel.profile.pin.length()}"
-              android:textSize="14sp" />
-          </com.google.android.material.textfield.TextInputLayout>
+          android:layout_gravity="center_horizontal"
+          android:layout_marginStart="@dimen/pin_password_activity_margin_start"
+          android:layout_marginEnd="@dimen/pin_password_activity_margin_end"
+          android:paddingTop="@dimen/pin_password_activity_padding_top">
 
           <TextView
-            android:id="@+id/pin_password_error_text_view"
-            style="@style/TextViewStart"
-            android:layout_width="match_parent"
+            android:id="@+id/hello_text_view"
+            style="@style/Heading1ViewStart"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginStart="8dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="8dp"
-            android:text="@string/pin_password_incorrect_pin"
-            android:textColor="@color/edit_text_error"
-            android:textSize="16sp"
-            android:visibility="@{viewModel.showError ? View.VISIBLE : View.INVISIBLE}"
+            android:layout_marginStart="@dimen/pin_password_activity_hello_text_view_margin_start"
+            android:layout_marginEnd="@dimen/pin_password_activity_hello_text_view_margin_end"
+            android:fontFamily="sans-serif-medium"
+            android:text="@{viewModel.helloText}"
+            android:textColor="@color/oppia_primary_text"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="@id/pin_password_input_pin"
-            app:layout_constraintTop_toBottomOf="@+id/pin_password_input_pin" />
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
           <TextView
-            android:id="@+id/forgot_pin"
-            style="@style/Heading5ViewStart"
-            android:layout_width="match_parent"
+            android:id="@+id/enter_text_view"
+            style="@style/Heading4ViewStart"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:minHeight="48dp"
-            android:paddingTop="8dp"
-            android:text="@string/pin_password_forgot_pin"
-            android:textAllCaps="true"
-            android:textColor="@color/oppia_primary"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="0.0"
-            app:layout_constraintStart_toStartOf="@id/pin_password_input_pin"
-            app:layout_constraintTop_toBottomOf="@+id/pin_password_error_text_view" />
-
-          <LinearLayout
-            android:id="@+id/show_pin"
-            android:layout_width="match_parent"
+            android:layout_marginTop="12dp"
+            android:text="@{viewModel.profile.isAdmin ? @string/pin_password_admin_enter : @string/pin_password_user_enter}"
+            android:textColor="@color/oppia_primary_text"
+            app:layout_constraintEnd_toEndOf="@+id/hello_text_view"
+            app:layout_constraintStart_toStartOf="@+id/hello_text_view"
+            app:layout_constraintTop_toBottomOf="@id/hello_text_view" />
+
+          <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="@dimen/pin_password_activity_input_with_icon_width"
             android:layout_height="wrap_content"
-            android:layout_marginStart="16dp"
-            android:layout_marginEnd="16dp"
-            android:minWidth="48dp"
-            android:minHeight="48dp"
-            android:orientation="vertical"
-            app:layout_constraintBottom_toBottomOf="@+id/pin_password_input_pin"
-            app:layout_constraintHorizontal_bias="0.0"
+            android:layout_marginTop="24dp"
             app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toEndOf="@+id/pin_password_input_pin"
-            app:layout_constraintTop_toTopOf="@+id/pin_password_input_pin">
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/enter_text_view">
+
+            <com.google.android.material.textfield.TextInputLayout
+              android:id="@+id/pin_password_input_pin"
+              style="@style/TextInputLayout"
+              android:layout_width="0dp"
+              android:layout_height="56dp"
+              android:layout_marginTop="2dp"
+              android:hint="@{viewModel.profile.isAdmin ? @string/input_pin_password_as_admin : @string/input_pin_password_as_user}"
+              app:layout_constraintEnd_toStartOf="@id/show_pin"
+              app:layout_constraintStart_toStartOf="parent"
+              app:layout_constraintTop_toTopOf="parent">
+
+              <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/pin_password_input_pin_edit_text"
+                style="@style/TextInputEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionNext"
+                android:inputType="numberPassword"
+                android:maxLength="@{viewModel.profile.pin.length()}"
+                android:textSize="14sp" />
+            </com.google.android.material.textfield.TextInputLayout>
 
-            <ImageView
-              android:id="@+id/show_hide_password_image_view"
-              android:layout_width="32dp"
-              android:layout_height="32dp"
-              android:layout_gravity="center_horizontal"
-              android:contentDescription="@{viewModel.showPassword ? @string/password_shown_icon : @string/password_hidden_icon}"
-              app:srcCompat="@{viewModel.showPassword ? @drawable/ic_show_eye_icon : @drawable/ic_hide_eye_icon}" />
+            <TextView
+              android:id="@+id/pin_password_error_text_view"
+              style="@style/TextViewStart"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="8dp"
+              android:layout_marginTop="2dp"
+              android:layout_marginEnd="8dp"
+              android:text="@string/pin_password_incorrect_pin"
+              android:textColor="@color/edit_text_error"
+              android:textSize="16sp"
+              android:visibility="@{viewModel.showError ? View.VISIBLE : View.INVISIBLE}"
+              app:layout_constraintEnd_toEndOf="parent"
+              app:layout_constraintHorizontal_bias="0.0"
+              app:layout_constraintStart_toStartOf="@id/pin_password_input_pin"
+              app:layout_constraintTop_toBottomOf="@+id/pin_password_input_pin" />
 
             <TextView
-              android:id="@+id/show_hide_password_text_view"
-              style="@style/TextViewCenter"
-              android:layout_width="wrap_content"
-              android:layout_height="match_parent"
-              android:layout_gravity="center_horizontal"
-              android:layout_marginTop="4dp"
-              android:fontFamily="sans-serif-medium"
-              android:text="@{viewModel.showPassword ? @string/pin_password_hide : @string/pin_password_show}"
+              android:id="@+id/forgot_pin"
+              style="@style/Heading5ViewStart"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:layout_marginTop="24dp"
+              android:minHeight="48dp"
+              android:paddingTop="8dp"
+              android:text="@string/pin_password_forgot_pin"
               android:textAllCaps="true"
-              android:textColor="@color/oppia_primary_text"
-              android:textSize="12sp" />
-          </LinearLayout>
+              android:textColor="@color/oppia_primary"
+              app:layout_constraintEnd_toEndOf="parent"
+              app:layout_constraintHorizontal_bias="0.0"
+              app:layout_constraintStart_toStartOf="@id/pin_password_input_pin"
+              app:layout_constraintTop_toBottomOf="@+id/pin_password_error_text_view" />
+
+            <LinearLayout
+              android:id="@+id/show_pin"
+              android:layout_width="wrap_content"
+              android:layout_height="wrap_content"
+              android:layout_marginStart="16dp"
+              android:minWidth="48dp"
+              android:minHeight="48dp"
+              android:orientation="vertical"
+              app:layout_constraintBottom_toBottomOf="@+id/pin_password_input_pin"
+              app:layout_constraintEnd_toEndOf="parent"
+              app:layout_constraintHorizontal_bias="0.0"
+              app:layout_constraintTop_toTopOf="@+id/pin_password_input_pin">
+
+              <ImageView
+                android:id="@+id/show_hide_password_image_view"
+                android:layout_width="32dp"
+                android:layout_height="32dp"
+                android:layout_gravity="center_horizontal"
+                android:contentDescription="@{viewModel.showPassword ? @string/password_shown_icon : @string/password_hidden_icon}"
+                app:srcCompat="@{viewModel.showPassword ? @drawable/ic_show_eye_icon : @drawable/ic_hide_eye_icon}" />
+
+              <TextView
+                android:id="@+id/show_hide_password_text_view"
+                style="@style/TextViewCenter"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="4dp"
+                android:fontFamily="sans-serif-medium"
+                android:text="@{viewModel.showPassword ? @string/pin_password_hide : @string/pin_password_show}"
+                android:textAllCaps="true"
+                android:textColor="@color/oppia_primary_text"
+                android:textSize="12sp" />
+            </LinearLayout>
+          </androidx.constraintlayout.widget.ConstraintLayout>
         </androidx.constraintlayout.widget.ConstraintLayout>
-      </androidx.constraintlayout.widget.ConstraintLayout>
       </ScrollView>
-      <View
-        android:layout_width="match_parent"
-        android:layout_height="6dp"
-        android:background="@drawable/toolbar_drop_shadow" />
     </FrameLayout>
+
+    <View
+      android:layout_width="match_parent"
+      android:layout_height="6dp"
+      android:background="@drawable/toolbar_drop_shadow"
+      app:layout_constraintEnd_toEndOf="parent"
+      app:layout_constraintStart_toStartOf="parent"
+      app:layout_constraintTop_toTopOf="@id/pin_password_main_frame_layout" />
   </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml
index ebd721a1ef7..7d77bfeccf1 100644
--- a/app/src/main/res/values-land/dimens.xml
+++ b/app/src/main/res/values-land/dimens.xml
@@ -300,13 +300,34 @@
   <dimen name="app_version_image_view_margin_start">36dp</dimen>
   <dimen name="app_version_text_view_margin_end">36dp</dimen>
 
-  <!-- Pin Password -->
-  <dimen name="pin_password_text_input_layout_width">244dp</dimen>
-  <item name="pin_password_constraintHorizontal_bias" format="float" type="integer">0.5</item>
-  <dimen name="pin_password_margin_start">72dp</dimen>
-  <dimen name="pin_password_margin_end">72dp</dimen>
-  <dimen name="pin_password_padding_top">48dp</dimen>
-  <dimen name="pin_password_min_width">496dp</dimen>
+  <!-- AdminAuthActivity -->
+  <dimen name="admin_auth_activity_layout_width">0dp</dimen>
+  <dimen name="admin_auth_activity_margin_start">0dp</dimen>
+  <dimen name="admin_auth_activity_margin_end">0dp</dimen>
+  <dimen name="admin_auth_activity_padding_top">32dp</dimen>
+  <dimen name="admin_auth_activity_padding_bottom">104dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_start">72dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_end">72dp</dimen>
+  <dimen name="admin_auth_activity_input_width">304dp</dimen>
+
+  <!-- AdminPinActivity -->
+  <dimen name="admin_pin_activity_layout_width">@dimen/match_parent</dimen>
+  <dimen name="admin_pin_activity_margin_start">0dp</dimen>
+  <dimen name="admin_pin_activity_margin_end">0dp</dimen>
+  <dimen name="admin_pin_activity_padding_top">32dp</dimen>
+  <dimen name="admin_pin_activity_padding_bottom">104dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_start">72dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_end">72dp</dimen>
+  <dimen name="admin_pin_activity_input_width">304dp</dimen>
+
+  <!-- PinPasswordActivity -->
+  <dimen name="pin_password_activity_layout_width">0dp</dimen>
+  <dimen name="pin_password_activity_margin_start">0dp</dimen>
+  <dimen name="pin_password_activity_margin_end">0dp</dimen>
+  <dimen name="pin_password_activity_padding_top">28dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_start">72dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_end">72dp</dimen>
+  <dimen name="pin_password_activity_input_with_icon_width">304dp</dimen>
 
   <!-- Add Profile -->
   <dimen name="add_profile_container_width">304dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-land/dimens.xml b/app/src/main/res/values-sw600dp-land/dimens.xml
index 60af2db02bf..92f2e89c0ba 100644
--- a/app/src/main/res/values-sw600dp-land/dimens.xml
+++ b/app/src/main/res/values-sw600dp-land/dimens.xml
@@ -313,13 +313,34 @@
   <dimen name="app_version_image_view_margin_start">24dp</dimen>
   <dimen name="app_version_text_view_margin_end">28dp</dimen>
 
-  <!-- Pin Password -->
-  <dimen name="pin_password_text_input_layout_width">304dp</dimen>
-  <item name="pin_password_constraintHorizontal_bias" format="float" type="integer">0.0</item>
-  <dimen name="pin_password_margin_start">332dp</dimen>
-  <dimen name="pin_password_margin_end">332dp</dimen>
-  <dimen name="pin_password_padding_top">48dp</dimen>
-  <dimen name="pin_password_min_width">360dp</dimen>
+  <!-- AdminAuthActivity -->
+  <dimen name="admin_auth_activity_layout_width">360dp</dimen>
+  <dimen name="admin_auth_activity_margin_start">0dp</dimen>
+  <dimen name="admin_auth_activity_margin_end">0dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
+  <dimen name="admin_auth_activity_padding_top">48dp</dimen>
+  <dimen name="admin_auth_activity_padding_bottom">96dp</dimen>
+  <dimen name="admin_auth_activity_input_width">0dp</dimen>
+
+  <!-- AdminPinActivity -->
+  <dimen name="admin_pin_activity_layout_width">360dp</dimen>
+  <dimen name="admin_pin_activity_margin_start">0dp</dimen>
+  <dimen name="admin_pin_activity_margin_end">0dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
+  <dimen name="admin_pin_activity_padding_top">48dp</dimen>
+  <dimen name="admin_pin_activity_padding_bottom">96dp</dimen>
+  <dimen name="admin_pin_activity_input_width">0dp</dimen>
+
+  <!-- PinPasswordActivity -->
+  <dimen name="pin_password_activity_layout_width">360dp</dimen>
+  <dimen name="pin_password_activity_margin_start">0dp</dimen>
+  <dimen name="pin_password_activity_margin_end">0dp</dimen>
+  <dimen name="pin_password_activity_padding_top">48dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_start">0dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_end">0dp</dimen>
+  <dimen name="pin_password_activity_input_with_icon_width">0dp</dimen>
 
   <!-- Add Profile -->
   <dimen name="add_profile_container_width">360dp</dimen>
diff --git a/app/src/main/res/values-sw600dp-port/dimens.xml b/app/src/main/res/values-sw600dp-port/dimens.xml
index 2930a3d53d2..b4034d2232f 100644
--- a/app/src/main/res/values-sw600dp-port/dimens.xml
+++ b/app/src/main/res/values-sw600dp-port/dimens.xml
@@ -301,7 +301,7 @@
   <!-- Topic Practice Footer View -->
   <dimen name="topic_practice_footer_view_margin_top">24dp</dimen>
   <dimen name="topic_practice_footer_view_margin_bottom">0dp</dimen>
-  
+
   <!-- App Version -->
   <dimen name="app_version_text_view_padding_start">16dp</dimen>
   <dimen name="app_version_text_view_padding_end">16dp</dimen>
@@ -320,13 +320,34 @@
   <dimen name="completed_story_list_fragment_recyclerview_padding_end">96dp</dimen>
   <dimen name="completed_story_list_fragment_recyclerview_padding_bottom">112dp</dimen>
 
-  <!-- Pin Password -->
-  <dimen name="pin_password_text_input_layout_width">304dp</dimen>
-  <item name="pin_password_constraintHorizontal_bias" format="float" type="integer">0.0</item>
-  <dimen name="pin_password_margin_start">204dp</dimen>
-  <dimen name="pin_password_margin_end">204dp</dimen>
-  <dimen name="pin_password_padding_top">48dp</dimen>
-  <dimen name="pin_password_min_width">360dp</dimen>
+  <!-- AdminAuthActivity -->
+  <dimen name="admin_auth_activity_layout_width">360dp</dimen>
+  <dimen name="admin_auth_activity_margin_start">0dp</dimen>
+  <dimen name="admin_auth_activity_margin_end">0dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
+  <dimen name="admin_auth_activity_padding_top">48dp</dimen>
+  <dimen name="admin_auth_activity_padding_bottom">96dp</dimen>
+  <dimen name="admin_auth_activity_input_width">0dp</dimen>
+
+  <!-- AdminPinActivity -->
+  <dimen name="admin_pin_activity_layout_width">360dp</dimen>
+  <dimen name="admin_pin_activity_margin_start">0dp</dimen>
+  <dimen name="admin_pin_activity_margin_end">0dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
+  <dimen name="admin_pin_activity_padding_top">48dp</dimen>
+  <dimen name="admin_pin_activity_padding_bottom">96dp</dimen>
+  <dimen name="admin_pin_activity_input_width">0dp</dimen>
+
+  <!-- PinPasswordActivity -->
+  <dimen name="pin_password_activity_layout_width">360dp</dimen>
+  <dimen name="pin_password_activity_margin_start">0dp</dimen>
+  <dimen name="pin_password_activity_margin_end">0dp</dimen>
+  <dimen name="pin_password_activity_padding_top">48dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_start">0dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_end">0dp</dimen>
+  <dimen name="pin_password_activity_input_with_icon_width">0dp</dimen>
 
   <!-- Add Profile -->
   <dimen name="add_profile_container_width">360dp</dimen>
@@ -431,7 +452,7 @@
   <!-- Hints and Solution Fragment -->
   <dimen name="hints_and_solution_recycler_view_padding_top">0dp</dimen>
   <dimen name="hints_and_solution_recycler_view_padding_bottom">112dp</dimen>
-  
+
   <!-- AdministratorControlDownloadPermissionsView -->
   <dimen name="administrator_controls_download_permissions_view_download_permissions_text_view_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_download_permissions_text_view_padding_end">16dp</dimen>
@@ -441,12 +462,12 @@
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_start">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_constraint_layout_padding_end">16dp</dimen>
   <dimen name="administrator_controls_download_permissions_view_auto_update_topic_widget_switch_compat_margin_end">4dp</dimen>
-  
+
   <!-- TopicLessonsSummary -->
   <dimen name="topic_lessons_summary_linear_layout_margin_start">12dp</dimen>
   <dimen name="topic_lessons_summary_linear_layout_margin_end">12dp</dimen>
   <dimen name="topic_lessons_summary_story_name_chapter_count_container_margin_start">12dp</dimen>
-  
+
   <!-- TopicPracticeHeader -->
   <dimen name="topic_practice_header_parent_constraint_layout_margin_top">32dp</dimen>
   <dimen name="topic_practice_header_parent_constraint_layout_padding_bottom">20dp</dimen>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 070409a453e..3597c67f0e1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -3,6 +3,7 @@
   <!-- Default screen margins, per the Android Design guidelines. -->
   <dimen name="activity_horizontal_margin">16dp</dimen>
   <dimen name="activity_vertical_margin">16dp</dimen>
+  <dimen name="match_parent">-2px</dimen>
   <dimen name="answer_tick_size">24dp</dimen>
   <dimen name="answer_tick_margin">12dp</dimen>
   <integer name="fade_in_duration_ms">1000</integer>
@@ -171,14 +172,35 @@
   <dimen name="drag_drop_content_group_item_margin">8dp</dimen>
   <dimen name="walkthrough_final_no_button_margin_end">8dp</dimen>
   <dimen name="walkthrough_final_yes_button_margin_start">8dp</dimen>
-  
-  <!-- Pin Password -->
-  <dimen name="pin_password_text_input_layout_width">244dp</dimen>
-  <item name="pin_password_constraintHorizontal_bias" format="float" type="integer">0.0</item>
-  <dimen name="pin_password_margin_start">28dp</dimen>
-  <dimen name="pin_password_margin_end">28dp</dimen>
-  <dimen name="pin_password_padding_top">40dp</dimen>
-  <dimen name="pin_password_min_width">304dp</dimen>
+
+  <!-- AdminAuthActivity -->
+  <dimen name="admin_auth_activity_layout_width">0dp</dimen>
+  <dimen name="admin_auth_activity_margin_start">28dp</dimen>
+  <dimen name="admin_auth_activity_margin_end">28dp</dimen>
+  <dimen name="admin_auth_activity_padding_top">32dp</dimen>
+  <dimen name="admin_auth_activity_padding_bottom">96dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
+  <dimen name="admin_auth_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
+  <dimen name="admin_auth_activity_input_width">0dp</dimen>
+
+  <!-- AdminPinActivity -->
+  <dimen name="admin_pin_activity_layout_width">@dimen/match_parent</dimen>
+  <dimen name="admin_pin_activity_margin_start">28dp</dimen>
+  <dimen name="admin_pin_activity_margin_end">28dp</dimen>
+  <dimen name="admin_pin_activity_padding_top">32dp</dimen>
+  <dimen name="admin_pin_activity_padding_bottom">96dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_start">0dp</dimen>
+  <dimen name="admin_pin_activity_admin_pin_main_text_view_margin_end">0dp</dimen>
+  <dimen name="admin_pin_activity_input_width">0dp</dimen>
+
+  <!-- PinPasswordActivity -->
+  <dimen name="pin_password_activity_layout_width">0dp</dimen>
+  <dimen name="pin_password_activity_margin_start">28dp</dimen>
+  <dimen name="pin_password_activity_margin_end">28dp</dimen>
+  <dimen name="pin_password_activity_padding_top">40dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_start">0dp</dimen>
+  <dimen name="pin_password_activity_hello_text_view_margin_end">0dp</dimen>
+  <dimen name="pin_password_activity_input_with_icon_width">0dp</dimen>
 
   <dimen name="submitted_answer_question_view_margin_end">64dp</dimen>
   <dimen name="submitted_answer_question_view_margin_start">64dp</dimen>