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

Commit 87b13833 authored by Brint E. Kriebel's avatar Brint E. Kriebel
Browse files

Merge branch 'cm-11.0' into stable/cm-11.0

parents fb29f7a4 c48caec6
Loading
Loading
Loading
Loading
+8 −1
Original line number Diff line number Diff line
@@ -1875,7 +1875,14 @@

        <activity android:name=".cyanogenmod.ContributorsCloud" />

        <activity android:name=".cyanogenmod.LockscreenInterface" />
        <activity android:name="Settings$LockscreenInterfaceActivity">
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                       android:value="com.android.settings.cyanogenmod.LockscreenInterface" />
            <intent-filter>
                <action android:name="android.settings.LOCKSCREEN_INTERFACE" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

        <activity android:name=".notificationlight.NotificationLightSettings" />

+3 −2
Original line number Diff line number Diff line
@@ -11,7 +11,6 @@
        android:minHeight="48dp"
        android:orientation="horizontal"
        android:gravity="center_vertical"
        android:paddingRight="?android:attr/scrollbarSize"
        android:background="?android:attr/selectableItemBackground"
        android:descendantFocusability="blocksDescendants">

@@ -40,7 +39,7 @@
        <LinearLayout
            android:id="@+id/launch_app"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:layout_height="match_parent"
            android:orientation="horizontal"
            android:visibility="gone" >

@@ -53,6 +52,8 @@
                android:layout_width="30dp"
                android:layout_height="30dp"
                android:src="@drawable/ic_launch_app"
                android:layout_gravity="center"
                android:layout_marginRight="?android:attr/scrollbarSize"
                android:paddingLeft="5dp" />
        </LinearLayout>
    </LinearLayout>
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
    <item>Turkye</item>
    <item>Singapoer</item>
    <item>Brasilië</item>
    <item>Indië</item>
  </string-array>
  <string-array name="profile_entries">
    <item>Aan</item>
+9 −4
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@
  <string name="connection_state_disabled">Gedeaktiveer</string>
  <string name="connection_state_enabled">Geaktiveer</string>
  <string name="volume_override_summary">Stel na %1$s/%2$s</string>
  <string name="volume_override_summary_no_override">Moenie omseil</string>
  <string name="profile_volume_override_checkbox_label">Ignoreer volume</string>
  <string name="profile_profiles_manage">Profiele</string>
  <string name="profile_profile_manage">Bestuur profiel</string>
  <string name="profile_appgroups_manage">Program groepe</string>
@@ -127,9 +129,10 @@
  <string name="link_volume_mutes">Demping affekteer ook kennisgewings</string>
  <string name="volume_keys_control_ring_stream">Die volume knoppies beheer luitoon volume</string>
  <string name="ring_mode_title">Luimetode</string>
  <string name="ring_mode_normal">Normaal</string>
  <string name="ring_mode_normal">Luitoon</string>
  <string name="ring_mode_vibrate">Vibreer</string>
  <string name="ring_mode_mute">Gedemp</string>
  <string name="ring_mode_unchanged">Onveranderd</string>
  <string name="volume_overlay_title">Volume-paneel styl</string>
  <string name="volume_overlay_single">Enkel</string>
  <string name="volume_overlay_expandable">Uitbreidbaar</string>
@@ -215,7 +218,6 @@
  <string name="lockscreen_maximize_widgets_title">Maksimeer legstukke</string>
  <string name="lockscreen_maximize_widgets_summary">Wys legstukke gemaksimaliseer en die slot geminimaliseer wanneer die skerm aangeskakel word</string>
  <string name="lockscreen_enable_camera_title">Kamera</string>
  <string name="lockscreen_enable_application_widget_title">Appcast legstuk</string>
  <string name="safe_headset_volume_title">Veilige oorfone volume</string>
  <string name="safe_headset_volume_restore_title">Verminder oorfone volume op verbinding</string>
  <string name="cyanogenmod_waiver_title">Kwytskelding</string>
