am 56ad6f35: Merge "Add label and icon to the test app"

* commit '56ad6f35b3f24dcad270cb9e70980c483e0d1c22':
  Add label and icon to the test app
main
Sandeep Siddhartha 2014-10-15 00:40:26 +00:00 committed by Android Git Automerger
commit 0ad7b36b16
3 changed files with 24 additions and 1 deletions

View File

@ -21,7 +21,8 @@
<uses-permission android:name="android.permission.READ_CONTACTS" />
<application>
<application android:label="@string/app_name"
android:icon="@drawable/ic_app">
<uses-library android:name="android.test.runner" />
<!-- meta-data android:name="com.android.contacts.iconset" android:resource="@xml/iconset" /-->
</application>

Binary file not shown.

After

Width:  |  Height:  |  Size: 635 B

View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
/*
**
** Copyright 2014, The Android Open Source Project
**
** Licensed under the Apache License, Version 2.0 (the "License");
** you may not use this file except in compliance with the License.
** You may obtain a copy of the License at
**
** http://www.apache.org/licenses/LICENSE-2.0
**
** Unless required by applicable law or agreed to in writing, software
** distributed under the License is distributed on an "AS IS" BASIS,
** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
** See the License for the specific language governing permissions and
** limitations under the License.
*/
-->
<resources>
<string name="app_name" translatable="false">LatinIMETests</string>
</resources>