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

Commit 4b43e21c authored by Svetoslav's avatar Svetoslav Committed by Android (Google) Code Review
Browse files

Merge "Scroll if an accessibility setting description does not fit the screen." into jb-mr2-dev

parents 837526fc 3b2d307b
Loading
Loading
Loading
Loading
+7 −14
Original line number Diff line number Diff line
@@ -14,18 +14,11 @@
     limitations under the License.
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/message_container"
    android:layout_width="match_parent"
    android:layout_height="wrap_content"
    android:orientation="vertical" >

<TextView
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/summary"
        android:layout_width="wrap_content"
    android:layout_width="fill_parent"
    android:layout_height="wrap_content"
    android:textAppearance="?android:attr/textAppearanceMedium"
    android:textColor="?android:attr/textColorSecondary"
    android:padding="16dip" />

</LinearLayout>
+4 −6
Original line number Diff line number Diff line
@@ -32,6 +32,8 @@ import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo;
import android.content.res.Configuration;
import android.database.ContentObserver;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.os.Handler;
@@ -427,11 +429,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
                    @Override
                    protected void onBindView(View view) {
                        super.onBindView(view);

                        LinearLayout containerView =
                                (LinearLayout) view.findViewById(R.id.message_container);
                        containerView.setGravity(Gravity.CENTER);

                        TextView summaryView = (TextView) view.findViewById(R.id.summary);
                        String title = getString(R.string.accessibility_no_services_installed);
                        summaryView.setText(title);
@@ -1030,8 +1027,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
            super.onViewCreated(view, savedInstanceState);
            onInstallActionBarToggleSwitch();
            onProcessArguments(getArguments());
            // Set a transparent drawable to prevent use of the default one.
            getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
            getListView().setDivider(null);
            getListView().setEnabled(false);
        }

        @Override