Merge "Update UI for gesture settings." into nyc-mr1-dev

This commit is contained in:
Doris Ling
2016-07-28 23:28:16 +00:00
committed by Android (Google) Code Review
4 changed files with 8 additions and 10 deletions

View File

@@ -97,8 +97,6 @@ public final class GesturePreference extends SwitchPreference implements
@Override
public void onBindViewHolder(PreferenceViewHolder holder) {
super.onBindViewHolder(holder);
holder.setDividerAllowedAbove(false);
holder.setDividerAllowedBelow(false);
final TextureView video = (TextureView) holder.findViewById(R.id.gesture_video);
final ImageView imageView = (ImageView) holder.findViewById(R.id.gesture_image);
final ImageView playButton = (ImageView) holder.findViewById(R.id.gesture_play_button);

View File

@@ -197,7 +197,7 @@ public class GestureSettings extends SettingsPreferenceFragment implements
}
private static boolean isSystemUINavigationEnabled(Context context) {
return Secure.getInt(context.getContentResolver(), Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 1)
return Secure.getInt(context.getContentResolver(), Secure.SYSTEM_NAVIGATION_KEYS_ENABLED, 0)
== 1;
}