Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 635c4b41: am e8f0603e: Merge change 24567 into eclair

Browse Source 
Merge commit '635c4b41ca2d8c8b697527e8b4039aef99d6efde'

* commit '635c4b41ca2d8c8b697527e8b4039aef99d6efde':
  Fix issue #1943927: need notification in status bar when adb is active
This commit is contained in:
Dianne Hackborn
2009-09-10 14:36:36 -07:00
committed by Android Git Automerger
parent 7f00d63d7d 635c4b41ca
commit 6b2bc11bed
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/res/res/values/strings.xml
View File

@@ -1848,7 +1848,7 @@
<!-- Title of notification shown when ADB is actively connected to the phone. -->
<string name="adb_active_notification_title">USB debugging connected</string>
<!-- Message of notification shown when ADB is actively connected to the phone. -->
<string name="adb_active_notification_message">A computer is connected to your phone.</string>
<string name="adb_active_notification_message">Select to disable USB debugging.</string>
<!-- Used to replace %s in urls retreived from the signin server with locales. For Some -->
<!-- devices we don't support all the locales we ship to and need to replace the '%s' with a -->
@@ -1858,7 +1858,7 @@
<string name="locale_replacement">""</string>
<!-- Title of the pop-up dialog in which the user switches input method components. -->
<string name="select_input_method">Select Input Method</string>
<string name="select_input_method">Select input method</string>
<string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>
<string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string>