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

Commit f38b070b authored by Jonathan Dixon's avatar Jonathan Dixon Committed by Android (Google) Code Review
Browse files

Merge "Hide PlusinsEnabled/PluginsPath methods" into jb-mr2-dev

parents dbf500aa 0bf4781e

api/current.txt

+0 −4
Original line number Diff line number Diff line
@@ -27589,8 +27589,6 @@ package android.webkit { 
    method public synchronized int getMinimumFontSize();

    method public synchronized int getMinimumLogicalFontSize();

    method public deprecated synchronized android.webkit.WebSettings.PluginState getPluginState();

    method public deprecated synchronized boolean getPluginsEnabled();

    method public deprecated synchronized java.lang.String getPluginsPath();

    method public synchronized java.lang.String getSansSerifFontFamily();

    method public boolean getSaveFormData();

    method public deprecated boolean getSavePassword();
@@ -27636,8 +27634,6 @@ package android.webkit { 
    method public synchronized void setMinimumLogicalFontSize(int);

    method public void setNeedInitialFocus(boolean);

    method public deprecated synchronized void setPluginState(android.webkit.WebSettings.PluginState);

    method public deprecated synchronized void setPluginsEnabled(boolean);

    method public deprecated synchronized void setPluginsPath(java.lang.String);

    method public deprecated synchronized void setRenderPriority(android.webkit.WebSettings.RenderPriority);

    method public synchronized void setSansSerifFontFamily(java.lang.String);

    method public void setSaveFormData(boolean);

core/java/android/webkit/WebSettings.java

+4 −0
Original line number Diff line number Diff line
@@ -1004,6 +1004,7 @@ public abstract class WebSettings { 
     * @param flag true if plugins should be enabled

     * @deprecated This method has been deprecated in favor of

     *             {@link #setPluginState}

     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}

     */

    @Deprecated

    public synchronized void setPluginsEnabled(boolean flag) {
@@ -1032,6 +1033,7 @@ public abstract class WebSettings { 
     * @param pluginsPath a String path to the directory containing plugins

     * @deprecated This method is no longer used as plugins are loaded from

     *             their own APK via the system's package manager.

     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}

     */

    @Deprecated

    public synchronized void setPluginsPath(String pluginsPath) {
@@ -1224,6 +1226,7 @@ public abstract class WebSettings { 
     * @return true if plugins are enabled

     * @see #setPluginsEnabled

     * @deprecated This method has been replaced by {@link #getPluginState}

     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}

     */

    @Deprecated

    public synchronized boolean getPluginsEnabled() {
@@ -1249,6 +1252,7 @@ public abstract class WebSettings { 
     * @return an empty string

     * @deprecated This method is no longer used as plugins are loaded from

     * their own APK via the system's package manager.

     * @hide Since API level {@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR2}

     */

    @Deprecated

    public synchronized String getPluginsPath() {