Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 485c4633 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge remote-tracking branch 'github/cm-11.0' into HEAD

parents 4e13b158 ee6e3386
Loading
Loading
Loading
Loading
+348 −311

File changed.

Preview size limit exceeded, changes collapsed.

+292 −295

File changed.

Preview size limit exceeded, changes collapsed.

+55 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.net-->
<!--
    Copyright (C) 2012 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
  -->
<resources>
  <array name="snooze_dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@drawable/ic_alarm_alert_snooze</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@string/alarm_alert_snooze_text</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@string/description_direction_left</item>
    <item>@null</item>
  </array>
  <array name="dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
</resources>
+55 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.net-->
<!--
    Copyright (C) 2012 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
  -->
<resources>
  <array name="snooze_dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@drawable/ic_alarm_alert_snooze</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@string/alarm_alert_snooze_text</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@string/description_direction_left</item>
    <item>@null</item>
  </array>
  <array name="dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
</resources>
+55 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.net-->
<!--
    Copyright (C) 2012 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
  -->
<resources>
  <array name="snooze_dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@drawable/ic_alarm_alert_snooze</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@string/alarm_alert_snooze_text</item>
    <item>@null</item>
  </array>
  <array name="snooze_dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@string/description_direction_left</item>
    <item>@null</item>
  </array>
  <array name="dismiss_drawables">
    <item>@drawable/ic_alarm_alert_dismiss</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_descriptions">
    <item>@string/alarm_alert_dismiss_text</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
  <array name="dismiss_direction_descriptions">
    <item>@string/description_direction_right</item>
    <item>@null</item>
    <item>@null</item>
    <item>@null</item>
  </array>
</resources>
Loading