chrome/android/java/res/layout/new_tab_page.xml - Issue 1398423002: Add progressbar to animated doodle

Side by Side Diff: chrome/android/java/res/layout/new_tab_page.xml

Issue 1398423002: Add progressbar to animated doodle (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 2 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

« no previous file with comments | « chrome/android/java/res/layout/eb_main_content.xml ('k') | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkContentView.java » ('j') | chrome/android/java/src/org/chromium/chrome/browser/widget/LoadingView.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

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

4 found in the LICENSE file. -->	4 found in the LICENSE file. -->

5	5

6 <org.chromium.chrome.browser.ntp.NewTabPageView	6 <org.chromium.chrome.browser.ntp.NewTabPageView

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

8 xmlns:chrome="http://schemas.android.com/apk/res-auto"	8 xmlns:chrome="http://schemas.android.com/apk/res-auto"

9 android:layout_width="match_parent"	9 android:layout_width="match_parent"

10 android:layout_height="match_parent"	10 android:layout_height="match_parent"

(...skipping 25 matching lines...) Expand all Loading...
36 layout_weight="0". The NewTabPageLayout will redistribute the e xtra space between	36 layout_weight="0". The NewTabPageLayout will redistribute the e xtra space between

37 them. -->	37 them. -->

38 <View	38 <View

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

40 android:layout_width="0dp"	40 android:layout_width="0dp"

41 android:layout_height="0dp"	41 android:layout_height="0dp"

42 android:layout_weight="1"	42 android:layout_weight="1"

43 android:visibility="invisible" />	43 android:visibility="invisible" />

44	44

45 <!-- Search provider logo -->	45 <!-- Search provider logo -->

46 <org.chromium.chrome.browser.ntp.LogoView	46 <FrameLayout

47 android:id="@+id/search_provider_logo"

48 android:layout_width="wrap_content"	47 android:layout_width="wrap_content"

49 android:layout_height="@dimen/ntp_logo_height"	48 android:layout_height="wrap_content" >

50 android:layout_marginStart="16dp"	49

51 android:layout_marginEnd="16dp"	50 <org.chromium.chrome.browser.ntp.LogoView
	newt (away) 2015/10/13 05:24:59 You could just make the LogoView extend FrameLayou You could just make the LogoView extend FrameLayout, and avoid this extra nesting Ian Wen 2015/10/26 22:45:37 Done. Show quoted text On 2015/10/13 05:24:59, newt (OOO through 10-23) wrote: > You could just make the LogoView extend FrameLayout, and avoid this extra > nesting Done.
52 android:layout_marginTop="26dp"	51 android:id="@+id/search_provider_logo"

53 android:layout_marginBottom="30dp"	52 android:layout_width="wrap_content"

54 android:src="@drawable/google_logo" />	53 android:layout_height="@dimen/ntp_logo_height"

	54 android:layout_marginBottom="30dp"

	55 android:layout_marginEnd="16dp"

	56 android:layout_marginStart="16dp"

	57 android:layout_marginTop="26dp"

	58 android:src="@drawable/google_logo" />

	59

	60 <org.chromium.chrome.browser.widget.LoadingView
	newt (away) 2015/10/13 05:24:59 don't you need to add a ProgressBar inside the Loa don't you need to add a ProgressBar inside the LoadingView? Ian Wen 2015/10/26 22:45:37 Done. Show quoted text On 2015/10/13 05:24:59, newt (OOO through 10-23) wrote: > don't you need to add a ProgressBar inside the LoadingView? Done.
	61 android:id="@+id/loading_view"

	62 android:layout_width="wrap_content"

	63 android:layout_height="wrap_content"

	64 android:layout_gravity="center" />

	65

	66 </FrameLayout>

55	67

56 <!-- Search box -->	68 <!-- Search box -->

57 <LinearLayout	69 <LinearLayout

58 android:id="@+id/search_box"	70 android:id="@+id/search_box"

59 android:layout_width="match_parent"	71 android:layout_width="match_parent"

60 android:layout_height="48dp"	72 android:layout_height="48dp"

61 android:layout_marginStart="12dp"	73 android:layout_marginStart="12dp"

62 android:layout_marginEnd="12dp"	74 android:layout_marginEnd="12dp"

63 android:layout_marginBottom="8dp"	75 android:layout_marginBottom="8dp"

64 android:gravity="center_vertical"	76 android:gravity="center_vertical"

(...skipping 131 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
196 android:layout_height="match_parent"	208 android:layout_height="match_parent"

197 android:layout_gravity="center_horizontal"	209 android:layout_gravity="center_horizontal"

198 android:drawablePadding="8dp"	210 android:drawablePadding="8dp"

199 android:gravity="center_vertical"	211 android:gravity="center_vertical"

200 android:text="@string/recent_tabs"	212 android:text="@string/recent_tabs"

201 android:textSize="12sp"	213 android:textSize="12sp"

202 android:textColor="#5a5a5a" />	214 android:textColor="#5a5a5a" />

203 </FrameLayout>	215 </FrameLayout>

204 </org.chromium.chrome.browser.ntp.NewTabPageToolbar>	216 </org.chromium.chrome.browser.ntp.NewTabPageToolbar>

205 </org.chromium.chrome.browser.ntp.NewTabPageView>	217 </org.chromium.chrome.browser.ntp.NewTabPageView>

OLD	NEW