Misc fixes for items under system setting

- Show summary under virtual keyboard: list all avaiable keyboards
- Set about phone subtext to device model string.
- Update DND Suggestion text

Change-Id: I20acffcf691d1354c7636f5851b376099844700f
Fix: 35959817
Fix: 36395109
Test: robotests
This commit is contained in:
Fan Zhang
2017-03-23 16:42:13 -07:00
parent dedc8f18df
commit 2a9255b33c
10 changed files with 484 additions and 15 deletions

View File

@@ -0,0 +1,111 @@
/*
* Copyright (C) 2017 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package com.android.settings.inputmethod;
import android.content.Context;
import android.hardware.input.InputManager;
import android.support.v7.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.lifecycle.Lifecycle;
import com.android.settings.core.lifecycle.LifecycleObserver;
import com.android.settings.core.lifecycle.events.OnPause;
import com.android.settings.core.lifecycle.events.OnResume;
import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
import java.util.List;
public class PhysicalKeyboardPreferenceController extends PreferenceController implements
LifecycleObserver, OnResume, OnPause, InputManager.InputDeviceListener {
private final InputManager mIm;
private Preference mPreference;
public PhysicalKeyboardPreferenceController(Context context, Lifecycle lifecycle) {
super(context);
mIm = (InputManager) context.getSystemService(Context.INPUT_SERVICE);
if (lifecycle != null) {
lifecycle.addObserver(this);
}
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public void updateState(Preference preference) {
mPreference = preference;
updateSummary();
}
@Override
public String getPreferenceKey() {
return "physical_keyboard_pref";
}
@Override
public void onPause() {
mIm.registerInputDeviceListener(this, null);
}
@Override
public void onResume() {
mIm.unregisterInputDeviceListener(this);
}
@Override
public void onInputDeviceAdded(int deviceId) {
updateSummary();
}
@Override
public void onInputDeviceRemoved(int deviceId) {
updateSummary();
}
@Override
public void onInputDeviceChanged(int deviceId) {
updateSummary();
}
private void updateSummary() {
if (mPreference == null) {
return;
}
final List<HardKeyboardDeviceInfo> keyboards =
PhysicalKeyboardFragment.getHardKeyboards();
if (keyboards.isEmpty()) {
mPreference.setSummary(R.string.disconnected);
return;
}
String summary = null;
for (HardKeyboardDeviceInfo info : keyboards) {
if (summary == null) {
summary = info.mDeviceName;
} else {
summary = mContext.getString(R.string.join_many_items_middle, summary,
info.mDeviceName);
}
}
mPreference.setSummary(summary);
}
}