Snap for 8606881 from 00d9f3a666 to udc-release
Change-Id: I71cdedadb1f7c83eafca999fb91a71aa29b39a5e
This commit is contained in:
@@ -14,10 +14,14 @@
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
-->
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@color/accent_select_background" />
|
||||
<corners
|
||||
android:radius="@dimen/homepage_preference_corner_radius" />
|
||||
</shape>
|
||||
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:color="@*android:color/ripple_material_light">
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
<solid
|
||||
android:color="@color/accent_select_background" />
|
||||
<corners
|
||||
android:radius="@dimen/homepage_preference_corner_radius" />
|
||||
</shape>
|
||||
</item>
|
||||
</ripple>
|
||||
@@ -1075,7 +1075,11 @@
|
||||
<!-- Message for a biometric preference toggle, indicating that an action can be performed by using either Face Unlock or Fingerprint Unlock. [CHAR LIMIT=50] -->
|
||||
<string name="biometric_settings_use_face_or_fingerprint_preference_summary">Using face or fingerprint</string>
|
||||
<!-- Message shown during enrollment to prompt a child to give the device to a parent or guardian. [CHAR LIMIT=NONE]-->
|
||||
<string name="biometric_settings_hand_back_to_guardian">Hand the phone back to your parent</string>
|
||||
<string name="biometric_settings_hand_back_to_guardian" product="tablet">Hand the tablet back to your parent</string>
|
||||
<!-- Message shown during enrollment to prompt a child to give the device to a parent or guardian. [CHAR LIMIT=NONE]-->
|
||||
<string name="biometric_settings_hand_back_to_guardian" product="device">Hand the device back to your parent</string>
|
||||
<!-- Message shown during enrollment to prompt a child to give the device to a parent or guardian. [CHAR LIMIT=NONE]-->
|
||||
<string name="biometric_settings_hand_back_to_guardian" product="default">Hand the phone back to your parent</string>
|
||||
<!-- Button text shown during enrollment to proceed after a child user has handed the device to a parent or guardian. [CHAR LIMIT=22] -->
|
||||
<string name="biometric_settings_hand_back_to_guardian_ok">OK</string>
|
||||
|
||||
|
||||
@@ -95,10 +95,17 @@ public class ApplicationViewHolder extends RecyclerView.ViewHolder {
|
||||
|
||||
void setSummary(CharSequence summary) {
|
||||
mSummary.setText(summary);
|
||||
updateSummaryVisibility();
|
||||
}
|
||||
|
||||
void setSummary(@StringRes int summary) {
|
||||
mSummary.setText(summary);
|
||||
updateSummaryVisibility();
|
||||
}
|
||||
|
||||
private void updateSummaryVisibility() {
|
||||
// Hide an empty summary and then title will be vertically centered.
|
||||
mSummary.setVisibility(TextUtils.isEmpty(mSummary.getText()) ? View.GONE : View.VISIBLE);
|
||||
}
|
||||
|
||||
void setEnabled(boolean isEnabled) {
|
||||
|
||||
Reference in New Issue
Block a user