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

Merge "Fix account problems"

Browse Source
This commit is contained in:
Jason Monk
2015-11-10 21:20:43 +00:00
committed by Android (Google) Code Review
parent 72575d5be8 0e23b41144
commit 4309b9552c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/layout/manage_accounts_screen.xml
View File

@@ -22,8 +22,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">
<ListView xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@android:id/list" android:id="@+id/prefs_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dip" android:layout_height="0dip"
android:layout_weight="1" android:layout_weight="1"

2
res/layout/preference_widget_sync_toggle.xml
View File

@@ -39,7 +39,7 @@
android:contentDescription="@string/sync_active" /> android:contentDescription="@string/sync_active" />
<Switch xmlns:android="http://schemas.android.com/apk/res/android" <Switch xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@*android:id/switchWidget" android:id="@id/switchWidget"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"

8
src/com/android/settings/accounts/ManageAccountsSettings.java
View File

@@ -44,9 +44,7 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.MetricsLogger; import com.android.internal.logging.MetricsLogger;
import com.android.settings.AccountPreference; import com.android.settings.AccountPreference;
import com.android.settings.R; import com.android.settings.R;
@@ -117,8 +115,10 @@ public class ManageAccountsSettings extends AccountPreferenceBase
public View onCreateView(LayoutInflater inflater, ViewGroup container, public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) { Bundle savedInstanceState) {
final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false); final View view = inflater.inflate(R.layout.manage_accounts_screen, container, false);
final ListView list = (ListView) view.findViewById(android.R.id.list); final ViewGroup prefs_container = (ViewGroup) view.findViewById(R.id.prefs_container);
Utils.prepareCustomPreferencesList(container, view, list, false); Utils.prepareCustomPreferencesList(container, view, prefs_container, false);
View prefs = super.onCreateView(inflater, prefs_container, savedInstanceState);
prefs_container.addView(prefs);
return view; return view;
} }

2
src/com/android/settings/accounts/SyncStateSwitchPreference.java
View File

@@ -69,7 +69,7 @@ public class SyncStateSwitchPreference extends SwitchPreference {
final boolean failedVisible = mFailed && !activeVisible; final boolean failedVisible = mFailed && !activeVisible;
syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE); syncFailedView.setVisibility(failedVisible ? View.VISIBLE : View.GONE);
View switchView = view.findViewById(com.android.internal.R.id.switchWidget); View switchView = view.findViewById(R.id.switchWidget);
if (mOneTimeSyncMode) { if (mOneTimeSyncMode) {
switchView.setVisibility(View.GONE); switchView.setVisibility(View.GONE);