Follow-up on comments from splitting app info
Bug: 19511439
Change-Id: Id1395597262f66514808f71d99978120dbba70e1
diff --git a/res/layout/app_preferred_settings.xml b/res/layout/app_preferred_settings.xml
index 7c6a45f..533887d 100644
--- a/res/layout/app_preferred_settings.xml
+++ b/res/layout/app_preferred_settings.xml
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2015, 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.
-*/
+ Copyright (C) 2015 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.
-->
+
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
@@ -44,6 +43,7 @@
android:layout_gravity="center_vertical"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
+
<TextView android:id="@+id/auto_launch"
android:textAppearance="?android:attr/textAppearanceSmall"
android:layout_alignParentStart="true"
@@ -57,6 +57,7 @@
android:layout_below="@id/auto_launch"
android:paddingTop="4dip"
android:orientation="horizontal">
+
<View
android:layout_width="120dip"
android:layout_height="0dip"
@@ -72,8 +73,11 @@
android:layout_height="wrap_content"
android:layout_weight="0.4"
android:text="@string/clear_activities" />
+
</LinearLayout>
+
</RelativeLayout>
</LinearLayout>
+
</ScrollView>
diff --git a/res/layout/installed_app_details.xml b/res/layout/installed_app_details.xml
index ccbe105..cebec28 100644
--- a/res/layout/installed_app_details.xml
+++ b/res/layout/installed_app_details.xml
@@ -16,6 +16,7 @@
** limitations under the License.
*/
-->
+
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/all_details"
diff --git a/res/layout/permission_settings.xml b/res/layout/permission_settings.xml
index 8233c81..f08b9d6 100644
--- a/res/layout/permission_settings.xml
+++ b/res/layout/permission_settings.xml
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2015, 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.
-*/
+ Copyright (C) 2015 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.
-->
+
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
diff --git a/res/layout/storage_settings.xml b/res/layout/storage_settings.xml
index b8dddfd..a73cf4c 100644
--- a/res/layout/storage_settings.xml
+++ b/res/layout/storage_settings.xml
@@ -1,21 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
-/*
-** Copyright 2015, 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.
-*/
+ Copyright (C) 2015 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.
-->
+
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d57ee72..49d8ea6 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -5923,36 +5923,36 @@
<string name="slot_number">(Slot<xliff:g id="slot_num">%1$d</xliff:g>)</string>
<!-- New strings needed for App Info 2 -->
- <!-- Preference label for app default launch settings -->
+ <!-- Preference label for app default launch settings [CHAR LIMIT=35]-->
<string name="launch_by_default">Launch by default</string>
- <!-- Summary for app storage preference -->
+ <!-- Summary for app storage preference [CHAR LIMIT=15] -->
<string name="storage_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used in <xliff:g id="storage_type" example="internal memory">%2$s</xliff:g></string>
- <!-- Internal storage label -->
+ <!-- Internal storage label [CHAR LIMIT=25] -->
<string name="storage_type_internal">internal memory</string>
- <!-- External storage label -->
+ <!-- External storage label [CHAR LIMIT=25] -->
<string name="storage_type_external">external memory</string>
- <!-- App notification summary with notifications enabled -->
+ <!-- App notification summary with notifications enabled [CHAR LIMIT=40] -->
<string name="notifications_enabled">On</string>
- <!-- App notification summary with notifications disabled -->
+ <!-- App notification summary with notifications disabled [CHAR LIMIT=40] -->
<string name="notifications_disabled">Block</string>
- <!-- App notification summary with notifications sensitive -->
+ <!-- App notification summary with notifications sensitive [CHAR LIMIT=40] -->
<string name="notifications_sensitive">Sensitive</string>
- <!-- App notification summary with notifications priority -->
+ <!-- App notification summary with notifications priority [CHAR LIMIT=40] -->
<string name="notifications_priority">Priority</string>
- <!-- App notification summary with notifications priority and sensitive -->
+ <!-- App notification summary with notifications priority and sensitive [CHAR LIMIT=40] -->
<string name="notifications_priority_sensitive">Priority & Sensitive</string>
- <!-- Permissions preference summary -->
+ <!-- Permissions preference summary [CHAR LIMIT=40] -->
<plurals name="permissions_summary">
<item quantity="one"><xliff:g id="count" example="1">%d</xliff:g> permission granted</item>
<item quantity="other"><xliff:g id="count" example="10">%d</xliff:g> permissions granted</item>
</plurals>
- <!-- Launch defaults preference summary with some set -->
+ <!-- Launch defaults preference summary with some set [CHAR LIMIT=40] -->
<string name="launch_defaults_some">Some defaults set</string>
- <!-- Launch defaults preference summary with none set -->
+ <!-- Launch defaults preference summary with none set [CHAR LIMIT=40] -->
<string name="launch_defaults_none">No defaults set</string>
</resources>
diff --git a/src/com/android/settings/AppHeader.java b/src/com/android/settings/AppHeader.java
index 5cd126a..cd76e80 100644
--- a/src/com/android/settings/AppHeader.java
+++ b/src/com/android/settings/AppHeader.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.settings;
import android.app.Activity;
diff --git a/src/com/android/settings/applications/AppInfoBase.java b/src/com/android/settings/applications/AppInfoBase.java
index 2203a21..81edde2 100644
--- a/src/com/android/settings/applications/AppInfoBase.java
+++ b/src/com/android/settings/applications/AppInfoBase.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.settings.applications;
import android.app.Activity;
@@ -151,15 +152,29 @@
protected abstract AlertDialog createDialog(int id, int errorCode);
@Override
- public void onRunningStateChanged(boolean running) { }
+ public void onRunningStateChanged(boolean running) {
+ // No op.
+ }
+
@Override
- public void onRebuildComplete(ArrayList<AppEntry> apps) { }
+ public void onRebuildComplete(ArrayList<AppEntry> apps) {
+ // No op.
+ }
+
@Override
- public void onPackageIconChanged() { }
+ public void onPackageIconChanged() {
+ // No op.
+ }
+
@Override
- public void onPackageSizeChanged(String packageName) { }
+ public void onPackageSizeChanged(String packageName) {
+ // No op.
+ }
+
@Override
- public void onAllSizesComputed() { }
+ public void onAllSizesComputed() {
+ // No op.
+ }
@Override
public void onPackageListChanged() {
diff --git a/src/com/android/settings/applications/AppLaunchSettings.java b/src/com/android/settings/applications/AppLaunchSettings.java
index 6379102..24a6fe0 100644
--- a/src/com/android/settings/applications/AppLaunchSettings.java
+++ b/src/com/android/settings/applications/AppLaunchSettings.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.settings.applications;
import android.app.AlertDialog;
diff --git a/src/com/android/settings/applications/AppPermissionSettings.java b/src/com/android/settings/applications/AppPermissionSettings.java
index a5b4895..496faf5 100644
--- a/src/com/android/settings/applications/AppPermissionSettings.java
+++ b/src/com/android/settings/applications/AppPermissionSettings.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.settings.applications;
import android.app.AlertDialog;
diff --git a/src/com/android/settings/applications/AppStorageSettings.java b/src/com/android/settings/applications/AppStorageSettings.java
index 5ae5e8f..3df01ed 100644
--- a/src/com/android/settings/applications/AppStorageSettings.java
+++ b/src/com/android/settings/applications/AppStorageSettings.java
@@ -45,7 +45,7 @@
import com.android.settings.applications.ApplicationsState.Callbacks;
public class AppStorageSettings extends AppInfoWithHeader implements OnClickListener, Callbacks {
- private static final String TAG = "AppStorageSettings";
+ private static final String TAG = AppStorageSettings.class.getSimpleName();
//internal constants used in Handler
private static final int OP_SUCCESSFUL = 1;
diff --git a/src/com/android/settings/applications/HeaderPreference.java b/src/com/android/settings/applications/HeaderPreference.java
index 57fe9f3..a3d4bde 100644
--- a/src/com/android/settings/applications/HeaderPreference.java
+++ b/src/com/android/settings/applications/HeaderPreference.java
@@ -13,6 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package com.android.settings.applications;
import android.content.Context;