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

Merge "Fix build" into nyc-dev am: d0f8d92

Browse Source 
am: abe553e

* commit 'abe553ed0d4bd4f268b70b4850525fb9895fb7f3':
  Fix build
This commit is contained in:
Yorke Lee
2016-03-23 18:55:10 +00:00
committed by android-build-merger
parent 62bffde1c6 abe553ed0d
commit fe803a7be4
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
AndroidManifest.xml
View File

@@ -641,7 +641,7 @@
</activity> </activity>
<activity android:name="Settings$PhysicalKeyboardActivity" <activity android:name="Settings$PhysicalKeyboardActivity"
android:label="@string/physical_keyboard_category" android:label="@string/physical_keyboard_title"
android:clearTaskOnLaunch="true"> android:clearTaskOnLaunch="true">
<intent-filter android:priority="1"> <intent-filter android:priority="1">
<action android:name="android.settings.HARD_KEYBOARD_SETTINGS" /> <action android:name="android.settings.HARD_KEYBOARD_SETTINGS" />

2
res/xml/language_settings.xml
View File

@@ -46,7 +46,7 @@
android:title="@string/virtual_keyboard_category" android:title="@string/virtual_keyboard_category"
android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" /> android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
<PreferenceScreen <PreferenceScreen
android:title="@string/physical_keyboard_category" android:title="@string/physical_keyboard_title"
android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" /> android:fragment="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
</PreferenceCategory> </PreferenceCategory>