diff options
Diffstat (limited to 'core/java/com/android/internal')
6 files changed, 91 insertions, 521 deletions
diff --git a/core/java/com/android/internal/net/VpnConfig.java b/core/java/com/android/internal/net/VpnConfig.java index 18d9ec4..773be5b 100644 --- a/core/java/com/android/internal/net/VpnConfig.java +++ b/core/java/com/android/internal/net/VpnConfig.java @@ -16,8 +16,12 @@ package com.android.internal.net; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; import android.os.Parcel; import android.os.Parcelable; +import android.os.SystemClock; /** * A simple container used to carry information in VpnBuilder, VpnDialogs, @@ -27,6 +31,30 @@ import android.os.Parcelable; */ public class VpnConfig implements Parcelable { + public static final String ACTION_VPN_REVOKED = "android.net.vpn.action.REVOKED"; + + public static void enforceCallingPackage(String packageName) { + if (!"com.android.vpndialogs".equals(packageName)) { + throw new SecurityException("Unauthorized Caller"); + } + } + + public static Intent getIntentForConfirmation() { + Intent intent = new Intent(); + intent.setClassName("com.android.vpndialogs", "com.android.vpndialogs.ConfirmDialog"); + return intent; + } + + public static PendingIntent getIntentForNotification(Context context, VpnConfig config) { + config.startTime = SystemClock.elapsedRealtime(); + Intent intent = new Intent(); + intent.setClassName("com.android.vpndialogs", "com.android.vpndialogs.ManageDialog"); + intent.putExtra("config", config); + intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_NO_HISTORY | + Intent.FLAG_ACTIVITY_EXCLUDE_FROM_RECENTS); + return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); + } + public String packageName; public String sessionName; public String interfaceName; diff --git a/core/java/com/android/internal/util/HanziToPinyin.java b/core/java/com/android/internal/util/HanziToPinyin.java deleted file mode 100644 index 6a4adaa..0000000 --- a/core/java/com/android/internal/util/HanziToPinyin.java +++ /dev/null @@ -1,495 +0,0 @@ -/* - * Copyright (C) 2009 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.internal.util; - -import android.text.TextUtils; -import android.util.Log; - -import java.text.Collator; -import java.util.ArrayList; -import java.util.Locale; - -/** - * An object to convert Chinese character to its corresponding pinyin string. - * For characters with multiple possible pinyin string, only one is selected - * according to collator. Polyphone is not supported in this implementation. - * This class is implemented to achieve the best runtime performance and minimum - * runtime resources with tolerable sacrifice of accuracy. This implementation - * highly depends on zh_CN ICU collation data and must be always synchronized with - * ICU. - */ -public class HanziToPinyin { - private static final String TAG = "HanziToPinyin"; - - private static final char[] UNIHANS = { - '\u5416', '\u54ce', '\u5b89', '\u80ae', '\u51f9', '\u516b', '\u63b0', '\u6273', - '\u90a6', '\u52f9', '\u9642', '\u5954', '\u4f3b', '\u7680', '\u782d', '\u706c', - '\u618b', '\u6c43', '\u51ab', '\u7676', '\u5cec', '\u5693', '\u5072', '\u53c2', - '\u4ed3', '\u64a1', '\u518a', '\u5d7e', '\u564c', '\u6260', '\u62c6', '\u8fbf', - '\u4f25', '\u6284', '\u8f66', '\u62bb', '\u9637', '\u5403', '\u5145', '\u62bd', - '\u51fa', '\u640b', '\u5ddb', '\u5205', '\u5439', '\u65fe', '\u8e14', '\u5472', - '\u4ece', '\u51d1', '\u7c97', '\u6c46', '\u5d14', '\u90a8', '\u6413', '\u5491', - '\u5446', '\u4e39', '\u5f53', '\u5200', '\u6074', '\u6265', '\u706f', '\u4efe', - '\u55f2', '\u6541', '\u5201', '\u7239', '\u4e01', '\u4e1f', '\u4e1c', '\u543a', - '\u5262', '\u8011', '\u5796', '\u5428', '\u591a', '\u59b8', '\u5940', '\u97a5', - '\u800c', '\u53d1', '\u5e06', '\u531a', '\u98de', '\u5206', '\u4e30', '\u8985', - '\u4ecf', '\u57ba', '\u7d11', '\u592b', '\u7324', '\u65ee', '\u4f85', '\u5e72', - '\u5188', '\u768b', '\u6208', '\u7ed9', '\u6839', '\u63ef', '\u55bc', '\u55f0', - '\u5de5', '\u52fe', '\u4f30', '\u9e39', '\u4e56', '\u5173', '\u5149', '\u5f52', - '\u4e28', '\u8b34', '\u5459', '\u598e', '\u548d', '\u4f44', '\u592f', '\u8320', - '\u8bc3', '\u9ed2', '\u62eb', '\u4ea8', '\u53ff', '\u9f41', '\u4e4e', '\u82b1', - '\u6000', '\u6b22', '\u5ddf', '\u7070', '\u660f', '\u5419', '\u4e0c', '\u52a0', - '\u620b', '\u6c5f', '\u827d', '\u9636', '\u5dfe', '\u5755', '\u5182', '\u4e29', - '\u51e5', '\u59e2', '\u5658', '\u519b', '\u5494', '\u5f00', '\u938e', '\u5ffc', - '\u5c3b', '\u533c', '\u808e', '\u52a5', '\u7a7a', '\u62a0', '\u625d', '\u5938', - '\u84af', '\u5bbd', '\u5321', '\u4e8f', '\u5764', '\u6269', '\u62c9', '\u4f86', - '\u5170', '\u5577', '\u635e', '\u4ec2', '\u96f7', '\u8137', '\u68f1', '\u695e', - '\u550e', '\u4fe9', '\u5afe', '\u826f', '\u8e7d', '\u57d3', '\u53b8', '\u62ce', - '\u6e9c', '\u9f99', '\u5a04', '\u565c', '\u5b6a', '\u62a1', '\u9831', '\u5988', - '\u57cb', '\u989f', '\u7264', '\u732b', '\u5445', '\u95e8', '\u6c13', '\u54aa', - '\u5b80', '\u55b5', '\u4e5c', '\u6c11', '\u540d', '\u8c2c', '\u6478', '\u725f', - '\u6bcd', '\u62cf', '\u8149', '\u56e1', '\u56d4', '\u5b6c', '\u8bb7', '\u5a1e', - '\u5ae9', '\u80fd', '\u92b0', '\u62c8', '\u5a18', '\u9e1f', '\u634f', '\u56dc', - '\u5b81', '\u599e', '\u519c', '\u7fba', '\u5974', '\u597b', '\u9ec1', '\u90cd', - '\u5662', '\u8bb4', '\u5991', '\u62cd', '\u7705', '\u6c78', '\u629b', '\u5478', - '\u55b7', '\u5309', '\u4e76', '\u7247', '\u527d', '\u6c15', '\u59d8', '\u4e52', - '\u948b', '\u5256', '\u4ec6', '\u4e03', '\u6390', '\u5343', '\u545b', '\u6084', - '\u5207', '\u4eb2', '\u9751', '\u5b86', '\u74d7', '\u533a', '\u5cd1', '\u7094', - '\u590b', '\u5465', '\u7a63', '\u835b', '\u60f9', '\u4eba', '\u6254', '\u65e5', - '\u620e', '\u53b9', '\u909a', '\u5827', '\u6875', '\u95f0', '\u633c', '\u4ee8', - '\u6be2', '\u4e09', '\u6852', '\u63bb', '\u8272', '\u68ee', '\u50e7', '\u6740', - '\u7b5b', '\u5c71', '\u4f24', '\u5f30', '\u5962', '\u7533', '\u5347', '\u5c38', - '\u53ce', '\u4e66', '\u5237', '\u8870', '\u95e9', '\u53cc', '\u8c01', '\u542e', - '\u8bf4', '\u53b6', '\u5fea', '\u51c1', '\u82cf', '\u72fb', '\u590a', '\u5b59', - '\u5506', '\u4ed6', '\u5b61', '\u574d', '\u6c64', '\u5932', '\u5fd1', '\u81af', - '\u5254', '\u5929', '\u65eb', '\u6017', '\u5385', '\u70b5', '\u5077', '\u51f8', - '\u6e4d', '\u63a8', '\u541e', '\u8bac', '\u52b8', '\u6b6a', '\u5f2f', '\u5c23', - '\u5371', '\u6637', '\u7fc1', '\u631d', '\u4e4c', '\u5915', '\u5477', '\u4ed9', - '\u4e61', '\u7071', '\u4e9b', '\u5fc3', '\u5174', '\u51f6', '\u4f11', '\u620c', - '\u5405', '\u75b6', '\u7025', '\u4e2b', '\u54bd', '\u592e', '\u5e7a', '\u503b', - '\u4e00', '\u4e5a', '\u5e94', '\u5537', '\u4f63', '\u4f18', '\u7ea1', '\u56e6', - '\u66f0', '\u8480', '\u5e00', '\u707d', '\u5142', '\u7242', '\u50ae', '\u556b', - '\u9c61', '\u600e', '\u66fd', '\u5412', '\u635a', '\u6cbe', '\u5f20', '\u4f4b', - '\u8707', '\u8d1e', '\u9eee', '\u4e4b', '\u4e2d', '\u5dde', '\u6731', '\u6293', - '\u62fd', '\u4e13', '\u5986', '\u96b9', '\u5b92', '\u5353', '\u4ed4', '\u5b97', - '\u90b9', '\u79df', '\u5297', '\u55fa', '\u5c0a', '\u6628', - }; - private final static byte[][] PINYINS = { - {65, 00, 00, 00, 00, 00, }, {65, 73, 00, 00, 00, 00, }, - {65, 78, 00, 00, 00, 00, }, {65, 78, 71, 00, 00, 00, }, - {65, 79, 00, 00, 00, 00, }, {66, 65, 00, 00, 00, 00, }, - {66, 65, 73, 00, 00, 00, }, {66, 65, 78, 00, 00, 00, }, - {66, 65, 78, 71, 00, 00, }, {66, 65, 79, 00, 00, 00, }, - {66, 69, 73, 00, 00, 00, }, {66, 69, 78, 00, 00, 00, }, - {66, 69, 78, 71, 00, 00, }, {66, 73, 00, 00, 00, 00, }, - {66, 73, 65, 78, 00, 00, }, {66, 73, 65, 79, 00, 00, }, - {66, 73, 69, 00, 00, 00, }, {66, 73, 78, 00, 00, 00, }, - {66, 73, 78, 71, 00, 00, }, {66, 79, 00, 00, 00, 00, }, - {66, 85, 00, 00, 00, 00, }, {67, 65, 00, 00, 00, 00, }, - {67, 65, 73, 00, 00, 00, }, {67, 65, 78, 00, 00, 00, }, - {67, 65, 78, 71, 00, 00, }, {67, 65, 79, 00, 00, 00, }, - {67, 69, 00, 00, 00, 00, }, {67, 69, 78, 00, 00, 00, }, - {67, 69, 78, 71, 00, 00, }, {67, 72, 65, 00, 00, 00, }, - {67, 72, 65, 73, 00, 00, }, {67, 72, 65, 78, 00, 00, }, - {67, 72, 65, 78, 71, 00, }, {67, 72, 65, 79, 00, 00, }, - {67, 72, 69, 00, 00, 00, }, {67, 72, 69, 78, 00, 00, }, - {67, 72, 69, 78, 71, 00, }, {67, 72, 73, 00, 00, 00, }, - {67, 72, 79, 78, 71, 00, }, {67, 72, 79, 85, 00, 00, }, - {67, 72, 85, 00, 00, 00, }, {67, 72, 85, 65, 73, 00, }, - {67, 72, 85, 65, 78, 00, }, {67, 72, 85, 65, 78, 71, }, - {67, 72, 85, 73, 00, 00, }, {67, 72, 85, 78, 00, 00, }, - {67, 72, 85, 79, 00, 00, }, {67, 73, 00, 00, 00, 00, }, - {67, 79, 78, 71, 00, 00, }, {67, 79, 85, 00, 00, 00, }, - {67, 85, 00, 00, 00, 00, }, {67, 85, 65, 78, 00, 00, }, - {67, 85, 73, 00, 00, 00, }, {67, 85, 78, 00, 00, 00, }, - {67, 85, 79, 00, 00, 00, }, {68, 65, 00, 00, 00, 00, }, - {68, 65, 73, 00, 00, 00, }, {68, 65, 78, 00, 00, 00, }, - {68, 65, 78, 71, 00, 00, }, {68, 65, 79, 00, 00, 00, }, - {68, 69, 00, 00, 00, 00, }, {68, 69, 78, 00, 00, 00, }, - {68, 69, 78, 71, 00, 00, }, {68, 73, 00, 00, 00, 00, }, - {68, 73, 65, 00, 00, 00, }, {68, 73, 65, 78, 00, 00, }, - {68, 73, 65, 79, 00, 00, }, {68, 73, 69, 00, 00, 00, }, - {68, 73, 78, 71, 00, 00, }, {68, 73, 85, 00, 00, 00, }, - {68, 79, 78, 71, 00, 00, }, {68, 79, 85, 00, 00, 00, }, - {68, 85, 00, 00, 00, 00, }, {68, 85, 65, 78, 00, 00, }, - {68, 85, 73, 00, 00, 00, }, {68, 85, 78, 00, 00, 00, }, - {68, 85, 79, 00, 00, 00, }, {69, 00, 00, 00, 00, 00, }, - {69, 78, 00, 00, 00, 00, }, {69, 78, 71, 00, 00, 00, }, - {69, 82, 00, 00, 00, 00, }, {70, 65, 00, 00, 00, 00, }, - {70, 65, 78, 00, 00, 00, }, {70, 65, 78, 71, 00, 00, }, - {70, 69, 73, 00, 00, 00, }, {70, 69, 78, 00, 00, 00, }, - {70, 69, 78, 71, 00, 00, }, {70, 73, 65, 79, 00, 00, }, - {70, 79, 00, 00, 00, 00, }, {70, 85, 00, 00, 00, 00, }, - {70, 79, 85, 00, 00, 00, }, {70, 85, 00, 00, 00, 00, }, - {71, 85, 73, 00, 00, 00, }, {71, 65, 00, 00, 00, 00, }, - {71, 65, 73, 00, 00, 00, }, {71, 65, 78, 00, 00, 00, }, - {71, 65, 78, 71, 00, 00, }, {71, 65, 79, 00, 00, 00, }, - {71, 69, 00, 00, 00, 00, }, {71, 69, 73, 00, 00, 00, }, - {71, 69, 78, 00, 00, 00, }, {71, 69, 78, 71, 00, 00, }, - {74, 73, 69, 00, 00, 00, }, {71, 69, 00, 00, 00, 00, }, - {71, 79, 78, 71, 00, 00, }, {71, 79, 85, 00, 00, 00, }, - {71, 85, 00, 00, 00, 00, }, {71, 85, 65, 00, 00, 00, }, - {71, 85, 65, 73, 00, 00, }, {71, 85, 65, 78, 00, 00, }, - {71, 85, 65, 78, 71, 00, }, {71, 85, 73, 00, 00, 00, }, - {71, 85, 78, 00, 00, 00, }, {71, 85, 65, 78, 00, 00, }, - {71, 85, 79, 00, 00, 00, }, {72, 65, 00, 00, 00, 00, }, - {72, 65, 73, 00, 00, 00, }, {72, 65, 78, 00, 00, 00, }, - {72, 65, 78, 71, 00, 00, }, {72, 65, 79, 00, 00, 00, }, - {72, 69, 00, 00, 00, 00, }, {72, 69, 73, 00, 00, 00, }, - {72, 69, 78, 00, 00, 00, }, {72, 69, 78, 71, 00, 00, }, - {72, 79, 78, 71, 00, 00, }, {72, 79, 85, 00, 00, 00, }, - {72, 85, 00, 00, 00, 00, }, {72, 85, 65, 00, 00, 00, }, - {72, 85, 65, 73, 00, 00, }, {72, 85, 65, 78, 00, 00, }, - {72, 85, 65, 78, 71, 00, }, {72, 85, 73, 00, 00, 00, }, - {72, 85, 78, 00, 00, 00, }, {72, 85, 79, 00, 00, 00, }, - {74, 73, 00, 00, 00, 00, }, {74, 73, 65, 00, 00, 00, }, - {74, 73, 65, 78, 00, 00, }, {74, 73, 65, 78, 71, 00, }, - {74, 73, 65, 79, 00, 00, }, {74, 73, 69, 00, 00, 00, }, - {74, 73, 78, 00, 00, 00, }, {74, 73, 78, 71, 00, 00, }, - {74, 73, 79, 78, 71, 00, }, {74, 73, 85, 00, 00, 00, }, - {74, 85, 00, 00, 00, 00, }, {74, 85, 65, 78, 00, 00, }, - {74, 85, 69, 00, 00, 00, }, {74, 85, 78, 00, 00, 00, }, - {75, 65, 00, 00, 00, 00, }, {75, 65, 73, 00, 00, 00, }, - {75, 65, 78, 00, 00, 00, }, {75, 65, 78, 71, 00, 00, }, - {75, 65, 79, 00, 00, 00, }, {75, 69, 00, 00, 00, 00, }, - {75, 69, 78, 00, 00, 00, }, {75, 69, 78, 71, 00, 00, }, - {75, 79, 78, 71, 00, 00, }, {75, 79, 85, 00, 00, 00, }, - {75, 85, 00, 00, 00, 00, }, {75, 85, 65, 00, 00, 00, }, - {75, 85, 65, 73, 00, 00, }, {75, 85, 65, 78, 00, 00, }, - {75, 85, 65, 78, 71, 00, }, {75, 85, 73, 00, 00, 00, }, - {75, 85, 78, 00, 00, 00, }, {75, 85, 79, 00, 00, 00, }, - {76, 65, 00, 00, 00, 00, }, {76, 65, 73, 00, 00, 00, }, - {76, 65, 78, 00, 00, 00, }, {76, 65, 78, 71, 00, 00, }, - {76, 65, 79, 00, 00, 00, }, {76, 69, 00, 00, 00, 00, }, - {76, 69, 73, 00, 00, 00, }, {76, 73, 00, 00, 00, 00, }, - {76, 73, 78, 71, 00, 00, }, {76, 69, 78, 71, 00, 00, }, - {76, 73, 00, 00, 00, 00, }, {76, 73, 65, 00, 00, 00, }, - {76, 73, 65, 78, 00, 00, }, {76, 73, 65, 78, 71, 00, }, - {76, 73, 65, 79, 00, 00, }, {76, 73, 69, 00, 00, 00, }, - {76, 73, 78, 00, 00, 00, }, {76, 73, 78, 71, 00, 00, }, - {76, 73, 85, 00, 00, 00, }, {76, 79, 78, 71, 00, 00, }, - {76, 79, 85, 00, 00, 00, }, {76, 85, 00, 00, 00, 00, }, - {76, 85, 65, 78, 00, 00, }, {76, 85, 78, 00, 00, 00, }, - {76, 85, 79, 00, 00, 00, }, {77, 65, 00, 00, 00, 00, }, - {77, 65, 73, 00, 00, 00, }, {77, 65, 78, 00, 00, 00, }, - {77, 65, 78, 71, 00, 00, }, {77, 65, 79, 00, 00, 00, }, - {77, 69, 73, 00, 00, 00, }, {77, 69, 78, 00, 00, 00, }, - {77, 69, 78, 71, 00, 00, }, {77, 73, 00, 00, 00, 00, }, - {77, 73, 65, 78, 00, 00, }, {77, 73, 65, 79, 00, 00, }, - {77, 73, 69, 00, 00, 00, }, {77, 73, 78, 00, 00, 00, }, - {77, 73, 78, 71, 00, 00, }, {77, 73, 85, 00, 00, 00, }, - {77, 79, 00, 00, 00, 00, }, {77, 79, 85, 00, 00, 00, }, - {77, 85, 00, 00, 00, 00, }, {78, 65, 00, 00, 00, 00, }, - {78, 65, 73, 00, 00, 00, }, {78, 65, 78, 00, 00, 00, }, - {78, 65, 78, 71, 00, 00, }, {78, 65, 79, 00, 00, 00, }, - {78, 69, 00, 00, 00, 00, }, {78, 69, 73, 00, 00, 00, }, - {78, 69, 78, 00, 00, 00, }, {78, 69, 78, 71, 00, 00, }, - {78, 73, 00, 00, 00, 00, }, {78, 73, 65, 78, 00, 00, }, - {78, 73, 65, 78, 71, 00, }, {78, 73, 65, 79, 00, 00, }, - {78, 73, 69, 00, 00, 00, }, {78, 73, 78, 00, 00, 00, }, - {78, 73, 78, 71, 00, 00, }, {78, 73, 85, 00, 00, 00, }, - {78, 79, 78, 71, 00, 00, }, {78, 79, 85, 00, 00, 00, }, - {78, 85, 00, 00, 00, 00, }, {78, 85, 65, 78, 00, 00, }, - {78, 85, 78, 00, 00, 00, }, {78, 85, 79, 00, 00, 00, }, - {79, 00, 00, 00, 00, 00, }, {79, 85, 00, 00, 00, 00, }, - {80, 65, 00, 00, 00, 00, }, {80, 65, 73, 00, 00, 00, }, - {80, 65, 78, 00, 00, 00, }, {80, 65, 78, 71, 00, 00, }, - {80, 65, 79, 00, 00, 00, }, {80, 69, 73, 00, 00, 00, }, - {80, 69, 78, 00, 00, 00, }, {80, 69, 78, 71, 00, 00, }, - {80, 73, 00, 00, 00, 00, }, {80, 73, 65, 78, 00, 00, }, - {80, 73, 65, 79, 00, 00, }, {80, 73, 69, 00, 00, 00, }, - {80, 73, 78, 00, 00, 00, }, {80, 73, 78, 71, 00, 00, }, - {80, 79, 00, 00, 00, 00, }, {80, 79, 85, 00, 00, 00, }, - {80, 85, 00, 00, 00, 00, }, {81, 73, 00, 00, 00, 00, }, - {81, 73, 65, 00, 00, 00, }, {81, 73, 65, 78, 00, 00, }, - {81, 73, 65, 78, 71, 00, }, {81, 73, 65, 79, 00, 00, }, - {81, 73, 69, 00, 00, 00, }, {81, 73, 78, 00, 00, 00, }, - {81, 73, 78, 71, 00, 00, }, {81, 73, 79, 78, 71, 00, }, - {81, 73, 85, 00, 00, 00, }, {81, 85, 00, 00, 00, 00, }, - {81, 85, 65, 78, 00, 00, }, {81, 85, 69, 00, 00, 00, }, - {81, 85, 78, 00, 00, 00, }, {82, 65, 78, 00, 00, 00, }, - {82, 65, 78, 71, 00, 00, }, {82, 65, 79, 00, 00, 00, }, - {82, 69, 00, 00, 00, 00, }, {82, 69, 78, 00, 00, 00, }, - {82, 69, 78, 71, 00, 00, }, {82, 73, 00, 00, 00, 00, }, - {82, 79, 78, 71, 00, 00, }, {82, 79, 85, 00, 00, 00, }, - {82, 85, 00, 00, 00, 00, }, {82, 85, 65, 78, 00, 00, }, - {82, 85, 73, 00, 00, 00, }, {82, 85, 78, 00, 00, 00, }, - {82, 85, 79, 00, 00, 00, }, {83, 65, 00, 00, 00, 00, }, - {83, 65, 73, 00, 00, 00, }, {83, 65, 78, 00, 00, 00, }, - {83, 65, 78, 71, 00, 00, }, {83, 65, 79, 00, 00, 00, }, - {83, 69, 00, 00, 00, 00, }, {83, 69, 78, 00, 00, 00, }, - {83, 69, 78, 71, 00, 00, }, {83, 72, 65, 00, 00, 00, }, - {83, 72, 65, 73, 00, 00, }, {83, 72, 65, 78, 00, 00, }, - {83, 72, 65, 78, 71, 00, }, {83, 72, 65, 79, 00, 00, }, - {83, 72, 69, 00, 00, 00, }, {83, 72, 69, 78, 00, 00, }, - {83, 72, 69, 78, 71, 00, }, {83, 72, 73, 00, 00, 00, }, - {83, 72, 79, 85, 00, 00, }, {83, 72, 85, 00, 00, 00, }, - {83, 72, 85, 65, 00, 00, }, {83, 72, 85, 65, 73, 00, }, - {83, 72, 85, 65, 78, 00, }, {83, 72, 85, 65, 78, 71, }, - {83, 72, 85, 73, 00, 00, }, {83, 72, 85, 78, 00, 00, }, - {83, 72, 85, 79, 00, 00, }, {83, 73, 00, 00, 00, 00, }, - {83, 79, 78, 71, 00, 00, }, {83, 79, 85, 00, 00, 00, }, - {83, 85, 00, 00, 00, 00, }, {83, 85, 65, 78, 00, 00, }, - {83, 85, 73, 00, 00, 00, }, {83, 85, 78, 00, 00, 00, }, - {83, 85, 79, 00, 00, 00, }, {84, 65, 00, 00, 00, 00, }, - {84, 65, 73, 00, 00, 00, }, {84, 65, 78, 00, 00, 00, }, - {84, 65, 78, 71, 00, 00, }, {84, 65, 79, 00, 00, 00, }, - {84, 69, 00, 00, 00, 00, }, {84, 69, 78, 71, 00, 00, }, - {84, 73, 00, 00, 00, 00, }, {84, 73, 65, 78, 00, 00, }, - {84, 73, 65, 79, 00, 00, }, {84, 73, 69, 00, 00, 00, }, - {84, 73, 78, 71, 00, 00, }, {84, 79, 78, 71, 00, 00, }, - {84, 79, 85, 00, 00, 00, }, {84, 85, 00, 00, 00, 00, }, - {84, 85, 65, 78, 00, 00, }, {84, 85, 73, 00, 00, 00, }, - {84, 85, 78, 00, 00, 00, }, {84, 85, 79, 00, 00, 00, }, - {87, 65, 00, 00, 00, 00, }, {87, 65, 73, 00, 00, 00, }, - {87, 65, 78, 00, 00, 00, }, {87, 65, 78, 71, 00, 00, }, - {87, 69, 73, 00, 00, 00, }, {87, 69, 78, 00, 00, 00, }, - {87, 69, 78, 71, 00, 00, }, {87, 79, 00, 00, 00, 00, }, - {87, 85, 00, 00, 00, 00, }, {88, 73, 00, 00, 00, 00, }, - {88, 73, 65, 00, 00, 00, }, {88, 73, 65, 78, 00, 00, }, - {88, 73, 65, 78, 71, 00, }, {88, 73, 65, 79, 00, 00, }, - {88, 73, 69, 00, 00, 00, }, {88, 73, 78, 00, 00, 00, }, - {88, 73, 78, 71, 00, 00, }, {88, 73, 79, 78, 71, 00, }, - {88, 73, 85, 00, 00, 00, }, {88, 85, 00, 00, 00, 00, }, - {88, 85, 65, 78, 00, 00, }, {88, 85, 69, 00, 00, 00, }, - {88, 85, 78, 00, 00, 00, }, {89, 65, 00, 00, 00, 00, }, - {89, 65, 78, 00, 00, 00, }, {89, 65, 78, 71, 00, 00, }, - {89, 65, 79, 00, 00, 00, }, {89, 69, 00, 00, 00, 00, }, - {89, 73, 00, 00, 00, 00, }, {89, 73, 78, 00, 00, 00, }, - {89, 73, 78, 71, 00, 00, }, {89, 79, 00, 00, 00, 00, }, - {89, 79, 78, 71, 00, 00, }, {89, 79, 85, 00, 00, 00, }, - {89, 85, 00, 00, 00, 00, }, {89, 85, 65, 78, 00, 00, }, - {89, 85, 69, 00, 00, 00, }, {89, 85, 78, 00, 00, 00, }, - {90, 65, 00, 00, 00, 00, }, {90, 65, 73, 00, 00, 00, }, - {90, 65, 78, 00, 00, 00, }, {90, 65, 78, 71, 00, 00, }, - {90, 65, 79, 00, 00, 00, }, {90, 69, 00, 00, 00, 00, }, - {90, 69, 73, 00, 00, 00, }, {90, 69, 78, 00, 00, 00, }, - {90, 69, 78, 71, 00, 00, }, {90, 72, 65, 00, 00, 00, }, - {90, 72, 65, 73, 00, 00, }, {90, 72, 65, 78, 00, 00, }, - {90, 72, 65, 78, 71, 00, }, {90, 72, 65, 79, 00, 00, }, - {90, 72, 69, 00, 00, 00, }, {90, 72, 69, 78, 00, 00, }, - {90, 72, 69, 78, 71, 00, }, {90, 72, 73, 00, 00, 00, }, - {90, 72, 79, 78, 71, 00, }, {90, 72, 79, 85, 00, 00, }, - {90, 72, 85, 00, 00, 00, }, {90, 72, 85, 65, 00, 00, }, - {90, 72, 85, 65, 73, 00, }, {90, 72, 85, 65, 78, 00, }, - {90, 72, 85, 65, 78, 71, }, {90, 72, 85, 73, 00, 00, }, - {90, 72, 85, 78, 00, 00, }, {90, 72, 85, 79, 00, 00, }, - {90, 73, 00, 00, 00, 00, }, {90, 79, 78, 71, 00, 00, }, - {90, 79, 85, 00, 00, 00, }, {90, 85, 00, 00, 00, 00, }, - {90, 85, 65, 78, 00, 00, }, {90, 85, 73, 00, 00, 00, }, - {90, 85, 78, 00, 00, 00, }, {90, 85, 79, 00, 00, 00, }, - - }; - - /** First and last Chinese character with known Pinyin according to zh collation */ - private static final String FIRST_PINYIN_UNIHAN = "\u5416"; - private static final String LAST_PINYIN_UNIHAN = "\u5497"; - /** The first Chinese character in Unicode block */ - private static final char FIRST_UNIHAN = '\u3400'; - private static final Collator COLLATOR = Collator.getInstance(Locale.CHINA); - - private static HanziToPinyin sInstance; - private final boolean mHasChinaCollator; - - public static class Token { - /** - * Separator between target string for each source char - */ - public static final String SEPARATOR = " "; - - public static final int LATIN = 1; - public static final int PINYIN = 2; - public static final int UNKNOWN = 3; - - public Token() { - } - - public Token(int type, String source, String target) { - this.type = type; - this.source = source; - this.target = target; - } - /** - * Type of this token, ASCII, PINYIN or UNKNOWN. - */ - public int type; - /** - * Original string before translation. - */ - public String source; - /** - * Translated string of source. For Han, target is corresponding Pinyin. - * Otherwise target is original string in source. - */ - public String target; - } - - protected HanziToPinyin(boolean hasChinaCollator) { - mHasChinaCollator = hasChinaCollator; - } - - public static HanziToPinyin getInstance() { - synchronized(HanziToPinyin.class) { - if (sInstance != null) { - return sInstance; - } - // Check if zh_CN collation data is available - final Locale locale[] = Collator.getAvailableLocales(); - for (int i = 0; i < locale.length; i++) { - if (locale[i].equals(Locale.CHINA)) { - sInstance = new HanziToPinyin(true); - return sInstance; - } - } - Log.w(TAG, "There is no Chinese collator, HanziToPinyin is disabled"); - sInstance = new HanziToPinyin(false); - return sInstance; - } - } - - private Token getToken(char character) { - Token token = new Token(); - final String letter = Character.toString(character); - token.source = letter; - int offset = -1; - int cmp; - if (character < 256) { - token.type = Token.LATIN; - token.target = letter; - return token; - } else if (character < FIRST_UNIHAN) { - token.type = Token.UNKNOWN; - token.target = letter; - return token; - } else { - cmp = COLLATOR.compare(letter, FIRST_PINYIN_UNIHAN); - if (cmp < 0) { - token.type = Token.UNKNOWN; - token.target = letter; - return token; - } else if (cmp == 0) { - token.type = Token.PINYIN; - offset = 0; - } else { - cmp = COLLATOR.compare(letter, LAST_PINYIN_UNIHAN); - if (cmp > 0) { - token.type = Token.UNKNOWN; - token.target = letter; - return token; - } else if (cmp == 0) { - token.type = Token.PINYIN; - offset = UNIHANS.length - 1; - } - } - } - - token.type = Token.PINYIN; - if (offset < 0) { - int begin = 0; - int end = UNIHANS.length - 1; - while (begin <= end) { - offset = (begin + end) / 2; - final String unihan = Character.toString(UNIHANS[offset]); - cmp = COLLATOR.compare(letter, unihan); - if (cmp == 0) { - break; - } else if (cmp > 0) { - begin = offset + 1; - } else { - end = offset - 1; - } - } - } - if (cmp < 0) { - offset--; - } - StringBuilder pinyin = new StringBuilder(); - for (int j = 0; j < PINYINS[offset].length && PINYINS[offset][j] != 0; j++) { - pinyin.append((char)PINYINS[offset][j]); - } - token.target = pinyin.toString(); - return token; - } - - /** - * Convert the input to a array of tokens. The sequence of ASCII or Unknown - * characters without space will be put into a Token, One Hanzi character - * which has pinyin will be treated as a Token. - * If these is no China collator, the empty token array is returned. - */ - public ArrayList<Token> get(final String input) { - ArrayList<Token> tokens = new ArrayList<Token>(); - if (!mHasChinaCollator || TextUtils.isEmpty(input)) { - // return empty tokens. - return tokens; - } - final int inputLength = input.length(); - final StringBuilder sb = new StringBuilder(); - int tokenType = Token.LATIN; - // Go through the input, create a new token when - // a. Token type changed - // b. Get the Pinyin of current charater. - // c. current character is space. - for (int i = 0; i < inputLength; i++) { - final char character = input.charAt(i); - if (character == ' ') { - if (sb.length() > 0) { - addToken(sb, tokens, tokenType); - } - } else if (character < 256) { - if (tokenType != Token.LATIN && sb.length() > 0) { - addToken(sb, tokens, tokenType); - } - tokenType = Token.LATIN; - sb.append(character); - } else if (character < FIRST_UNIHAN) { - if (tokenType != Token.UNKNOWN && sb.length() > 0) { - addToken(sb, tokens, tokenType); - } - tokenType = Token.UNKNOWN; - sb.append(character); - } else { - Token t = getToken(character); - if (t.type == Token.PINYIN) { - if (sb.length() > 0) { - addToken(sb, tokens, tokenType); - } - tokens.add(t); - tokenType = Token.PINYIN; - } else { - if (tokenType != t.type && sb.length() > 0) { - addToken(sb, tokens, tokenType); - } - tokenType = t.type; - sb.append(character); - } - } - } - if (sb.length() > 0) { - addToken(sb, tokens, tokenType); - } - return tokens; - } - - private void addToken(final StringBuilder sb, final ArrayList<Token> tokens, - final int tokenType) { - String str = sb.toString(); - tokens.add(new Token(tokenType, str, str)); - sb.setLength(0); - } - -} diff --git a/core/java/com/android/internal/view/menu/ListMenuPresenter.java b/core/java/com/android/internal/view/menu/ListMenuPresenter.java index f8d24a3..cc09927 100644 --- a/core/java/com/android/internal/view/menu/ListMenuPresenter.java +++ b/core/java/com/android/internal/view/menu/ListMenuPresenter.java @@ -177,7 +177,9 @@ public class ListMenuPresenter implements MenuPresenter, AdapterView.OnItemClick public void restoreHierarchyState(Bundle inState) { SparseArray<Parcelable> viewStates = inState.getSparseParcelableArray(VIEWS_TAG); - ((View) mMenuView).restoreHierarchyState(viewStates); + if (viewStates != null) { + ((View) mMenuView).restoreHierarchyState(viewStates); + } } private class MenuAdapter extends BaseAdapter { diff --git a/core/java/com/android/internal/view/menu/MenuPopupHelper.java b/core/java/com/android/internal/view/menu/MenuPopupHelper.java index 5767519..8db7e3c 100644 --- a/core/java/com/android/internal/view/menu/MenuPopupHelper.java +++ b/core/java/com/android/internal/view/menu/MenuPopupHelper.java @@ -17,6 +17,7 @@ package com.android.internal.view.menu; import android.content.Context; +import android.content.res.Resources; import android.util.DisplayMetrics; import android.view.KeyEvent; import android.view.LayoutInflater; @@ -71,8 +72,9 @@ public class MenuPopupHelper implements AdapterView.OnItemClickListener, View.On mMenu = menu; mOverflowOnly = overflowOnly; - final DisplayMetrics metrics = context.getResources().getDisplayMetrics(); - mPopupMaxWidth = metrics.widthPixels / 2; + final Resources res = context.getResources(); + mPopupMaxWidth = Math.max(res.getDisplayMetrics().widthPixels / 2, + res.getDimensionPixelSize(com.android.internal.R.dimen.config_prefDialogWidth)); mAnchorView = anchorView; diff --git a/core/java/com/android/internal/widget/DigitalClock.java b/core/java/com/android/internal/widget/DigitalClock.java index 0885b6e..ac0dc35 100644 --- a/core/java/com/android/internal/widget/DigitalClock.java +++ b/core/java/com/android/internal/widget/DigitalClock.java @@ -96,13 +96,13 @@ public class DigitalClock extends RelativeLayout { }; static class AmPm { - private TextView mAmPm; + private TextView mAmPmTextView; private String mAmString, mPmString; AmPm(View parent, Typeface tf) { - mAmPm = (TextView) parent.findViewById(R.id.am_pm); - if (tf != null) { - mAmPm.setTypeface(tf); + mAmPmTextView = (TextView) parent.findViewById(R.id.am_pm); + if (mAmPmTextView != null && tf != null) { + mAmPmTextView.setTypeface(tf); } String[] ampm = new DateFormatSymbols().getAmPmStrings(); @@ -111,11 +111,15 @@ public class DigitalClock extends RelativeLayout { } void setShowAmPm(boolean show) { - mAmPm.setVisibility(show ? View.VISIBLE : View.GONE); + if (mAmPmTextView != null) { + mAmPmTextView.setVisibility(show ? View.VISIBLE : View.GONE); + } } void setIsMorning(boolean isMorning) { - mAmPm.setText(isMorning ? mAmString : mPmString); + if (mAmPmTextView != null) { + mAmPmTextView.setText(isMorning ? mAmString : mPmString); + } } } diff --git a/core/java/com/android/internal/widget/LockPatternView.java b/core/java/com/android/internal/widget/LockPatternView.java index bee8112..fd49ae3 100644 --- a/core/java/com/android/internal/widget/LockPatternView.java +++ b/core/java/com/android/internal/widget/LockPatternView.java @@ -131,6 +131,7 @@ public class LockPatternView extends View { private int mAspect; private final Matrix mArrowMatrix = new Matrix(); + private final Matrix mCircleMatrix = new Matrix(); /** * Represents a cell in the 3 X 3 matrix of the unlock pattern view. @@ -281,9 +282,14 @@ public class LockPatternView extends View { mBitmapArrowGreenUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_green_up); mBitmapArrowRedUp = getBitmapFor(R.drawable.indicator_code_lock_drag_direction_red_up); - // we assume all bitmaps have the same size - mBitmapWidth = mBitmapBtnDefault.getWidth(); - mBitmapHeight = mBitmapBtnDefault.getHeight(); + // bitmaps have the size of the largest bitmap in this group + final Bitmap bitmaps[] = { mBitmapBtnDefault, mBitmapBtnTouched, mBitmapCircleDefault, + mBitmapCircleGreen, mBitmapCircleRed }; + + for (Bitmap bitmap : bitmaps) { + mBitmapWidth = Math.max(mBitmapWidth, bitmap.getWidth()); + mBitmapHeight = Math.max(mBitmapHeight, bitmap.getHeight()); + } // allow vibration pattern to be customized mVibePattern = loadVibratePattern(com.android.internal.R.array.config_virtualKeyVibePattern); @@ -458,31 +464,40 @@ public class LockPatternView extends View { break; case MeasureSpec.EXACTLY: default: - result = specSize; + // use the specified size, if non-zero + result = specSize != 0 ? specSize : desired; } return result; } @Override + protected int getSuggestedMinimumWidth() { + // View should be large enough to contain 3 side-by-side target bitmaps + return 3 * mBitmapWidth; + } + + @Override + protected int getSuggestedMinimumHeight() { + // View should be large enough to contain 3 side-by-side target bitmaps + return 3 * mBitmapWidth; + } + + @Override protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) { - final int minimumWidth = 3 * mBitmapCircleDefault.getWidth(); - final int minimumHeight = 3 * mBitmapCircleDefault.getHeight(); + final int minimumWidth = getSuggestedMinimumWidth(); + final int minimumHeight = getSuggestedMinimumHeight(); int viewWidth = resolveMeasured(widthMeasureSpec, minimumWidth); int viewHeight = resolveMeasured(heightMeasureSpec, minimumHeight); - int requestedWidth = MeasureSpec.getSize(widthMeasureSpec); - int requestedHeight = MeasureSpec.getSize(heightMeasureSpec); switch (mAspect) { case ASPECT_SQUARE: - viewWidth = viewHeight = Math.min(requestedWidth, requestedHeight); + viewWidth = viewHeight = Math.min(viewWidth, viewHeight); break; case ASPECT_LOCK_WIDTH: - viewWidth = requestedWidth; - viewHeight = Math.min(requestedWidth, requestedHeight); + viewHeight = Math.min(viewWidth, viewHeight); break; case ASPECT_LOCK_HEIGHT: - viewWidth = Math.min(requestedWidth, requestedHeight); - viewHeight = requestedHeight; + viewWidth = Math.min(viewWidth, viewHeight); break; } // Log.v(TAG, "LockPatternView dimensions: " + viewWidth + "x" + viewHeight); @@ -947,8 +962,8 @@ public class LockPatternView extends View { // This assumes that the arrow image is drawn at 12:00 with it's top edge // coincident with the circle bitmap's top edge. Bitmap arrow = green ? mBitmapArrowGreenUp : mBitmapArrowRedUp; - final int cellWidth = mBitmapCircleDefault.getWidth(); - final int cellHeight = mBitmapCircleDefault.getHeight(); + final int cellWidth = mBitmapWidth; + final int cellHeight = mBitmapHeight; // the up arrow bitmap is at 12:00, so find the rotation from x axis and add 90 degrees. final float theta = (float) Math.atan2( @@ -956,7 +971,12 @@ public class LockPatternView extends View { final float angle = (float) Math.toDegrees(theta) + 90.0f; // compose matrix + float sx = Math.min(mSquareWidth / mBitmapWidth, 1.0f); + float sy = Math.min(mSquareHeight / mBitmapHeight, 1.0f); mArrowMatrix.setTranslate(leftX + offsetX, topY + offsetY); // transform to cell position + mArrowMatrix.preTranslate(mBitmapWidth/2, mBitmapHeight/2); + mArrowMatrix.preScale(sx, sy); + mArrowMatrix.preTranslate(-mBitmapWidth/2, -mBitmapHeight/2); mArrowMatrix.preRotate(angle, cellWidth / 2.0f, cellHeight / 2.0f); // rotate about cell center mArrowMatrix.preTranslate((cellWidth - arrow.getWidth()) / 2.0f, 0.0f); // translate to 12:00 pos canvas.drawBitmap(arrow, mArrowMatrix, mPaint); @@ -1002,8 +1022,17 @@ public class LockPatternView extends View { int offsetX = (int) ((squareWidth - width) / 2f); int offsetY = (int) ((squareHeight - height) / 2f); - canvas.drawBitmap(outerCircle, leftX + offsetX, topY + offsetY, mPaint); - canvas.drawBitmap(innerCircle, leftX + offsetX, topY + offsetY, mPaint); + // Allow circles to shrink if the view is too small to hold them. + float sx = Math.min(mSquareWidth / mBitmapWidth, 1.0f); + float sy = Math.min(mSquareHeight / mBitmapHeight, 1.0f); + + mCircleMatrix.setTranslate(leftX + offsetX, topY + offsetY); + mCircleMatrix.preTranslate(mBitmapWidth/2, mBitmapHeight/2); + mCircleMatrix.preScale(sx, sy); + mCircleMatrix.preTranslate(-mBitmapWidth/2, -mBitmapHeight/2); + + canvas.drawBitmap(outerCircle, mCircleMatrix, mPaint); + canvas.drawBitmap(innerCircle, mCircleMatrix, mPaint); } @Override |