Skip to content
This repository was archived by the owner on Jun 20, 2023. It is now read-only.

Commit d20c0dc

Browse files
committed
Revert "Remove some additions to get 25.1.1 compiling"
This reverts commit bae4a42.
1 parent bae4a42 commit d20c0dc

File tree

2 files changed

+54
-55
lines changed

2 files changed

+54
-55
lines changed
Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
using System;
22
namespace Android.Support.Graphics.Drawable
33
{
4-
// // Metadata.xml XPath class reference: path="/api/package[@name='android.support.graphics.drawable']/class[@name='AnimatedVectorDrawableCompat']"
5-
// public partial class AnimatedVectorDrawableCompat
6-
// {
7-
// public override void SetAlpha (int alpha)
8-
// {
9-
// Alpha = alpha;
10-
// }
11-
// }
4+
// Metadata.xml XPath class reference: path="/api/package[@name='android.support.graphics.drawable']/class[@name='AnimatedVectorDrawableCompat']"
5+
public partial class AnimatedVectorDrawableCompat
6+
{
7+
public override void SetAlpha (int alpha)
8+
{
9+
Alpha = alpha;
10+
}
11+
}
1212
}

v7-appcompat/source/Additions/Additions.cs

Lines changed: 46 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -365,53 +365,52 @@ public unsafe void SetSelector (global::Android.Graphics.Drawables.Drawable sel)
365365

366366
public partial class ScrollingTabContainerView
367367
{
368-
// private partial class TabView
369-
// {
370-
// //public override bool Selected {
371-
// public bool Selected {
372-
// set {
373-
// SetSelected (value);
374-
// }
375-
// get {
376-
// return base.Selected;
377-
// }
378-
// }
379-
380-
// static Delegate cb_setSelected_Z;
381-
//#pragma warning disable 0169
382-
// static Delegate GetSetSelected_ZHandler ()
383-
// {
384-
// if (cb_setSelected_Z == null)
385-
// cb_setSelected_Z = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, bool>)n_SetSelected_Z);
386-
// return cb_setSelected_Z;
387-
// }
388-
389-
// static void n_SetSelected_Z (IntPtr jnienv, IntPtr native__this, bool selected)
390-
// {
391-
// global::Android.Support.V7.Widget.ScrollingTabContainerView.TabView __this = global::Java.Lang.Object.GetObject<global::Android.Support.V7.Widget.ScrollingTabContainerView.TabView> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
392-
// __this.SetSelected (selected);
393-
// }
394-
//#pragma warning restore 0169
395-
396-
// static IntPtr id_setSelected_Z;
397-
// // Metadata.xml XPath method reference: path="/api/package[@name='android.support.v7.widget']/class[@name='ScrollingTabContainerView.TabView']/method[@name='setSelected' and count(parameter)=1 and parameter[1][@type='boolean']]"
398-
// [Register ("setSelected", "(Z)V", "GetSetSelected_ZHandler")]
399-
// public unsafe void SetSelected (bool selected)
400-
// {
401-
// if (id_setSelected_Z == IntPtr.Zero)
402-
// id_setSelected_Z = JNIEnv.GetMethodID (class_ref, "setSelected", "(Z)V");
403-
// try {
404-
// JValue* __args = stackalloc JValue [1];
405-
// __args [0] = new JValue (selected);
406-
407-
// if (GetType () == ThresholdType)
408-
// JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setSelected_Z, __args);
409-
// else
410-
// JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setSelected", "(Z)V"), __args);
411-
// } finally {
412-
// }
413-
// }
414-
// }
368+
private partial class TabView
369+
{
370+
public override bool Selected {
371+
set {
372+
SetSelected (value);
373+
}
374+
get {
375+
return base.Selected;
376+
}
377+
}
378+
379+
static Delegate cb_setSelected_Z;
380+
#pragma warning disable 0169
381+
static Delegate GetSetSelected_ZHandler ()
382+
{
383+
if (cb_setSelected_Z == null)
384+
cb_setSelected_Z = JNINativeWrapper.CreateDelegate ((Action<IntPtr, IntPtr, bool>)n_SetSelected_Z);
385+
return cb_setSelected_Z;
386+
}
387+
388+
static void n_SetSelected_Z (IntPtr jnienv, IntPtr native__this, bool selected)
389+
{
390+
global::Android.Support.V7.Widget.ScrollingTabContainerView.TabView __this = global::Java.Lang.Object.GetObject<global::Android.Support.V7.Widget.ScrollingTabContainerView.TabView> (jnienv, native__this, JniHandleOwnership.DoNotTransfer);
391+
__this.SetSelected (selected);
392+
}
393+
#pragma warning restore 0169
394+
395+
static IntPtr id_setSelected_Z;
396+
// Metadata.xml XPath method reference: path="/api/package[@name='android.support.v7.widget']/class[@name='ScrollingTabContainerView.TabView']/method[@name='setSelected' and count(parameter)=1 and parameter[1][@type='boolean']]"
397+
[Register ("setSelected", "(Z)V", "GetSetSelected_ZHandler")]
398+
public unsafe void SetSelected (bool selected)
399+
{
400+
if (id_setSelected_Z == IntPtr.Zero)
401+
id_setSelected_Z = JNIEnv.GetMethodID (class_ref, "setSelected", "(Z)V");
402+
try {
403+
JValue* __args = stackalloc JValue [1];
404+
__args [0] = new JValue (selected);
405+
406+
if (GetType () == ThresholdType)
407+
JNIEnv.CallVoidMethod (((global::Java.Lang.Object)this).Handle, id_setSelected_Z, __args);
408+
else
409+
JNIEnv.CallNonvirtualVoidMethod (((global::Java.Lang.Object)this).Handle, ThresholdClass, JNIEnv.GetMethodID (ThresholdClass, "setSelected", "(Z)V"), __args);
410+
} finally {
411+
}
412+
}
413+
}
415414
}
416415
}
417416

0 commit comments

Comments
 (0)