Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,159 Commits 3 Branches 0 Tags
76a855f0e2b83ed3fddde98e19e2d349617eb048
Commit Graph

24831 Commits

Author SHA1 Message Date
Jeff Brown
76a855f0e2 am 7e68e923: am 11167b88: Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev 
* commit '7e68e923058295b5b0b789f00cf66d0a289e2115':
  Make the screen brightness setting limits configurable.
 2012-08-21 23:23:06 -07:00
Jeff Brown
128e527ffc am 64ce3396: am 572a0859: Merge "Add FloatMath.pow." into jb-mr1-dev 
* commit '64ce3396dba49e95a0fbf912890c91d3339b7b87':
  Add FloatMath.pow.
 2012-08-21 23:20:22 -07:00
Jeff Brown
11167b887a Merge "Make the screen brightness setting limits configurable." into jb-mr1-dev 2012-08-21 23:19:08 -07:00
Jeff Brown
572a0859dd Merge "Add FloatMath.pow." into jb-mr1-dev 2012-08-21 23:15:56 -07:00
Jeff Brown
f9bba13692 Make the screen brightness setting limits configurable. 
Change-Id: Ica84951c482edef6b7faebe1af22c609a1b9e8be
 2012-08-21 22:27:42 -07:00
Jeff Brown
e2c279e8a1 Add FloatMath.pow. 
Change-Id: I5c584f4894caba47fccfa22ba95f8665990d516c
 2012-08-21 22:27:41 -07:00
Selim Gurun
a6d16993eb Merge "Small tidy up to getDefaultUserAgent. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:12:56 -07:00
Jonathan Dixon
951fcabef6 Small tidy up to getDefaultUserAgent. DO NOT MERGE 
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117

Clean cherry pick: d1c4faa5a4

Change-Id: I96807df0171c7308421ca8811cfcb1bf710cb007
 2012-08-21 16:08:22 -07:00
Selim Gurun
b62999c136 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE" into jb-mr1-dev 2012-08-21 16:06:04 -07:00
Mikhail Naganov
9d5e7aa38d Implement WebSettings.{get|set}TextSize via {get|set}TextZoom. DO NOT MERGE 
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.

Clean cherry pick: 1202d66f78

Change-Id: Ib6aecb187f10ac3ec5d12cb839cb814ec0c564fe
 2012-08-21 15:52:40 -07:00
Dianne Hackborn
6908eee2bb am 37674ee7: am b4f56b5e: am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit '37674ee787533cc992951e8f41bd67717995a9c1':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:47:57 -07:00
Dianne Hackborn
b4f56b5ea2 am 8b97ee6d: am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit '8b97ee6d8c26974a6fc9ce85c3d7a07ca1e9cac2':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:42:42 -07:00
Dianne Hackborn
8b97ee6d8c am b0b4a704: Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 
* commit 'b0b4a704400319ceaa1002f3194a40553a00cc82':
  ActivityThread: Avoid creating duplicate handlers and reuse mH
 2012-08-21 15:39:42 -07:00
Dianne Hackborn
b0b4a70440 Merge "ActivityThread: Avoid creating duplicate handlers and reuse mH" 2012-08-21 15:12:45 -07:00
Jonathan Dixon
a6a16dac22 Merge "Small tidy up to getDefaultUserAgent" 2012-08-21 13:49:08 -07:00
Jim Miller
c7e2face38 am 652520ae: am f6449761: Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev 
* commit '652520aed571c87993dcf7d4f98ecc39804212ee':
  Update AppWidgetHost with better support for OnClickHandlers
 2012-08-21 13:24:30 -07:00
Jim Miller
f644976101 Merge "Update AppWidgetHost with better support for OnClickHandlers" into jb-mr1-dev 2012-08-21 13:19:31 -07:00
Dianne Hackborn
3c4a774a57 am b73b0a2c: am d4ec5ae5: Merge "Improve multi-user app management." into jb-mr1-dev 
* commit 'b73b0a2c7f188073ca021a74907a0f02e10092aa':
  Improve multi-user app management.
 2012-08-21 11:21:24 -07:00
Dianne Hackborn
d4ec5ae504 Merge "Improve multi-user app management." into jb-mr1-dev 2012-08-21 11:17:12 -07:00
Dianne Hackborn
0c38049502 Improve multi-user app management. 
Introduce API to get per-user storage information, keep track
of services associated with users, and various small cleanup.

Change-Id: I5d4e784e7ff3cccfed627d66a090d2f464202634
 2012-08-21 10:34:20 -07:00
