Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a2618062 authored by William Escande's avatar William Escande Committed by Gerrit Code Review
Browse files

Merge "Move test activity to the test only"

parents 4cd7a707 fc77d7e3

android/app/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,8 @@ 
     limitations under the License.

     limitations under the License.

-->

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="app_name">Bluetooth</string>



    <!--

    <!--

        This is the short description of a permission associated with the

        This is the short description of a permission associated with the

        Bluetooth Share Manager. It is displayed as part of the description of

        Bluetooth Share Manager. It is displayed as part of the description of

android/app/res/values/test_strings.xml→android/app/tests/unit/res/values/test_strings.xml

+0 −1
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

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

<resources>

<resources>

    <string name="app_name">Bluetooth</string>

    <string name="insert_record">Insert record</string>

    <string name="insert_record">Insert record</string>

    <string name="update_record">Confirm record</string>

    <string name="update_record">Confirm record</string>

    <string name="ack_record">Ack record</string>

    <string name="ack_record">Ack record</string>

android/app/tests/unit/src/com/android/bluetooth/opp/TestActivity.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -47,7 +47,7 @@ import android.view.View.OnClickListener; 
import android.widget.Button;

import android.widget.Button;

import android.widget.EditText;

import android.widget.EditText;





import com.android.bluetooth.R;

import com.android.bluetooth.tests.R;

import com.android.obex.Authenticator;

import com.android.obex.Authenticator;

import com.android.obex.HeaderSet;

import com.android.obex.HeaderSet;

import com.android.obex.ObexTransport;

import com.android.obex.ObexTransport;