@@ -265,6 +267,7 @@
  <string name="title_tile_volume">Volume</string>
  <string name="title_tile_expanded_desktop">Uitgebreide lessenaar</string>
  <string name="title_tile_network_adb">ADB oor netwerk</string>
  <string name="title_tile_themes">Temas</string>
  <string name="title_dynamic_tiles">Dinamiese teëls</string>
  <string name="dynamic_tiles_note_title">Nota:</string>
  <string name="dynamic_tiles_note_summary">Dinamiese teëls sal alleenlik verskyn deur \'n stelsel gebeurtenis</string>
@@ -294,6 +297,8 @@
  <string name="cm_sound_mode_sound">Klanke</string>
  <string name="cm_sound_mode_soundVibrate">Klank en vibrasie</string>
  <string name="pref_location_mode_title">Ligging modes</string>
  <string name="pref_location_mode_summary">Ontmerk alle modes vir standaard gedrag</string>
  <string name="cm_location_mode_off">Ligging af</string>
  <string name="cm_location_mode_battery_saving">Battery besparend</string>
  <string name="cm_location_mode_device_only">Toestel alleenlik</string>
  <string name="cm_location_mode_high_accuracy">Hoë akkuraatheid</string>
@@ -440,7 +445,6 @@ ten einde om bykomende kontrolepunte by te voeg . \'Verwyder\' verwyder die geko
  <string name="changelog_error">Kan nie Veranderinge-log laai nie</string>
  <string name="contributor_cloud_title">Bydraers</string>
  <string name="cmupdate_settings_title">CyanogenMod opgradering</string>
  <string name="cmupdate_settings_summary">Soek vir of installeer beskikbare opgraderings</string>
  <string name="development_tools_title">Gereedskap</string>
  <string name="allow_mock_sms">Laat skyn SMS toe</string>
  <string name="privacy_settings_cyanogenmod_title">Privaatheid</string>
@@ -873,10 +877,10 @@ ten einde om bykomende kontrolepunte by te voeg . \'Verwyder\' verwyder die geko
  <string name="voice_wakeup_retrain_title">Herprogrammeer jou stem</string>
  <string name="voice_wakeup_activity_title">Aktiwiteit om te begin</string>
  <string name="voice_wakeup_default_activity">Google Now</string>
  <string name="sub_no_sim">Geen Sim</string>
  <string name="multi_sim_settings_title">SIM-kaarte</string>
  <string name="multi_sim_settings_group_summary">Standaard SIM keuse</string>
  <string name="voice_title">Stem oproepe</string>
  <string name="data_title">Data verbinding</string>
  <string name="sms_title">Stuur SMS</string>
  <string name="priority_sub_title">Prioriteit inskrywing</string>
  <string name="bluetooth_accept_all_files">Aanvaar alle lêer tipes</string>
@@ -966,6 +970,7 @@ ten einde om bykomende kontrolepunte by te voeg . \'Verwyder\' verwyder die geko
  <string name="set_sms_error">Fout met verstelling van SMS inskrywing. Inskrywing nie aktief.</string>
  <string name="set_voice_error">Fout met verstelling van stem inskrywing. Inskrywing nie aktief.</string>
  <string name="set_priority_sub_error">Fout met verstelling van prioriteit inskrywing. Inskrywing nie aktief.</string>
  <string name="prompt">Vrae altyd</string>
  <string name="maximum_head_level">Hoof: %1$s W/kg</string>
  <string name="maximum_body_level">Lyf: %1$s W/kg</string>
  <string name="tune_away_title">TuneAway</string>
+1 −0
Original line number Diff line number Diff line
@@ -28,6 +28,7 @@
    <item>تركيا</item>
    <item>سنغافورة</item>
    <item>البرازيل</item>
    <item>India</item>
  </string-array>
  <string-array name="profile_entries">
    <item>يعمل</item>
Loading