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

Misc fixes for items under system setting

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files

8
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -136,7 +136,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
unregisterShowVirtualKeyboardSettingsObserver();
}
public void onLoadFinishedInternal(
private void onLoadFinishedInternal(
final int loaderId, @NonNull final List<Keyboards> keyboardsList) {
if (!mLoaderIDs.remove(loaderId)) {
// Already destroyed loader. Ignore.
@@ -198,8 +198,8 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
}
@NonNull
private static ArrayList<HardKeyboardDeviceInfo> getHardKeyboards() {
final ArrayList<HardKeyboardDeviceInfo> keyboards = new ArrayList<>();
public static List<HardKeyboardDeviceInfo> getHardKeyboards() {
final List<HardKeyboardDeviceInfo> keyboards = new ArrayList<>();
final int[] devicesIds = InputDevice.getDeviceIds();
for (int deviceId : devicesIds) {
final InputDevice device = InputDevice.getDevice(deviceId);
@@ -211,7 +211,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
}
private void updateHardKeyboards() {
final ArrayList<HardKeyboardDeviceInfo> newHardKeyboards = getHardKeyboards();
final List<HardKeyboardDeviceInfo> newHardKeyboards = getHardKeyboards();
if (!Objects.equals(newHardKeyboards, mLastHardKeyboards)) {
clearLoader();
mLastHardKeyboards.clear();

111
src/com/android/settings/inputmethod/PhysicalKeyboardPreferenceController.java Normal file
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);
}
}

89
src/com/android/settings/inputmethod/VirtualKeyboardPreferenceController.java Normal file
View File

@@ -0,0 +1,89 @@
/*
* 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.app.admin.DevicePolicyManager;
import android.content.Context;
import android.content.pm.PackageManager;
import android.support.v7.preference.Preference;
import android.view.inputmethod.InputMethodInfo;
import android.view.inputmethod.InputMethodManager;
import com.android.settings.R;
import com.android.settings.core.PreferenceController;
import java.util.ArrayList;
import java.util.List;
public class VirtualKeyboardPreferenceController extends PreferenceController {
private final InputMethodManager mImm;
private final DevicePolicyManager mDpm;
private final PackageManager mPm;
public VirtualKeyboardPreferenceController(Context context) {
super(context);
mPm = mContext.getPackageManager();
mDpm = (DevicePolicyManager) context.getSystemService(Context.DEVICE_POLICY_SERVICE);
mImm = (InputMethodManager) mContext.getSystemService(Context.INPUT_METHOD_SERVICE);
}
@Override
public boolean isAvailable() {
return true;
}
@Override
public String getPreferenceKey() {
return "virtual_keyboard_pref";
}
@Override
public void updateState(Preference preference) {
final List<InputMethodInfo> imis = mImm.getEnabledInputMethodList();
if (imis == null) {
preference.setSummary(R.string.summary_empty);
return;
}
final List<String> permittedList = mDpm.getPermittedInputMethodsForCurrentUser();
final List<String> labels = new ArrayList<>();
for (InputMethodInfo imi : imis) {
final boolean isAllowedByOrganization = permittedList == null
|| permittedList.contains(imi.getPackageName());
if (!isAllowedByOrganization) {
continue;
}
labels.add(imi.loadLabel(mPm).toString());
}
if (labels.isEmpty()) {
preference.setSummary(R.string.summary_empty);
return;
}
String summary = null;
for (String label : labels) {
if (summary == null) {
summary = label;
} else {
summary = mContext.getString(R.string.join_many_items_middle, summary, label);
}
}
preference.setSummary(summary);
}
}

6
src/com/android/settings/language/LanguageAndInputSettings.java
View File

@@ -43,7 +43,9 @@ import com.android.settings.gestures.DoubleTwistPreferenceController;
import com.android.settings.gestures.PickupGesturePreferenceController;
import com.android.settings.gestures.SwipeToNotificationPreferenceController;
import com.android.settings.inputmethod.GameControllerPreferenceController;
import com.android.settings.inputmethod.PhysicalKeyboardPreferenceController;
import com.android.settings.inputmethod.SpellCheckerPreferenceController;
import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import java.util.ArrayList;
@@ -87,9 +89,11 @@ public class LanguageAndInputSettings extends DashboardFragment {
controllers.add(new UserDictionaryPreferenceController(context));
controllers.add(new TtsPreferenceController(context, new TtsEngines(context)));
// Input
controllers.add(new VirtualKeyboardPreferenceController(context));
controllers.add(new PhysicalKeyboardPreferenceController(context, lifecycle));
final GameControllerPreferenceController gameControllerPreferenceController
= new GameControllerPreferenceController(context);
getLifecycle().addObserver(gameControllerPreferenceController);
lifecycle.addObserver(gameControllerPreferenceController);
if (mAmbientDisplayConfig == null) {
mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);