Change Chip between QS and QQS
Chip animates via fade out and fade in. No redlines for margins and padding. Test: manual Change-Id: I10f024eb06f88b6493687febdbb0d5ccbba450b8
This commit is contained in:
@@ -17,6 +17,7 @@
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<solid android:color="#4a4a4a" />
|
||||
<padding android:padding="@dimen/ongoing_appops_chip_bg_padding" />
|
||||
<padding android:paddingTop="@dimen/ongoing_appops_chip_bg_padding"
|
||||
android:paddingBottom="@dimen/ongoing_appops_chip_bg_padding"/>
|
||||
<corners android:radius="@dimen/ongoing_appops_chip_bg_corner_radius" />
|
||||
</shape>
|
||||
@@ -29,14 +29,25 @@
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="@dimen/ongoing_appops_chip_side_padding"
|
||||
android:paddingEnd="@dimen/ongoing_appops_chip_side_padding"
|
||||
android:background="@drawable/privacy_chip_bg"
|
||||
android:focusable="true">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/in_use_text"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="center_vertical|start"
|
||||
android:layout_marginEnd="@dimen/ongoing_appops_chip_icon_margin_collapsed"
|
||||
android:gravity="center_vertical"
|
||||
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
|
||||
android:textColor="@color/status_bar_clock_color"
|
||||
android:text="@string/ongoing_privacy_chip_in_use"
|
||||
/>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/icons_container"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_gravity="center_vertical|start"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:gravity="center_vertical"
|
||||
/>
|
||||
|
||||
@@ -51,7 +62,7 @@
|
||||
android:gravity="center_vertical"
|
||||
android:textAppearance="@style/TextAppearance.StatusBar.Clock"
|
||||
android:textColor="@color/status_bar_clock_color"
|
||||
android:layout_marginStart="@dimen/ongoing_appops_chip_icon_margin"
|
||||
android:layout_marginEnd="@dimen/ongoing_appops_chip_icon_margin"
|
||||
android:layout_marginStart="@dimen/ongoing_appops_chip_icon_margin_collapsed"
|
||||
android:layout_marginEnd="@dimen/ongoing_appops_chip_icon_margin_collapsed"
|
||||
/>
|
||||
</com.android.systemui.privacy.OngoingPrivacyChip>
|
||||
@@ -967,7 +967,7 @@
|
||||
<!-- Height and width of App Opp icons in Ongoing App Ops dialog -->
|
||||
<dimen name="ongoing_appops_dialog_icon_size">24dp</dimen>
|
||||
<!-- Left margin of App Opp icons in Ongoing App Ops dialog -->
|
||||
<dimen name="ongoing_appops_dialog_icon_margin">8dp</dimen>
|
||||
<dimen name="ongoing_appops_dialog_icon_margin">12dp</dimen>
|
||||
<!-- Height and width of Application icons in Ongoing App Ops dialog -->
|
||||
<dimen name="ongoing_appops_dialog_app_icon_size">32dp</dimen>
|
||||
<!-- Height and width of Plus sign in Ongoing App Ops dialog -->
|
||||
@@ -988,12 +988,14 @@
|
||||
<dimen name="ongoing_appops_chip_side_padding">6dp</dimen>
|
||||
<!-- Padding between background of Ongoing App Ops chip and content -->
|
||||
<dimen name="ongoing_appops_chip_bg_padding">0dp</dimen>
|
||||
<!-- Margin between icons of Ongoing App Ops chip -->
|
||||
<dimen name="ongoing_appops_chip_icon_margin">4dp</dimen>
|
||||
<!-- Margin between icons of Ongoing App Ops chip when QQS-->
|
||||
<dimen name="ongoing_appops_chip_icon_margin_collapsed">0dp</dimen>
|
||||
<!-- Margin between icons of Ongoing App Ops chip when QS-->
|
||||
<dimen name="ongoing_appops_chip_icon_margin_expanded">8dp</dimen>
|
||||
<!-- Icon size of Ongoing App Ops chip -->
|
||||
<dimen name="ongoing_appops_chip_icon_size">18dp</dimen>
|
||||
<!-- Radius of Ongoing App Ops chip corners -->
|
||||
<dimen name="ongoing_appops_chip_bg_corner_radius">12dp</dimen>
|
||||
<dimen name="ongoing_appops_chip_bg_corner_radius">4dp</dimen>
|
||||
<!-- Text size for Ongoing App Ops dialog title -->
|
||||
<dimen name="ongoing_appops_dialog_title_size">20sp</dimen>
|
||||
<!-- Text size for Ongoing App Ops dialog items -->
|
||||
|
||||
@@ -2301,6 +2301,9 @@
|
||||
<!-- Content description for ongoing privacy chip. Use with multiple apps [CHAR LIMIT=NONE]-->
|
||||
<string name="ongoing_privacy_chip_content_multiple_apps">Applications are using your <xliff:g id="types_list" example="camera, location">%s</xliff:g>.</string>
|
||||
|
||||
<!-- Ongoing Privacy "Chip" in use text [CHAR LIMIT=10]-->
|
||||
<string name="ongoing_privacy_chip_in_use">In use:</string>
|
||||
|
||||
<!-- Content description for ongoing privacy chip. Use with multiple apps using same app op[CHAR LIMIT=NONE]-->
|
||||
<plurals name="ongoing_privacy_chip_content_multiple_apps_single_op">
|
||||
<item quantity="one"><xliff:g id="num_apps" example="1">%1$d</xliff:g> application is using your <xliff:g id="type" example="camera">%2$s</xliff:g>.</item>
|
||||
|
||||
Reference in New Issue
Block a user