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

Commit e65cc9a9 authored by Matt Pietal's avatar Matt Pietal Committed by Automerger Merge Worker
Browse files

Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev... 

Merge "Controls UI - Show timeout msg and not controls on error" into rvc-dev am: cde9d6b3 am: c38d8f0b am: ccb78017 am: b62cd05d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11941804

Change-Id: I9d603e1d9f78be5b9025bec9fbfb2e0a295a52c3
parents c4f387d6 b62cd05d

packages/SystemUI/src/com/android/systemui/controls/controller/ControlsProviderLifecycleManager.kt

+1 −1
Original line number Original line Diff line number Diff line
@@ -73,7 +73,7 @@ class ControlsProviderLifecycleManager( 




    companion object {

    companion object {

        private const val BIND_RETRY_DELAY = 1000L // ms

        private const val BIND_RETRY_DELAY = 1000L // ms

        private const val LOAD_TIMEOUT_SECONDS = 30L // seconds

        private const val LOAD_TIMEOUT_SECONDS = 20L // seconds

        private const val MAX_BIND_RETRIES = 5

        private const val MAX_BIND_RETRIES = 5

        private const val DEBUG = true

        private const val DEBUG = true

        private val BIND_FLAGS = Context.BIND_AUTO_CREATE or Context.BIND_FOREGROUND_SERVICE

        private val BIND_FLAGS = Context.BIND_AUTO_CREATE or Context.BIND_FOREGROUND_SERVICE

packages/SystemUI/src/com/android/systemui/controls/management/ControlsFavoritingActivity.kt

+24 −22
Original line number Original line Diff line number Diff line
@@ -174,7 +174,7 @@ class ControlsFavoritingActivity @Inject constructor( 
                        subtitleView.visibility = View.GONE

                        subtitleView.visibility = View.GONE

                    } else {

                    } else {

                        statusText.visibility = View.GONE

                        statusText.visibility = View.GONE

                    }



                        pageIndicator.setNumPages(listOfStructures.size)

                        pageIndicator.setNumPages(listOfStructures.size)

                        pageIndicator.setLocation(0f)

                        pageIndicator.setLocation(0f)

                        pageIndicator.visibility =

                        pageIndicator.visibility =
@@ -192,13 +192,15 @@ class ControlsFavoritingActivity @Inject constructor( 
                                        pageIndicator.getLocationOnScreen(p)

                                        pageIndicator.getLocationOnScreen(p)

                                        val x = p[0] + pageIndicator.width / 2

                                        val x = p[0] + pageIndicator.width / 2

                                        val y = p[1] + pageIndicator.height

                                        val y = p[1] + pageIndicator.height

                                    mTooltipManager?.show(R.string.controls_structure_tooltip, x, y)

                                        mTooltipManager?.show(

                                            R.string.controls_structure_tooltip, x, y)

                                    }

                                    }

                                }

                                }

                            })

                            })

                        }.start()

                        }.start()

                        ControlsAnimations.enterAnimation(structurePager).start()

                        ControlsAnimations.enterAnimation(structurePager).start()

                    }

                    }

                }

            }, Consumer { runnable -> cancelLoadRunnable = runnable })

            }, Consumer { runnable -> cancelLoadRunnable = runnable })

        }

        }

    }

    }