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

Commit 262b1e75 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Remove researcher logger"

parents 6dc21bd4 bbf556e8

java/res/layout/research_feedback_activity.xml

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

<!-- Copyright (C) 2012 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.

-->



<com.android.inputmethod.research.FeedbackLayout

     xmlns:android="http://schemas.android.com/apk/res/android"

     android:layout_width="match_parent"

     android:layout_height="wrap_content"

     android:orientation="vertical"

     android:id="@+id/research_feedback_layout"

>



    <fragment

          android:id="@+id/research_feedback_fragment"

          android:name="com.android.inputmethod.research.FeedbackFragment"

          android:layout_width="match_parent"

          android:layout_height="wrap_content"

    />

</com.android.inputmethod.research.FeedbackLayout>

java/res/layout/research_feedback_fragment_layout.xml

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

<!-- Copyright (C) 2012 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.

-->



<!-- Adapted from frameworks/base/core/res/res/layout/alert_dialog_holo.xml.  We

   want a dialog, but it must be its own activity so we can launch the soft

   keyboard on it.  A regular dialog will not work since it would be launched from

   the IME. -->

<ScrollView xmlns:android="http://schemas.android.com/apk/res/android">

    <LinearLayout

         android:layout_width="match_parent"

         android:layout_height="wrap_content"

         android:layout_marginStart="8dip"

         android:layout_marginEnd="8dip"

         android:orientation="vertical">

        <LinearLayout

             android:layout_width="match_parent"

             android:layout_height="wrap_content"

             android:orientation="vertical">

            <View android:layout_width="match_parent"

                android:layout_height="2dip"

                android:visibility="gone"

                android:background="@android:color/holo_blue_light" />

            <TextView

                style="?android:attr/windowTitleStyle"

                android:singleLine="true"

                android:ellipsize="end"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:minHeight="64dip"

                android:layout_marginLeft="16dip"

                android:layout_marginRight="16dip"

                android:gravity="center_vertical|left"

                android:text="@string/research_feedback_dialog_title" />

            <View

                android:layout_width="match_parent"

                android:layout_height="2dip"

                android:background="@android:color/holo_blue_light" />

        </LinearLayout>



        <EditText

            android:id="@+id/research_feedback_contents"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_gravity="fill_horizontal|center_vertical"

            android:layout_marginLeft="8dip"

            android:layout_marginRight="8dip"

            android:layout_marginBottom="8dip"

            android:layout_marginTop="8dip"

            android:minLines="2"

            android:scrollbars="vertical"

            android:hint="@string/research_feedback_hint"

            android:inputType="textMultiLine|textCapSentences">

            <requestFocus />

        </EditText>

        <CheckBox

            android:id="@+id/research_feedback_include_account_name"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_marginLeft="16dip"

            android:layout_marginRight="16dip"

            android:layout_marginBottom="8dip"

            android:checked="false"

            android:text="@string/research_feedback_include_account_name_label" />

        <CheckBox

            android:id="@+id/research_feedback_include_recording_checkbox"

            android:layout_height="wrap_content"

            android:layout_width="match_parent"

            android:layout_marginLeft="16dip"

            android:layout_marginRight="16dip"

            android:layout_marginBottom="8dip"

            android:checked="false"

            android:text="@string/research_feedback_include_recording_label" />

        <LinearLayout

            style="?android:attr/buttonBarStyle"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

            android:layoutDirection="locale"

            android:measureWithLargestChild="true">

            <Button

                android:id="@+id/research_feedback_cancel_button"

                android:layout_width="wrap_content"

                android:layout_gravity="left"

                android:layout_weight="1"

                android:maxLines="2"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:text="@string/research_feedback_cancel"

                android:layout_height="wrap_content" />

            <Button

                android:id="@+id/research_feedback_send_button"

                android:layout_width="wrap_content"

                android:layout_gravity="right"

                android:layout_weight="1"

                android:maxLines="2"

                style="?android:attr/buttonBarButtonStyle"

                android:textSize="14sp"

                android:text="@string/research_feedback_send"

                android:layout_height="wrap_content" />

        </LinearLayout>

    </LinearLayout>

</ScrollView>

java/res/layout/research_feedback_layout.xml

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

<!-- Copyright (C) 2012 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.

-->



<LinearLayout

     xmlns:android="http://schemas.android.com/apk/res/android"

     android:layout_width="fill_parent"

     android:layout_height="fill_parent"

     android:orientation="vertical"

>



    <EditText

        android:id="@+id/research_feedback_contents"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_gravity="fill_horizontal|center_vertical"

        android:layout_marginLeft="8dip"

        android:layout_marginRight="8dip"

        android:layout_marginBottom="8dip"

        android:layout_marginTop="8dip"

        android:lines="2"

        android:hint="@string/research_feedback_hint"

        android:inputType="textMultiLine"

        android:imeOptions="flagNoFullscreen"

        android:focusable="true"

    >

        <requestFocus />

    </EditText>



    <CheckBox

        android:id="@+id/research_feedback_include_history"

        android:layout_height="wrap_content"

        android:layout_width="match_parent"

        android:layout_marginBottom="8dip"

        android:checked="true"

        android:text="@string/research_feedback_include_history_label"

    />

</LinearLayout>

java/res/values-af/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="english_ime_input_options" msgid="3909945612939668554">"Invoeropsies"</string>

    <string name="english_ime_research_log" msgid="8492602295696577851">"Navorsing-loglêerbevele"</string>

    <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"Soek kontakname op"</string>

    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"Speltoetser gebruik inskrywings uit jou kontaklys"</string>

    <string name="vibrate_on_keypress" msgid="5258079494276955460">"Vibreer met sleuteldruk"</string>

java/res/values-am/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ 
<resources xmlns:android="http://schemas.android.com/apk/res/android"

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

    <string name="english_ime_input_options" msgid="3909945612939668554">"ግቤት አማራጮች"</string>

    <string name="english_ime_research_log" msgid="8492602295696577851">"የጥናት የምዝግብ ማስታወሻ ትዕዛዞች"</string>

    <string name="use_contacts_for_spellchecking_option_title" msgid="5374120998125353898">"የእውቅያ ስሞችን ተመልከት"</string>

    <string name="use_contacts_for_spellchecking_option_summary" msgid="8754413382543307713">"ፊደል አራሚ ከእውቅያ ዝርዝርህ የገቡትን ይጠቀማል"</string>

    <string name="vibrate_on_keypress" msgid="5258079494276955460">"በቁልፍመጫንጊዜ አንዝር"</string>