Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "InputSettings: Physical keyboard settings activity." into nyc-dev

Browse Source 
am: 14df560

* commit '14df56074435ef5cab4010d5c782fdd682509244':
  InputSettings: Physical keyboard settings activity.
This commit is contained in:
Abodunrinwa Toki
2016-03-23 16:12:49 +00:00
committed by android-build-merger
parent 178b198f70 14df560744
commit 181b63ebe0
5 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
AndroidManifest.xml
View File

@@ -630,10 +630,21 @@
</activity>
<activity android:name="Settings$KeyboardLayoutPickerActivity"
android:label="@string/keyboard_layout_picker_title"
android:clearTaskOnLaunch="true">
android:label="@string/keyboard_layout_picker_title"
android:clearTaskOnLaunch="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.inputmethod.KeyboardLayoutPickerFragment2" />
</activity>
<activity android:name="Settings$PhysicalKeyboardActivity"
android:label="@string/physical_keyboard_category"
android:clearTaskOnLaunch="true">
<intent-filter android:priority="1">
<action android:name="android.settings.KEYBOARD_LAYOUT_SETTINGS" />
<action android:name="android.settings.HARD_KEYBOARD_SETTINGS" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<intent-filter>
@@ -641,7 +652,7 @@
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
android:value="com.android.settings.inputmethod.KeyboardLayoutPickerFragment2" />
android:value="com.android.settings.inputmethod.PhysicalKeyboardFragment" />
</activity>
<!-- Keep compatibility with old shortcuts. -->