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

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

Issue 1178323005: Move remaining resources from java_staging/res to java/res. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@res_default
Patch Set: renamed conflicting resource in chrome shell Created 5 years, 6 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
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 <LinearLayout 6 <LinearLayout
7 xmlns:android="http://schemas.android.com/apk/res/android" 7 xmlns:android="http://schemas.android.com/apk/res/android"
8 android:id="@+id/opt_out_promo" 8 android:id="@+id/opt_out_promo"
9 android:layout_width="match_parent" 9 android:layout_width="match_parent"
10 android:layout_height="wrap_content" 10 android:layout_height="wrap_content"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 android:id="@+id/got_it_button" 46 android:id="@+id/got_it_button"
47 android:layout_width="wrap_content" 47 android:layout_width="wrap_content"
48 android:layout_height="wrap_content" 48 android:layout_height="wrap_content"
49 android:layout_gravity="end" 49 android:layout_gravity="end"
50 android:layout_marginTop="24dp" 50 android:layout_marginTop="24dp"
51 android:layout_marginBottom="16dp" 51 android:layout_marginBottom="16dp"
52 android:layout_marginEnd="32dp" 52 android:layout_marginEnd="32dp"
53 android:text="@string/tabs_and_apps_got_it_button" 53 android:text="@string/tabs_and_apps_got_it_button"
54 android:textColor="@color/light_active_color" /> 54 android:textColor="@color/light_active_color" />
55 </LinearLayout> 55 </LinearLayout>
OLDNEW
« no previous file with comments | « chrome/android/java/res/layout/omnibox_results_container.xml ('k') | chrome/android/java/res/layout/prerender_test_main.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698