Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,607 Commits 3 Branches 0 Tags
bdc2f66d5ba94de887070a37c9d1de56b7cf36fa
Commit Graph

83607 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Brown
bdc2f66d5b am 892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 
* commit '892f371c6b8c33268dceaeb89ac09c73ad72ad79':
  Encapsulate locks in UEventObservers.
 2012-08-20 20:28:30 -07:00
Jeff Brown
892f371c6b Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 2012-08-20 20:25:14 -07:00
Jeff Brown
008b1762a8 Encapsulate locks in UEventObservers. 
Synchronized methods make me cry so fixing this first before
I introduce any new functionality that could result in a deadlock.

Bug: 6548391
Change-Id: I9c006dc491ce205bfd86acf828dcebda2a63b2ca
 2012-08-20 20:15:34 -07:00
Jeff Brown
6fee1cba4f am 4b72463d: Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev 
* commit '4b72463d7cb807912ca359f3b5a160f59d985c1d':
  Add factory test feature to shut off on long press power.
 2012-08-20 19:43:47 -07:00
Jeff Brown
4b72463d7c Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev 2012-08-20 19:41:48 -07:00
John Reck
d87fd2e136 am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 
* commit 'c2cb8d226399c3cb93bad7008b4049d493d4f1d2':
  Support scrolling layers with the mousewheel
 2012-08-20 17:35:17 -07:00
John Reck
c2cb8d2263 Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 2012-08-20 17:33:20 -07:00
John Reck
f2e6115404 Support scrolling layers with the mousewheel 
Bug: 6635437
 Fix onGenericAction to support scrolling layers.
 Calling startScrollingLayer detects if there is a layer under
 the mouse pointer, and if so switches to DRAG_LAYER_MODE. Then, calling
 doDrag will correctly handle scrolling the layer in DRAG_LAYER_MODE,
 switching out of DRAG_LAYER_MODE when we hit the end of a layer, and
 scrolling the page if there isn't a layer. It is the method used
 by the touch drag path.

Change-Id: I00be09a63c40caa8fce94134c57db0894a62fef0
 2012-08-20 17:13:47 -07:00
Brian Muramatsu
8318cf9969 am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev 
* commit 'a5d5d608ccd885d8328879dde782a8cc93b7cf4f':
  add wireless charger support
 2012-08-20 16:59:53 -07:00
Brian Muramatsu
a5d5d608cc Merge "add wireless charger support" into jb-mr1-dev 2012-08-20 16:57:14 -07:00
Baligh Uddin
0304420856 am 33da458d: Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 
* commit '33da458dd832996d8b0ae945d6ab2896faff4afa':
  Import translations. DO NOT MERGE
 2012-08-20 15:45:43 -07:00
Baligh Uddin
33da458dd8 Merge "Import translations. DO NOT MERGE" into jb-mr1-dev 2012-08-20 15:43:10 -07:00
Jean-Baptiste Queru
d9d1005532 am 1abb7b54: am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit '1abb7b541521d528c8d4f1ec5b79238842e1d155':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 15:28:27 -07:00
Jean-Baptiste Queru
1abb7b5415 am f96fcd50: am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit 'f96fcd5095e751fc9402d8bbecdf59f53e00d854':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 15:26:53 -07:00
Jean-Baptiste Queru
6ba73cc662 am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev 
* commit '8bb154c272dbd11922d74e882a538ea9af6cd7db':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 15:25:43 -07:00
Jean-Baptiste Queru
8bb154c272 Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev 2012-08-20 15:23:16 -07:00
Jeff Brown
3df15bf37a am ca7a9ef0: Merge "Adjust auto-brightness time constants." into jb-mr1-dev 
* commit 'ca7a9ef0e52216e88d302feacf8edb766d813f5f':
  Adjust auto-brightness time constants.
 2012-08-20 15:12:02 -07:00
Jeff Brown
ca7a9ef0e5 Merge "Adjust auto-brightness time constants." into jb-mr1-dev 2012-08-20 15:09:41 -07:00
Jeff Brown
38f05e09bd am 3fee5c6b: Merge "Fix some proximity sensor bugs." into jb-mr1-dev 
* commit '3fee5c6bd8e13f8ef7e1ba1df3a8bf56ebb36221':
  Fix some proximity sensor bugs.
 2012-08-20 15:01:39 -07:00
Iliyan Malchev
c456bf13ac am 8756bd1d: Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 
* commit '8756bd1d6b43e1724996897cf4593d5ea5b00213':
  Revert "Revert "Add timestamp in scan results""
 2012-08-20 14:59:49 -07:00
Jeff Brown
3fee5c6bd8 Merge "Fix some proximity sensor bugs." into jb-mr1-dev 2012-08-20 14:59:18 -07:00
Jean-Baptiste Queru
acbbd1142d resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev 
Change-Id: I51b1732011f31ea07087ef0898b47de8977074de
 2012-08-20 14:57:23 -07:00
Iliyan Malchev
8756bd1d6b Merge "Revert "Revert "Add timestamp in scan results""" into jb-mr1-dev 2012-08-20 14:57:14 -07:00
Jeff Brown
9a538ee7bd Add factory test feature to shut off on long press power. 
Bug: 6847329
Change-Id: I2f4f975c3af2d13ccc06812a5a42e79032700862
 2012-08-20 14:56:57 -07:00
Benoit Goby
e6bc1238b7 am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 
* commit '7b7feee80331deed883602d5861074ca66293e9c':
  Add UsbDebuggingManager and UsbDebuggingActivity
 2012-08-20 14:51:15 -07:00
