Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(173)

Unified Diff: chrome/android/java/res/layout/upgrade_activity.xml

Issue 1817083003: Add pathway to auto-migrate users when Chrome launches (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@assassin
Patch Set: Return to fix incognito case Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/res/layout/upgrade_activity.xml
diff --git a/chrome/android/java/res/layout/upgrade_activity.xml b/chrome/android/java/res/layout/upgrade_activity.xml
new file mode 100644
index 0000000000000000000000000000000000000000..975cf9336ba758937ed6d3022514c652798679d4
--- /dev/null
+++ b/chrome/android/java/res/layout/upgrade_activity.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2016 The Chromium Authors. All rights reserved.
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file. -->
+
+<!-- Adapted from webapp_splash_screen_large.xml.
+ Actual layout pending UX review. -->
+<RelativeLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/webapp_splash_screen_layout"
Ted C 2016/03/25 17:38:05 something else?
gone 2016/03/25 22:05:41 Will be redoing this with the redlines that just c
Ted C 2016/03/25 22:15:31 That is fine.
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginBottom="@dimen/webapp_splash_offset" >
+
+ <ImageView
+ android:id="@+id/logo_view"
+ android:layout_width="@dimen/signin_image_carousel_width"
Ted C 2016/03/25 17:38:05 ? that is an odd thing to reference here... any re
gone 2016/03/25 22:05:41 The image was a weird size, IIRC.
Ted C 2016/03/25 22:15:31 We should probably give this a more generic name (
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:contentDescription="@null"
+ android:src="@drawable/fre_product_logo" />
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_centerHorizontal="true"
+ android:layout_marginBottom="@dimen/webapp_splash_large_title_margin_bottom"
+ android:gravity="center"
+ android:orientation="horizontal" >
+
+ <ProgressBar
+ android:layout_width="20dp"
+ android:layout_height="20dp"
+ android:layout_marginEnd="12dp"
+ android:layout_weight="0" />
+
+ <TextView
+ android:id="@+id/message_view"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/updating_chrome"
+ android:textSize="20sp"
+ android:textColor="@color/default_text_color"
+ android:gravity="center"
+ android:fontFamily="sans-serif"
+ android:maxLines="1" />
+
+ </LinearLayout>
+
+</RelativeLayout>

Powered by Google App Engine
This is Rietveld 408576698