chrome/android/java/res/layout/upgrade_activity.xml - Issue 1817083003: Add pathway to auto-migrate users when Chrome launches

Side by Side 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 unified diff | Download patch

« chrome/android/java/AndroidManifest.xml ('K') | « chrome/android/java/AndroidManifest.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/ChromeSwitches.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/document/ChromeLauncherActivity.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	2 <!-- Copyright 2016 The Chromium Authors. All rights reserved.

	3 Use of this source code is governed by a BSD-style license that can be

	4 found in the LICENSE file. -->

	5

	6 <!-- Adapted from webapp_splash_screen_large.xml.

	7 Actual layout pending UX review. -->

	8 <RelativeLayout

	9 xmlns:android="http://schemas.android.com/apk/res/android"

	10 android:id="@+id/webapp_splash_screen_layout"
	Ted C 2016/03/25 17:38:05 something else? something else? gone 2016/03/25 22:05:41 Will be redoing this with the redlines that just c Show quoted text On 2016/03/25 17:38:05, Ted C wrote: > something else? Will be redoing this with the redlines that just came in. Alright for a follow up CL? Ted C 2016/03/25 22:15:31 That is fine. Show quoted text On 2016/03/25 22:05:41, dfalcantara wrote: > On 2016/03/25 17:38:05, Ted C wrote: > > something else? > > Will be redoing this with the redlines that just came in. Alright for a follow > up CL? That is fine.
	11 android:layout_width="match_parent"

	12 android:layout_height="match_parent"

	13 android:layout_marginBottom="@dimen/webapp_splash_offset" >

	14

	15 <ImageView

	16 android:id="@+id/logo_view"

	17 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 ? that is an odd thing to reference here... any reason we can't just use wrap_content? gone 2016/03/25 22:05:41 The image was a weird size, IIRC. Show quoted text On 2016/03/25 17:38:05, Ted C wrote: > ? that is an odd thing to reference here... any reason we can't just use > wrap_content? The image was a weird size, IIRC. Ted C 2016/03/25 22:15:31 We should probably give this a more generic name ( Show quoted text On 2016/03/25 22:05:41, dfalcantara wrote: > On 2016/03/25 17:38:05, Ted C wrote: > > ? that is an odd thing to reference here... any reason we can't just use > > wrap_content? > > The image was a weird size, IIRC. We should probably give this a more generic name (can be done in the followup)
	18 android:layout_height="wrap_content"

	19 android:layout_centerInParent="true"

	20 android:contentDescription="@null"

	21 android:src="@drawable/fre_product_logo" />

	22

	23 <LinearLayout

	24 android:layout_width="wrap_content"

	25 android:layout_height="wrap_content"

	26 android:layout_alignParentBottom="true"

	27 android:layout_centerHorizontal="true"

	28 android:layout_marginBottom="@dimen/webapp_splash_large_title_margin_bot tom"

	29 android:gravity="center"

	30 android:orientation="horizontal" >

	31

	32 <ProgressBar

	33 android:layout_width="20dp"

	34 android:layout_height="20dp"

	35 android:layout_marginEnd="12dp"

	36 android:layout_weight="0" />

	37

	38 <TextView

	39 android:id="@+id/message_view"

	40 android:layout_width="wrap_content"

	41 android:layout_height="wrap_content"

	42 android:layout_weight="0"

	43 android:text="@string/updating_chrome"

	44 android:textSize="20sp"

	45 android:textColor="@color/default_text_color"

	46 android:gravity="center"

	47 android:fontFamily="sans-serif"

	48 android:maxLines="1" />

	49

	50 </LinearLayout>

	51

	52 </RelativeLayout>

OLD	NEW