Jean-Baptiste Queru
f96fcd5095 am 26f8ce83: Merge "To avoid the JNI memory leaks in video editor codes" 
* commit '26f8ce83e04c4efd10c09bb83cfacdcd154d9450':
  To avoid the JNI memory leaks in video editor codes
 2012-08-20 14:50:45 -07:00
Jean-Baptiste Queru
4ea6a8eb9f am f515c6f4: Merge "Switch widget: Fix ON/OFF option update error" 
* commit 'f515c6f4fe4457de1d5c49f78f9dcf6e4379e335':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 14:50:40 -07:00
Benoit Goby
7b7feee803 Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 2012-08-20 14:48:11 -07:00
Jean-Baptiste Queru
26f8ce83e0 Merge "To avoid the JNI memory leaks in video editor codes" 2012-08-20 14:29:51 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
rich cannings
8916311dba am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev 
* commit 'a811e0848dc28f73e31a3f84d8ceca3b1f504b52':
  Pass URLs to package verifiers
 2012-08-20 14:27:00 -07:00
rich cannings
a811e0848d Merge "Pass URLs to package verifiers" into jb-mr1-dev 2012-08-20 14:24:49 -07:00
Kenny Root
7cb079629c am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 
* commit '672cfdc5b6194a416eae93f5ebe82cb624e2add6':
  Add AndroidKeyStore provider for KeyStore API
 2012-08-20 14:24:11 -07:00
Kenny Root
672cfdc5b6 Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 2012-08-20 14:20:32 -07:00
Jeff Brown
5f47ba4db7 Adjust auto-brightness time constants. 
Specifically, dim a little more slowly.

Change-Id: I10d66a83ddc3a63f8c93d740a0cb116e6c974d10
 2012-08-20 14:02:12 -07:00
Benoit Goby
4e68bd420b Add UsbDebuggingManager and UsbDebuggingActivity 
The UsbDebuggingManager listens to adbd requests and displays a dialog
when the public key authentification fails, for the user to confirm if it
wants to allow USB debugging from the attached host. If the user chooses
to always allow USB debugging, the UsbDebuggingManager writes the public
key to adbd's config file so that the public key authenfication succeeds
next time.

Change-Id: I115c828331d8e326c380844ee33915d5dff22260
 2012-08-20 13:44:34 -07:00
George Mount
00d2eba501 am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 
* commit '9af67e8f6c7dd98baa6232ff2cda97510b827637':
  Add getDefaultUserAgent to WebSettings.
 2012-08-20 13:40:34 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -07:00
Jeff Brown
6307a150d3 Fix some proximity sensor bugs. 
Forgot to clear waiting for proximity negative flag.
Waiting for proximity negative also shouldn't turn the screen off
if it is currently on.

Change-Id: I9885b2f54b185beb961acda44176bc5f11a9f58b
 2012-08-20 13:25:08 -07:00
Victoria Lease
66e1635d7f am df8ef4b1: DO NOT MERGE LocaleSpan makes Han disambiguation easy! 
* commit 'df8ef4b139a8918895f8a5c62536123da06e81fe':
  DO NOT MERGE LocaleSpan makes Han disambiguation easy!
 2012-08-20 13:24:42 -07:00
rich cannings
706e8ba26b Pass URLs to package verifiers 
This change passes the originating URL and accompanied referrer to
package verifiers, when available.

Bug: 6544677
Change-Id: I9ebc71bc13f549bd88267e444816151a99bda000
 2012-08-20 13:20:14 -07:00
Victoria Lease
df8ef4b139 DO NOT MERGE LocaleSpan makes Han disambiguation easy! 
Cherry-pick of I7f1b0d49a2ece957a7b9b5d65d48385bf2c2a668 from master.

I've also provided TextView.setTextLocale() for use in single-language
TextViews.

Change-Id: I5692859bfd2aafc284172454d943afc250b22535
 2012-08-20 13:17:58 -07:00
Victoria Lease
b853a94284 am 6fb73ab8: Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 
* commit '6fb73ab83f9c1b745ccff4fb92babb429b9215ee':
  DO NOT MERGE Han Preference
 2012-08-20 13:14:20 -07:00
Victoria Lease
6fb73ab83f Merge "DO NOT MERGE Han Preference" into jb-mr1-dev 2012-08-20 13:11:43 -07:00
Kenny Root
3ca1e412b7 am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit '80618d66b02d8cce325cdaa184435f43818a062b':
  Use Libcore.os.umask for setting umask
 2012-08-20 12:59:19 -07:00
Kenny Root
80618d66b0 am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit '7d5b22afae8525cdf80ba1bf8e18b87d597f830d':
  Use Libcore.os.umask for setting umask
 2012-08-20 12:57:36 -07:00
Kenny Root
7d5b22afae am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit 'f029c22f82573e7fee7c7e0cca4439fe78300bac':
  Use Libcore.os.umask for setting umask
 2012-08-20 12:55:11 -07:00
Robert Greenwalt
bb1d98473c am 80bb8d29: Merge "Update TCP buffer size when switching network type" into jb-mr1-dev 
* commit '80bb8d2906ed90668de66b3b2554e69f97c25412':
  Update TCP buffer size when switching network type
 2012-08-20 12:55:10 -07:00
Iliyan Malchev
06c43d575c Revert "Revert "Add timestamp in scan results"" 
With b/6979211 fixed, we can reinstate timestamps.

This reverts commit 578531082b

Change-Id: I5dffc8d9701004f7c6325f21e1e33d1cdd2d05c0
 2012-08-20 12:52:35 -07:00
Robert Greenwalt
80bb8d2906 Merge "Update TCP buffer size when switching network type" into jb-mr1-dev 2012-08-20 12:52:24 -07:00