Jeff Brown
74e7f481a7 am bdc2f66d: am 892f371c: Merge "Encapsulate locks in UEventObservers." into jb-mr1-dev 
* commit 'bdc2f66d5ba94de887070a37c9d1de56b7cf36fa':
  Encapsulate locks in UEventObservers.
 2012-08-20 20:30:37 -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
Jonathan Dixon
d1c4faa5a4 Small tidy up to getDefaultUserAgent 
- no need for WebSettings to bounce via WebView to get to the factory
- move this static (non-factory) method into the Statics inner class.

Bug: 6329117
Change-Id: Ib56d5eaae59cd8d19fb0b71e4b8a41d1c0f5ba09
 2012-08-20 19:46:28 -07:00
Jeff Brown
26ed7073ac am 6fee1cba: am 4b72463d: Merge "Add factory test feature to shut off on long press power." into jb-mr1-dev 
* commit '6fee1cba4f6ed7ab28f8d0e8dad823a3d900cf9a':
  Add factory test feature to shut off on long press power.
 2012-08-20 19:45:46 -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
003caf9e43 am d87fd2e1: am c2cb8d22: Merge "Support scrolling layers with the mousewheel" into jb-mr1-dev 
* commit 'd87fd2e136b69c0d3f0a5c9d7c923e604d0c576c':
  Support scrolling layers with the mousewheel
 2012-08-20 17:37:20 -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
e572f5e2af am 8318cf99: am a5d5d608: Merge "add wireless charger support" into jb-mr1-dev 
* commit '8318cf99697c2911e31fb9b59ae8462637cb06bb':
  add wireless charger support
 2012-08-20 17:02:54 -07:00
Brian Muramatsu
a5d5d608cc Merge "add wireless charger support" into jb-mr1-dev 2012-08-20 16:57:14 -07:00
Jim Miller
e667a7add4 Update AppWidgetHost with better support for OnClickHandlers 
This updates AppWidgetHost and AppWidgetHostView to do a better
job at refreshing widgets and their host views.  It now allows
an OnClickHandler to be specified when creating the AppWidgetHost
which allows it to correctly update AppWidgetHostViews when needed.

Change-Id: I710c1d00a8d145bf3a9fd5f5691885bec9d1c7e4
 2012-08-20 15:44:05 -07:00
Jean-Baptiste Queru
352c7aa4f8 am 6ba73cc6: am 8bb154c2: Merge "resolved conflicts for merge of 4ea6a8eb to jb-mr1-dev" into jb-mr1-dev 
* commit '6ba73cc66273964c707fc638946befc5a1442700':
  Switch widget: Fix ON/OFF option update error
 2012-08-20 15:27:16 -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
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
427af58304 am e6bc1238: am 7b7feee8: Merge "Add UsbDebuggingManager and UsbDebuggingActivity" into jb-mr1-dev 
* commit 'e6bc1238b7e832c4a568f6bd8a1c769dd1d173ea':
  Add UsbDebuggingManager and UsbDebuggingActivity
 2012-08-20 14:52:55 -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
rich cannings
4d0b152482 am 8916311d: am a811e084: Merge "Pass URLs to package verifiers" into jb-mr1-dev 
* commit '8916311dba4b980c98583ce6ca3333105a286523':
  Pass URLs to package verifiers
 2012-08-20 14:28:40 -07:00
Jean-Baptiste Queru
f515c6f4fe Merge "Switch widget: Fix ON/OFF option update error" 2012-08-20 14:28:33 -07:00
Kenny Root
d8b048e81d am 7cb07962: am 672cfdc5: Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 
* commit '7cb079629ca2d5a4009ec9a50268b4e7b650677d':
  Add AndroidKeyStore provider for KeyStore API
 2012-08-20 14:27:01 -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
672cfdc5b6 Merge "Add AndroidKeyStore provider for KeyStore API" into jb-mr1-dev 2012-08-20 14:20:32 -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
eb9b2c095d am 00d2eba5: am 9af67e8f: Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 
* commit '00d2eba50172a6763f3414c092be05a3b283b851':
  Add getDefaultUserAgent to WebSettings.
 2012-08-20 13:43:14 -07:00
George Mount
9af67e8f6c Merge "Add getDefaultUserAgent to WebSettings." into jb-mr1-dev 2012-08-20 13:37:55 -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
Kenny Root
df6c26e562 am 3ca1e412: am 80618d66: am 7d5b22af: am f029c22f: Merge "Use Libcore.os.umask for setting umask" 
* commit '3ca1e412b720a8bd28fd7e430b38788835ea13e5':
  Use Libcore.os.umask for setting umask
 2012-08-20 13:01:45 -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