diff --git a/quickstep/res/layout/activity_allset.xml b/quickstep/res/layout/activity_allset.xml
index 4fbb8a028d..b4ee4828a6 100644
--- a/quickstep/res/layout/activity_allset.xml
+++ b/quickstep/res/layout/activity_allset.xml
@@ -14,81 +14,93 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-
+ android:id="@+id/root_view"
+ android:background="@color/all_set_page_background" >
-
-
-
+ android:layout_height="match_parent"
+ android:layout_marginStart="@dimen/allset_page_margin_horizontal"
+ android:layout_marginEnd="@dimen/allset_page_margin_horizontal"
+ android:layoutDirection="locale"
+ android:textDirection="locale"
+ android:id="@+id/content_view"
+ android:forceHasOverlappingRendering="false"
+ android:fitsSystemWindows="true" >
-
+
-
+
-
+
-
+
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/quickstep/res/values-night/colors.xml b/quickstep/res/values-night/colors.xml
index c3b253654e..af6e0647a1 100644
--- a/quickstep/res/values-night/colors.xml
+++ b/quickstep/res/values-night/colors.xml
@@ -22,4 +22,6 @@
#202124
#3c4043
+ #FF000000
+
\ No newline at end of file
diff --git a/quickstep/res/values-night/styles.xml b/quickstep/res/values-night/styles.xml
index 1bd3f5d138..e6b345010d 100644
--- a/quickstep/res/values-night/styles.xml
+++ b/quickstep/res/values-night/styles.xml
@@ -21,7 +21,7 @@
- @android:color/transparent
- false
- false
- - #FF000000
+ - @android:color/transparent
\ No newline at end of file
diff --git a/quickstep/res/values/colors.xml b/quickstep/res/values/colors.xml
index 5edcc9d951..1bddb57b2b 100644
--- a/quickstep/res/values/colors.xml
+++ b/quickstep/res/values/colors.xml
@@ -72,4 +72,7 @@
#e8eaed
#80868b
#bdc1c6
+
+ #FFFFFFFF
+
\ No newline at end of file
diff --git a/quickstep/res/values/dimens.xml b/quickstep/res/values/dimens.xml
index e08eda8d3c..fa21b0a8fc 100644
--- a/quickstep/res/values/dimens.xml
+++ b/quickstep/res/values/dimens.xml
@@ -161,6 +161,7 @@
32dp
24dp
348dp
+ 10dp
8dp
diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index b5444b5b57..40e18ec11f 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -115,7 +115,7 @@
- @android:color/transparent
- false
- true
- - #FFFFFFFF
+ - @android:color/transparent