diff options
| author | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-20 15:55:08 +0000 |
|---|---|---|
| committer | lambroslambrou@chromium.org <lambroslambrou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-20 15:55:08 +0000 |
| commit | f45e51eef6b417adb7951acda133a5a5d4e92269 (patch) | |
| tree | dd6986ed160e3d086a3c031320dcb953a5052580 /remoting/resources | |
| parent | 300dff3f093c52b9db0411a7d5b61169e1638e2b (diff) | |
| download | chromium_src-f45e51eef6b417adb7951acda133a5a5d4e92269.zip chromium_src-f45e51eef6b417adb7951acda133a5a5d4e92269.tar.gz chromium_src-f45e51eef6b417adb7951acda133a5a5d4e92269.tar.bz2 | |
Move Android-specific xml files to remoting/resources/android/
Also added copyright notices to these files.
strings.xml has been moved to a values/ directory for consistency,
although we ultimately want to get rid of that file.
NOTRY=true
Review URL: https://codereview.chromium.org/171533011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252247 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/resources')
| -rw-r--r-- | remoting/resources/android/layout/desktop.xml (renamed from remoting/resources/layout/desktop.xml) | 0 | ||||
| -rw-r--r-- | remoting/resources/android/layout/host.xml (renamed from remoting/resources/layout/host.xml) | 6 | ||||
| -rw-r--r-- | remoting/resources/android/layout/main.xml (renamed from remoting/resources/layout/main.xml) | 6 | ||||
| -rw-r--r-- | remoting/resources/android/layout/pin_dialog.xml (renamed from remoting/resources/layout/pin_dialog.xml) | 6 | ||||
| -rw-r--r-- | remoting/resources/android/menu/chromoting_actionbar.xml (renamed from remoting/resources/menu/chromoting_actionbar.xml) | 6 | ||||
| -rw-r--r-- | remoting/resources/android/menu/desktop_actionbar.xml (renamed from remoting/resources/menu/desktop_actionbar.xml) | 6 | ||||
| -rw-r--r-- | remoting/resources/android/values/strings.xml (renamed from remoting/resources/strings.xml) | 6 |
7 files changed, 36 insertions, 0 deletions
diff --git a/remoting/resources/layout/desktop.xml b/remoting/resources/android/layout/desktop.xml index d4ac3e5..d4ac3e5 100644 --- a/remoting/resources/layout/desktop.xml +++ b/remoting/resources/android/layout/desktop.xml diff --git a/remoting/resources/layout/host.xml b/remoting/resources/android/layout/host.xml index c59a592..94b1313 100644 --- a/remoting/resources/layout/host.xml +++ b/remoting/resources/android/layout/host.xml @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- Copyright 2014 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. +--> + <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/host_label" android:layout_height="wrap_content" diff --git a/remoting/resources/layout/main.xml b/remoting/resources/android/layout/main.xml index 5f58217..acb8462 100644 --- a/remoting/resources/layout/main.xml +++ b/remoting/resources/android/layout/main.xml @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- Copyright 2014 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. +--> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_height="match_parent" diff --git a/remoting/resources/layout/pin_dialog.xml b/remoting/resources/android/layout/pin_dialog.xml index 3a49730..8590ce4 100644 --- a/remoting/resources/layout/pin_dialog.xml +++ b/remoting/resources/android/layout/pin_dialog.xml @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- Copyright 2014 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. +--> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_height="wrap_content" diff --git a/remoting/resources/menu/chromoting_actionbar.xml b/remoting/resources/android/menu/chromoting_actionbar.xml index e602a36..d22685b 100644 --- a/remoting/resources/menu/chromoting_actionbar.xml +++ b/remoting/resources/android/menu/chromoting_actionbar.xml @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- Copyright 2014 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. +--> + <!--Action bar buttons for the Android app's host listing--> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/actionbar_directoryrefresh" diff --git a/remoting/resources/menu/desktop_actionbar.xml b/remoting/resources/android/menu/desktop_actionbar.xml index 0efb3fb..05f97ef 100644 --- a/remoting/resources/menu/desktop_actionbar.xml +++ b/remoting/resources/android/menu/desktop_actionbar.xml @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- Copyright 2014 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. +--> + <!--Action bar buttons for the Android app's remote desktop viewer--> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item android:id="@+id/actionbar_keyboard" diff --git a/remoting/resources/strings.xml b/remoting/resources/android/values/strings.xml index 0ef75a9..c51e3cf 100644 --- a/remoting/resources/strings.xml +++ b/remoting/resources/android/values/strings.xml @@ -1,4 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> + +<!-- Copyright 2014 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. +--> + <!--User-facing strings for the Android app--> <!--TODO(solb) Merge in with localized strings--> <resources> |