PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '4b43e21c647864c8105394f353d4533777e7f9c7':
  Scroll if an accessibility setting description does not fit the screen.
This commit is contained in:
Svetoslav
2013-04-26 15:16:50 -07:00
committed by Android Git Automerger
parent 584a902632 4b43e21c64
commit 7c2a89c9f5
2 changed files with 11 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
res/layout/text_description_preference.xml
View File

@@ -14,18 +14,11 @@
limitations under the License. limitations under the License.
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <TextView
android:id="@+id/message_container" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:id="@+id/summary"
android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" > android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
<TextView android:padding="16dip" />
android:id="@+id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorSecondary"
android:padding="16dip" />
</LinearLayout>

10
src/com/android/settings/AccessibilitySettings.java
View File

@@ -32,6 +32,8 @@ import android.content.pm.ResolveInfo;
import android.content.pm.ServiceInfo; import android.content.pm.ServiceInfo;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.database.ContentObserver; import android.database.ContentObserver;
import android.graphics.Color;
import android.graphics.drawable.ColorDrawable;
import android.net.Uri; import android.net.Uri;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
@@ -427,11 +429,6 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
@Override @Override
protected void onBindView(View view) { protected void onBindView(View view) {
super.onBindView(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); TextView summaryView = (TextView) view.findViewById(R.id.summary);
String title = getString(R.string.accessibility_no_services_installed); String title = getString(R.string.accessibility_no_services_installed);
summaryView.setText(title); summaryView.setText(title);
@@ -1030,8 +1027,9 @@ public class AccessibilitySettings extends SettingsPreferenceFragment implements
super.onViewCreated(view, savedInstanceState); super.onViewCreated(view, savedInstanceState);
onInstallActionBarToggleSwitch(); onInstallActionBarToggleSwitch();
onProcessArguments(getArguments()); onProcessArguments(getArguments());
// Set a transparent drawable to prevent use of the default one.
getListView().setSelector(new ColorDrawable(Color.TRANSPARENT));
getListView().setDivider(null); getListView().setDivider(null);
getListView().setEnabled(false);
} }
@Override @Override