Loading core/res/res/values/strings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -4480,7 +4480,7 @@ <string name="zen_mode_alarm">Until <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> (next alarm)</string> <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] --> <string name="zen_mode_forever">Until you turn off Do Not Disturb</string> <string name="zen_mode_forever">Until you turn off</string> <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] --> <string name="zen_mode_forever_dnd">Until you turn off Do Not Disturb</string> Loading packages/SettingsLib/res/drawable/btn_borderless_rect.xml 0 → 100644 +31 −0 Original line number Diff line number Diff line <!-- Copyright (C) 2018 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. --> <inset xmlns:android="http://schemas.android.com/apk/res/android" android:insetTop="4dp" android:insetBottom="4dp"> <ripple android:color="?android:attr/colorControlHighlight" > <item android:id="@android:id/mask"> <shape> <corners android:radius="2dp" /> <solid android:color="@android:color/white" /> </shape> </item> </ripple> </inset> No newline at end of file packages/SettingsLib/res/drawable/ic_minus.xml 0 → 100644 +24 −0 Original line number Diff line number Diff line <!-- Copyright (C) 2018 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24.0dp" > <path android:fillColor="#FFFFFFFF" android:pathData="M18,13H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/> </vector> No newline at end of file packages/SettingsLib/res/drawable/ic_plus.xml 0 → 100644 +24 −0 Original line number Diff line number Diff line <!-- Copyright (C) 2018 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24.0dp" > <path android:fillColor="#FFFFFFFF" android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v5h5c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/> </vector> No newline at end of file packages/SettingsLib/res/layout/zen_mode_condition.xml 0 → 100644 +84 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2018 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. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" android:layout_marginStart="1dp" android:layout_marginEnd="0dp" android:layout_weight="1" android:gravity="center_vertical" > <LinearLayout android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="48dp" android:gravity="center_vertical" android:layout_centerVertical="true" android:orientation="vertical" android:layout_toEndOf="@android:id/checkbox" android:layout_toStartOf="@android:id/button1"> <TextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" android:textAlignment="viewStart" android:maxLines="1" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp"/> <TextView android:id="@android:id/text2" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/zen_mode_condition_detail_item_interline_spacing" android:ellipsize="end" android:textAlignment="viewStart" android:maxLines="1" android:textColor="?android:attr/textColorSecondary" android:textSize="14sp"/> </LinearLayout> <ImageView android:id="@android:id/button1" style="@style/BorderlessButton" android:layout_width="48dp" android:layout_height="48dp" android:layout_centerVertical="true" android:scaleType="center" android:layout_toStartOf="@android:id/button2" android:contentDescription="@string/accessibility_manual_zen_less_time" android:tint="?android:attr/colorAccent" android:src="@drawable/ic_minus" /> <ImageView android:id="@android:id/button2" style="@style/BorderlessButton" android:layout_width="48dp" android:layout_height="48dp" android:layout_alignParentEnd="true" android:scaleType="center" android:layout_centerVertical="true" android:contentDescription="@string/accessibility_manual_zen_more_time" android:tint="?android:attr/colorAccent" android:src="@drawable/ic_plus" /> </RelativeLayout> No newline at end of file Loading
core/res/res/values/strings.xml +1 −1 Original line number Diff line number Diff line Loading @@ -4480,7 +4480,7 @@ <string name="zen_mode_alarm">Until <xliff:g id="formattedTime" example="10:00 PM">%1$s</xliff:g> (next alarm)</string> <!-- Zen mode condition: no exit criteria. [CHAR LIMIT=NONE] --> <string name="zen_mode_forever">Until you turn off Do Not Disturb</string> <string name="zen_mode_forever">Until you turn off</string> <!-- Zen mode condition: no exit criteria, includes the name of the feature for emphasis. [CHAR LIMIT=NONE] --> <string name="zen_mode_forever_dnd">Until you turn off Do Not Disturb</string> Loading
packages/SettingsLib/res/drawable/btn_borderless_rect.xml 0 → 100644 +31 −0 Original line number Diff line number Diff line <!-- Copyright (C) 2018 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. --> <inset xmlns:android="http://schemas.android.com/apk/res/android" android:insetTop="4dp" android:insetBottom="4dp"> <ripple android:color="?android:attr/colorControlHighlight" > <item android:id="@android:id/mask"> <shape> <corners android:radius="2dp" /> <solid android:color="@android:color/white" /> </shape> </item> </ripple> </inset> No newline at end of file
packages/SettingsLib/res/drawable/ic_minus.xml 0 → 100644 +24 −0 Original line number Diff line number Diff line <!-- Copyright (C) 2018 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24.0dp" > <path android:fillColor="#FFFFFFFF" android:pathData="M18,13H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h12c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/> </vector> No newline at end of file
packages/SettingsLib/res/drawable/ic_plus.xml 0 → 100644 +24 −0 Original line number Diff line number Diff line <!-- Copyright (C) 2018 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. --> <vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24.0dp" android:viewportHeight="24.0" android:viewportWidth="24.0" android:width="24.0dp" > <path android:fillColor="#FFFFFFFF" android:pathData="M18,13h-5v5c0,0.55 -0.45,1 -1,1h0c-0.55,0 -1,-0.45 -1,-1v-5H6c-0.55,0 -1,-0.45 -1,-1v0c0,-0.55 0.45,-1 1,-1h5V6c0,-0.55 0.45,-1 1,-1h0c0.55,0 1,0.45 1,1v5h5c0.55,0 1,0.45 1,1v0C19,12.55 18.55,13 18,13z"/> </vector> No newline at end of file
packages/SettingsLib/res/layout/zen_mode_condition.xml 0 → 100644 +84 −0 Original line number Diff line number Diff line <?xml version="1.0" encoding="utf-8"?> <!-- Copyright (C) 2018 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. --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" android:clipChildren="false" android:layout_marginStart="1dp" android:layout_marginEnd="0dp" android:layout_weight="1" android:gravity="center_vertical" > <LinearLayout android:id="@android:id/content" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="48dp" android:gravity="center_vertical" android:layout_centerVertical="true" android:orientation="vertical" android:layout_toEndOf="@android:id/checkbox" android:layout_toStartOf="@android:id/button1"> <TextView android:id="@android:id/text1" android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" android:textAlignment="viewStart" android:maxLines="1" android:textColor="?android:attr/textColorPrimary" android:textSize="16sp"/> <TextView android:id="@android:id/text2" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="@dimen/zen_mode_condition_detail_item_interline_spacing" android:ellipsize="end" android:textAlignment="viewStart" android:maxLines="1" android:textColor="?android:attr/textColorSecondary" android:textSize="14sp"/> </LinearLayout> <ImageView android:id="@android:id/button1" style="@style/BorderlessButton" android:layout_width="48dp" android:layout_height="48dp" android:layout_centerVertical="true" android:scaleType="center" android:layout_toStartOf="@android:id/button2" android:contentDescription="@string/accessibility_manual_zen_less_time" android:tint="?android:attr/colorAccent" android:src="@drawable/ic_minus" /> <ImageView android:id="@android:id/button2" style="@style/BorderlessButton" android:layout_width="48dp" android:layout_height="48dp" android:layout_alignParentEnd="true" android:scaleType="center" android:layout_centerVertical="true" android:contentDescription="@string/accessibility_manual_zen_more_time" android:tint="?android:attr/colorAccent" android:src="@drawable/ic_plus" /> </RelativeLayout> No newline at end of file