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

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

Issue 2720863004: 📰 Draw the tile highlight below the offline badge (Closed)
Patch Set: Created 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 <!-- A site suggestion tile. --> 6 <!-- A site suggestion tile. -->
7 <org.chromium.chrome.browser.suggestions.TileView 7 <org.chromium.chrome.browser.suggestions.TileView
8 xmlns:android="http://schemas.android.com/apk/res/android" 8 xmlns:android="http://schemas.android.com/apk/res/android"
9 xmlns:chrome="http://schemas.android.com/apk/res-auto" 9 xmlns:chrome="http://schemas.android.com/apk/res-auto"
10 android:layout_width="@dimen/tile_view_width" 10 android:layout_width="@dimen/tile_view_width"
11 android:layout_height="wrap_content" 11 android:layout_height="wrap_content"
12 android:paddingStart="4dp" 12 android:paddingStart="4dp"
13 android:paddingEnd="4dp" > 13 android:paddingEnd="4dp" >
14 14
15 <!-- The main icon. --> 15 <!-- The main icon. -->
16 <ImageView 16 <ImageView
17 android:id="@+id/tile_view_icon" 17 android:id="@+id/tile_view_icon"
18 android:layout_width="@dimen/tile_view_icon_size" 18 android:layout_width="@dimen/tile_view_icon_size"
19 android:layout_height="@dimen/tile_view_icon_size" 19 android:layout_height="@dimen/tile_view_icon_size"
20 android:layout_gravity="center_horizontal" 20 android:layout_gravity="center_horizontal"
21 android:layout_marginTop="@dimen/tile_view_icon_margin_top" 21 android:layout_marginTop="@dimen/tile_view_icon_margin_top"
22 android:contentDescription="@null" /> 22 android:contentDescription="@null" />
23 23
24 <!-- The touch highlight. -->
25 <View
26 android:id="@+id/tile_view_highlight"
27 android:layout_width="@dimen/tile_view_icon_size"
28 android:layout_height="@dimen/tile_view_icon_size"
29 android:layout_gravity="center_horizontal"
30 android:layout_marginTop="@dimen/tile_view_icon_margin_top"
31 android:background="@drawable/tile_view_highlight" />
32
24 <!-- The offline badge. --> 33 <!-- The offline badge. -->
25 <org.chromium.chrome.browser.widget.TintedImageView 34 <org.chromium.chrome.browser.widget.TintedImageView
26 android:id="@+id/offline_badge" 35 android:id="@+id/offline_badge"
27 android:layout_width="@dimen/tile_view_offline_badge_size" 36 android:layout_width="@dimen/tile_view_offline_badge_size"
28 android:layout_height="@dimen/tile_view_offline_badge_size" 37 android:layout_height="@dimen/tile_view_offline_badge_size"
29 android:layout_gravity="top|end" 38 android:layout_gravity="top|end"
30 android:visibility="gone" 39 android:visibility="gone"
31 android:background="@drawable/offline_badge_background" 40 android:background="@drawable/offline_badge_background"
32 android:contentDescription="@string/accessibility_ntp_offline_badge" 41 android:contentDescription="@string/accessibility_ntp_offline_badge"
33 chrome:tint="@color/tile_view_offline_badge_tint" 42 chrome:tint="@color/tile_view_offline_badge_tint"
34 android:src="@drawable/offline_pin_round" /> 43 android:src="@drawable/offline_pin_round" />
35 44
36 <!-- The touch highlight. -->
37 <View
38 android:id="@+id/tile_view_highlight"
39 android:layout_width="@dimen/tile_view_icon_size"
40 android:layout_height="@dimen/tile_view_icon_size"
41 android:layout_gravity="center_horizontal"
42 android:layout_marginTop="@dimen/tile_view_icon_margin_top"
43 android:background="@drawable/tile_view_highlight" />
44
45 <!-- The title. --> 45 <!-- The title. -->
46 <TextView 46 <TextView
47 android:id="@+id/tile_view_title" 47 android:id="@+id/tile_view_title"
48 android:layout_width="match_parent" 48 android:layout_width="match_parent"
49 android:layout_height="wrap_content" 49 android:layout_height="wrap_content"
50 android:layout_marginTop="@dimen/tile_view_title_margin_top" 50 android:layout_marginTop="@dimen/tile_view_title_margin_top"
51 android:ellipsize="end" 51 android:ellipsize="end"
52 android:gravity="center_horizontal" 52 android:gravity="center_horizontal"
53 android:lines="2" 53 android:lines="2"
54 android:lineSpacingMultiplier="1.17" 54 android:lineSpacingMultiplier="1.17"
55 android:textColor="@color/tile_view_text" 55 android:textColor="@color/tile_view_text"
56 android:textSize="12sp" /> 56 android:textSize="12sp" />
57 57
58 </org.chromium.chrome.browser.suggestions.TileView> 58 </org.chromium.chrome.browser.suggestions.TileView>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698