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

Merge "Use BC theme for ChooseSimActivity" into sc-dev

Browse Source
This commit is contained in:
Peter Wang
2021-06-15 10:02:34 +00:00
committed by Android (Google) Code Review
parent 2ff8b363da d79015628a
commit 03d2f8d749
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/layout/choose_sim_activity.xml
View File

@@ -14,11 +14,12 @@
limitations under the License. limitations under the License.
--> -->
<com.google.android.setupdesign.GlifLayout <com.google.android.setupdesign.GlifRecyclerLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/glif_layout" android:id="@+id/glif_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:entries="@xml/items_multiple_carrier"
android:icon="@drawable/ic_network_signal_blue"> android:icon="@drawable/ic_network_signal_blue">
<LinearLayout <LinearLayout
@@ -45,4 +46,4 @@
android:entries="@xml/items_multiple_carrier" /> android:entries="@xml/items_multiple_carrier" />
</LinearLayout> </LinearLayout>
</com.google.android.setupdesign.GlifLayout> </com.google.android.setupdesign.GlifRecyclerLayout>

10
src/com/android/settings/sim/ChooseSimActivity.java
View File

@@ -41,7 +41,6 @@ import com.google.android.setupdesign.items.IItem;
import com.google.android.setupdesign.items.Item; import com.google.android.setupdesign.items.Item;
import com.google.android.setupdesign.items.ItemGroup; import com.google.android.setupdesign.items.ItemGroup;
import com.google.android.setupdesign.items.RecyclerItemAdapter; import com.google.android.setupdesign.items.RecyclerItemAdapter;
import com.google.android.setupdesign.view.HeaderRecyclerView;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
@@ -104,13 +103,12 @@ public class ChooseSimActivity extends Activity
} }
GlifLayout layout = findViewById(R.id.glif_layout); GlifLayout layout = findViewById(R.id.glif_layout);
TextView textView = findViewById(R.id.subtitle);
int subscriptionCount = mEmbeddedSubscriptions.size(); int subscriptionCount = mEmbeddedSubscriptions.size();
if (mHasPsim) { // Choose a number to use if (mHasPsim) { // Choose a number to use
subscriptionCount++; subscriptionCount++;
} }
layout.setHeaderText(getString(R.string.choose_sim_title)); layout.setHeaderText(getString(R.string.choose_sim_title));
textView.setText(getString(R.string.choose_sim_text, subscriptionCount)); layout.setDescriptionText(getString(R.string.choose_sim_text, subscriptionCount));
displaySubscriptions(); displaySubscriptions();
@@ -217,7 +215,7 @@ public class ChooseSimActivity extends Activity
private void displaySubscriptions() { private void displaySubscriptions() {
View rootView = findViewById(android.R.id.content); View rootView = findViewById(android.R.id.content);
GlifRecyclerLayout layout = rootView.findViewById(R.id.recycler_list); GlifRecyclerLayout layout = rootView.findViewById(R.id.glif_layout);
RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter(); RecyclerItemAdapter adapter = (RecyclerItemAdapter) layout.getAdapter();
adapter.setOnItemSelectedListener(this); adapter.setOnItemSelectedListener(this);
mItemGroup = (ItemGroup) adapter.getRootItemHierarchy(); mItemGroup = (ItemGroup) adapter.getRootItemHierarchy();
@@ -265,10 +263,6 @@ public class ChooseSimActivity extends Activity
item.setId(index++); item.setId(index++);
mItemGroup.addChild(item); mItemGroup.addChild(item);
} }
// This removes the unused header artifact from GlifRecyclerLayout.
HeaderRecyclerView rv = (HeaderRecyclerView) layout.getRecyclerView();
rv.getHeader().setVisibility(View.GONE);
} }
private void updateSubscriptions() { private void updateSubscriptions() {