summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--res/values-en-rGB/strings.xml8
-rw-r--r--res/values-in/strings.xml2
-rw-r--r--res/values-pt/cm_strings.xml10
-rw-r--r--src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java7
-rw-r--r--src/com/android/settings/profiles/AppGroupConfig.java23
5 files changed, 33 insertions, 17 deletions
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 60bf3e665..d9710a21d 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -494,7 +494,7 @@
<string name="bluetooth_dock_settings_remember" msgid="5551459057010609115">"Remember settings"</string>
<string name="wifi_display_settings_title" msgid="564299108014609382">"Wireless display"</string>
<string name="wifi_display_settings_empty_list_wifi_display_off" msgid="1225626898926363100">"To see devices, turn wireless display on."</string>
- <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wireless display is disabled because Wi-FI is off."</string>
+ <string name="wifi_display_settings_empty_list_wifi_display_disabled" msgid="7363832031876872257">"Wireless display is disabled because Wi-Fi is off."</string>
<string name="wifi_display_search_for_devices" msgid="5065526281193354502">"Search for displays"</string>
<string name="wifi_display_searching_for_devices" msgid="5172373825348672137">"Searching…"</string>
<string name="wifi_display_no_devices_found" msgid="8180582698282377626">"No nearby wireless displays were found."</string>
@@ -542,8 +542,8 @@
<string name="wifi_poor_network_detection_summary" msgid="2466956369738047669">"Don\'t use a WiFi network unless it has a good Internet connection"</string>
<string name="wifi_setting_sleep_policy_title" msgid="9107237003911220057">"Keep Wi-Fi on during sleep"</string>
<string name="wifi_setting_sleep_policy_error" msgid="8174902072673071961">"There was a problem while changing the setting"</string>
- <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-FI optimisation"</string>
- <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimise battery usage when Wi-FI is on"</string>
+ <string name="wifi_suspend_optimizations" msgid="387215679583759376">"Wi-Fi optimisation"</string>
+ <string name="wifi_suspend_optimizations_summary" msgid="7774946457510541054">"Minimise battery usage when Wi-Fi is on"</string>
<string name="wifi_add_network" msgid="6234851776910938957">"Add network"</string>
<string name="wifi_access_points" msgid="2664629396767022441">"Wi-Fi networks"</string>
<string name="wifi_menu_wps_pbc" msgid="2668564692207863017">"WPS Push Button"</string>
@@ -556,7 +556,7 @@
<string name="wifi_menu_forget" msgid="8736964302477327114">"Forget network"</string>
<string name="wifi_menu_modify" msgid="2068554918652440105">"Modify network"</string>
<string name="wifi_empty_list_wifi_off" msgid="4722299515264875943">"To see networks available, turn Wi-Fi on."</string>
- <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Searching for WiFi networks..."</string>
+ <string name="wifi_empty_list_wifi_on" msgid="3354911729026237372">"Searching for Wi-Fi networks..."</string>
<string name="wifi_other_network" msgid="1048006316504242214">"Other network…"</string>
<string name="wifi_more" msgid="3195296805089107950">"More"</string>
<string name="wifi_setup_wps" msgid="8128702488486283957">"Automatic setup (WPS)"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2427eea8b..5cec39557 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -564,7 +564,7 @@
<string name="wifi_show_advanced" msgid="1793703023711426246">"Tampilkan opsi lanjutan"</string>
<string name="wifi_wps_setup_title" msgid="6034518116333042484">"Penyiapan Wi-Fi yang Dilindungi"</string>
<string name="wifi_wps_setup_msg" msgid="315174329121275092">"Memulai WPS..."</string>
- <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tekan tombol Penyiapan Wi-FI yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
+ <string name="wifi_wps_onstart_pbc" msgid="7204827509934892103">"Tekan tombol Penyiapan Wi-Fi yang Dilindungi di router Anda. Ini dapat disebut \"WPS\" atau berisi simbol ini:"</string>
<string name="wifi_wps_onstart_pin" msgid="8067502591043979939">"Masukkan pin <xliff:g id="NUMBER">%1$s</xliff:g> pada router Wi-Fi Anda. Penyiapan memerlukan waktu hingga dua menit untuk selesai."</string>
<string name="wifi_wps_complete" msgid="2388138550456729134">"WPS berhasil. Menyambung ke jaringan..."</string>
<string name="wifi_wps_connected" msgid="5754399645462924103">"Tersambung ke jaringan Wi-Fi <xliff:g id="NETWORK_NAME">%s</xliff:g>"</string>
diff --git a/res/values-pt/cm_strings.xml b/res/values-pt/cm_strings.xml
index 18ce21afb..522251908 100644
--- a/res/values-pt/cm_strings.xml
+++ b/res/values-pt/cm_strings.xml
@@ -745,4 +745,12 @@ controle adicionais. \'Remover\' apaga a linha selecionada.
<string name="storage_rescan_media_complete">Varredura completada</string>
<string name="notification_light_default_value">Padrão</string>
<string name="display_lockscreen_rotation_title">Rotacionar tela de bloqueio</string>
-</resources>
+ <string name="notification_drawer_behaviour_title">Comportamento</string>
+ <string name="notification_drawer_collapse_on_dismiss_title">Fechar gaveta automaticamente</string>
+ <string name="collapse_on_dismiss_never">Desativado</string>
+ <string name="collapse_on_dismiss_if_empty">Se nenhum restante</string>
+ <string name="collapse_on_dismiss_if_no_clearable">Se nenhum removível restante</string>
+ <string name="collapse_on_dismiss_never_summary">Deixar bandeja de notificação aberta ao remover notificações</string>
+ <string name="collapse_on_dismiss_if_empty_summary">Fechar bandeja de notificação ao remover a última notificação</string>
+ <string name="collapse_on_dismiss_if_no_clearable_summary">Fechar bandeja de notificação ao remover a última notificação removível</string>
+</resources> \ No newline at end of file
diff --git a/src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java b/src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java
index 51942aed8..4b49cf5d6 100644
--- a/src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java
+++ b/src/com/android/settings/cyanogenmod/privacyguard/PrivacyGuardManager.java
@@ -94,6 +94,7 @@ public class PrivacyGuardManager extends Fragment
public static final class AppInfo {
String title;
String packageName;
+ boolean enabled;
boolean privacyGuardEnabled;
}
@@ -245,14 +246,18 @@ public class PrivacyGuardManager extends Fragment
AppInfo app = new AppInfo();
app.title = appInfo.loadLabel(mPm).toString();
app.packageName = info.packageName;
+ app.enabled = appInfo.enabled;
app.privacyGuardEnabled = mPm.getPrivacyGuardSetting(app.packageName);
apps.add(app);
}
- // sort the apps by title
+ // sort the apps by their enabled state, then by title
Collections.sort(apps, new Comparator<AppInfo>() {
@Override
public int compare(AppInfo lhs, AppInfo rhs) {
+ if (lhs.enabled != rhs.enabled) {
+ return lhs.enabled ? -1 : 1;
+ }
return lhs.title.compareToIgnoreCase(rhs.title);
}
});
diff --git a/src/com/android/settings/profiles/AppGroupConfig.java b/src/com/android/settings/profiles/AppGroupConfig.java
index b5ea87c9a..8fbcfd049 100644
--- a/src/com/android/settings/profiles/AppGroupConfig.java
+++ b/src/com/android/settings/profiles/AppGroupConfig.java
@@ -74,8 +74,6 @@ public class AppGroupConfig extends SettingsPreferenceFragment
private PackageManager mPackageManager;
- private List<PackageInfo> mInstalledPackages;
-
private NotificationGroup mNotificationGroup;
private ProfileManager mProfileManager;
@@ -99,8 +97,7 @@ public class AppGroupConfig extends SettingsPreferenceFragment
if (args != null) {
mNotificationGroup = (NotificationGroup) args.getParcelable("NotificationGroup");
mPackageManager = getPackageManager();
- mInstalledPackages = mPackageManager.getInstalledPackages(0);
- mAppAdapter = new PackageAdaptor(mInstalledPackages);
+ mAppAdapter = new PackageAdaptor(mPackageManager.getInstalledPackages(0));
mAppAdapter.update();
updatePackages();
@@ -323,15 +320,21 @@ public class AppGroupConfig extends SettingsPreferenceFragment
}
class PackageItem implements Comparable<PackageItem> {
- CharSequence title;
-
+ String title;
String packageName;
-
Drawable icon;
+ boolean enabled;
@Override
public int compareTo(PackageItem another) {
- return this.title.toString().compareTo(another.title.toString());
+ if (enabled != another.enabled) {
+ return enabled ? -1 : 1;
+ }
+ int titleResult = title.compareToIgnoreCase(another.title);
+ if (titleResult != 0) {
+ return titleResult;
+ }
+ return packageName.compareTo(another.packageName);
}
}
@@ -352,11 +355,11 @@ public class AppGroupConfig extends SettingsPreferenceFragment
for (PackageInfo info : mInstalledPackageInfo) {
final PackageItem item = new PackageItem();
ApplicationInfo applicationInfo = info.applicationInfo;
- item.title = applicationInfo.loadLabel(mPackageManager);
+ item.title = applicationInfo.loadLabel(mPackageManager).toString();
item.icon = applicationInfo.loadIcon(mPackageManager);
item.packageName = applicationInfo.packageName;
+ item.enabled = applicationInfo.enabled;
handler.post(new Runnable() {
-
@Override
public void run() {
int index = Collections.binarySearch(mInstalledPackages, item);
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-10 13:23:47 +0000