Merge remote-tracking branch 'origin/13.0'

Change-Id: I77d3656aec10063a90095d5299b85304692d8b32

3 files changed, 34 insertions, 4 deletions

diff --git a/share/qtcreator/debugger/lldbbridge.py b/share/qtcreator/debugger/lldbbridge.py
index 7809a6a3dc..f2387ac913 100644
--- a/share/qtcreator/debugger/lldbbridge.py
+++ b/share/qtcreator/debugger/lldbbridge.py
@@ -1456,6 +1456,21 @@ class Dumper(DumperBase):
             if bp is not None:
                 self.reportBreakpointUpdate(bp)
 
+    def wantAutoContinue(self, frame):
+        if self.platform_ != 'remote-android':
+            return False
+        funcname = frame.GetFunctionName()
+        if funcname and funcname.startswith('java.'):
+            return True
+        module = frame.GetModule()
+        filespec = module.GetPlatformFileSpec() # Not GetFileSpec
+        filename = filespec.GetFilename()
+        if filename == 'libart.so':
+            return True
+        if funcname == None and not frame.line_entry.file.IsValid() and filename == None:
+            return True
+        return False
+
     def handleEvent(self, event):
         if lldb.SBBreakpoint.EventIsBreakpointEvent(event):
             self.handleBreakpointEvent(event)
@@ -1490,8 +1505,12 @@ class Dumper(DumperBase):
             if state == lldb.eStateStopped:
                 stoppedThread = self.firstStoppedThread()
                 if stoppedThread:
-                    #self.report("STOPPED THREAD: %s" % stoppedThread)
                     frame = stoppedThread.GetFrameAtIndex(0)
+                    if self.wantAutoContinue(frame):
+                        #self.warn("AUTO CONTINUE")
+                        error = self.process.Continue()
+                        return
+
                     #self.report("FRAME: %s" % frame)
                     function = frame.GetFunction()
                     functionName = function.GetName()
diff --git a/share/qtcreator/themes/dark.figmatokens b/share/qtcreator/themes/dark.figmatokens
index 8937a3cc2d..194ce7fab2 100644
--- a/share/qtcreator/themes/dark.figmatokens
+++ b/share/qtcreator/themes/dark.figmatokens
@@ -20,7 +20,13 @@ Token_Foreground_Subtle=ff2A2A2A
 Token_Text_Default=ffF8F8F8
 Token_Text_Muted=ffAEAEAE
 Token_Text_Subtle=ff595959
-Token_Text_Accent=ff23B26A
+
+; Token_Text_Accent value from Figma is still too dark. Therefore, it is modified, here.
+; Text (consisting of thin lines) needs to be substantially brighter than accent colors used for
+; larger-area elements like the filled button.
+
+; Token_Text_Accent=ff23B26A
+Token_Text_Accent=ff30C06A
 
 Token_Stroke_Strong=ffeeeeee
 Token_Stroke_Muted=ff727272
diff --git a/share/qtcreator/themes/light.figmatokens b/share/qtcreator/themes/light.figmatokens
index 6ef243d17d..138ad74afd 100644
--- a/share/qtcreator/themes/light.figmatokens
+++ b/share/qtcreator/themes/light.figmatokens
@@ -10,7 +10,12 @@ Token_Accent_Muted=ff1f9b5d
 Token_Accent_Subtle=ff1a8550
 
 Token_Background_Default=fffcfcfc
-Token_Background_Muted=ffF2F2F2
+
+; Token_Background_Muted value from Figma is too dark to ensure proper contrast when used as
+; text bachground. Therefore, it is modified, here.
+
+;Token_Background_Muted=ffF2F2F2
+Token_Background_Muted=ffF6F6F6
 Token_Background_Subtle=ffe7e7e7
 
 Token_Foreground_Default=ffD8D8D8
@@ -20,7 +25,7 @@ Token_Foreground_Subtle=ffEFEFEF
 Token_Text_Default=ff393939
 Token_Text_Muted=ff6a6a6a
 Token_Text_Subtle=ffbebebe
-Token_Text_Accent=ff28C878
+Token_Text_Accent=ff1F9B5D
 
 Token_Stroke_Strong=ff464646
 Token_Stroke_Muted=ff727272