git.osdn.net Git - android-x86/packages-apps-Settings.git/commit

(root) / android-x86 / packages-apps-Settings.git / commit

author	Matthew Fritze <mfritze@google.com>
	Tue, 11 Apr 2017 23:35:48 +0000 (16:35 -0700)
committer	Matthew Fritze <mfritze@google.com>
	Thu, 18 May 2017 20:57:54 +0000 (13:57 -0700)
commit	742467ec9f384983f37d9a0e4e9775c27451816b
tree	610d96906a1f650c8b5d94996b6b1f4c7c22f242	tree \| snapshot
parent	803f0c96e8bcac86317f44e5d26444329d5b1466	commit \| diff

Remove Language and Input duplicates

Change the keys in the Language and Input screen for the
gesture and tts-output settings so they can be disabled
in search. Then change the preference controllers to take
a key as input to avoid crashes on the other screens with
these settings.

Merge for: ag/2098173/

Test: make RunSettingsRoboTests
Bug: 33701673
Change-Id: I8bc0776131fcac5a6edf7e8271bc53252c2fc719

32 files changed:

res/xml/configure_notification_settings.xml		diff \| blob \| history
res/xml/display_settings.xml		diff \| blob \| history
res/xml/language_and_input.xml		diff \| blob \| history
res/xml/manage_assist.xml		diff \| blob \| history
src/com/android/settings/DisplaySettings.java		diff \| blob \| history
src/com/android/settings/applications/assist/ManageAssist.java		diff \| blob \| history
src/com/android/settings/gestures/AssistGesturePreferenceController.java		diff \| blob \| history
src/com/android/settings/gestures/AssistGestureSettings.java		diff \| blob \| history
src/com/android/settings/gestures/DoubleTapPowerPreferenceController.java		diff \| blob \| history
src/com/android/settings/gestures/DoubleTapPowerSettings.java		diff \| blob \| history
src/com/android/settings/gestures/DoubleTapScreenPreferenceController.java		diff \| blob \| history
src/com/android/settings/gestures/DoubleTapScreenSettings.java		diff \| blob \| history
src/com/android/settings/gestures/DoubleTwistGestureSettings.java		diff \| blob \| history
src/com/android/settings/gestures/DoubleTwistPreferenceController.java		diff \| blob \| history
src/com/android/settings/gestures/PickupGesturePreferenceController.java		diff \| blob \| history
src/com/android/settings/gestures/PickupGestureSettings.java		diff \| blob \| history
src/com/android/settings/gestures/SwipeToNotificationPreferenceController.java		diff \| blob \| history
src/com/android/settings/gestures/SwipeToNotificationSettings.java		diff \| blob \| history
src/com/android/settings/language/LanguageAndInputSettings.java		diff \| blob \| history
src/com/android/settings/language/TtsPreferenceController.java		diff \| blob \| history
src/com/android/settings/notification/ConfigureNotificationSettings.java		diff \| blob \| history
tests/robotests/assets/whitelist_duplicate_index_key		diff \| blob \| history
tests/robotests/src/com/android/settings/DisplaySettingsTest.java	[new file with mode: 0644]	blob
tests/robotests/src/com/android/settings/gestures/AssistGesturePreferenceControllerTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/gestures/DoubleTapPowerPreferenceControllerTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/gestures/DoubleTapScreenPreferenceControllerTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/gestures/DoubleTwistPreferenceControllerTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/gestures/PIckupGesturePreferenceControllerTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/gestures/SwipeToNotificationPreferenceControllerTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/search/BaseSearchIndexProviderTest.java		diff \| blob \| history
tests/robotests/src/com/android/settings/testutils/shadow/ShadowPowerManagerWrapper.java	[new file with mode: 0644]	blob

packages/apps/Settings

RSS Atom

About OSDN

Find Software

Develop Software

Help