drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,047 Commits 1 Branch 0 Tags
Commit Graph

10871 Commits

Author SHA1 Message Date
Scott Main
b3976bb395 am 0583ac4c: am 9719fe11: am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 2010-05-17 18:07:55 -07:00
Scott Main
9719fe11a1 am fbb285e6: am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9' into kraken

* commit 'fbb285e67f6b150440647d0c484d88edb7bf9be9':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:04:07 -07:00
Scott Main
fbb285e67f am e64256d6: Merge "docs: revise webview description and add info for targeting screen densities" into froyo 
Merge commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49' into froyo-plus-aosp

* commit 'e64256d610ec5ea3df5db8a24333a6ce98b83d49':
  docs: revise webview description and add info for targeting screen densities
 2010-05-17 18:01:28 -07:00
Scott Main
8b3cea01bf docs: revise webview description and add info for targeting screen densities 
Change-Id: Ib0293b497adef23330ee3f5f71904ad78a55a3a3
 2010-05-17 17:48:30 -07:00
Xia Wang
507ad028fa am 8ee6aefe: am 58e49a50: Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken 2010-05-17 16:45:20 -07:00
Xia Wang
58e49a5040 Merge " ConnectivityManagerTestActivity can be launched from launcher. Help to track bug 2680352. Add a resource file for string. Corrent some typos." into kraken 2010-05-17 16:26:32 -07:00
Mike Lockwood
a42f4c249f am 0b6e30d2: am c5859388: am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 2010-05-17 15:08:48 -07:00
Mike Lockwood
c5859388bd am 3e9e9696: am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit '3e9e9696f147c8df1236c1d7aa9496124864a81c' into kraken

* commit '3e9e9696f147c8df1236c1d7aa9496124864a81c':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:59:39 -07:00
Kenny Root
4c748c6649 am 9c75fa72: am 0b275423: am 8ea405d1: am cfa2de30: Import revised translations 2010-05-17 14:59:03 -07:00
Jean-Baptiste Queru
7f6cf96cbf am 5942ccf0: am 9eb7a722: resolved conflicts for merge of f7fb5331 to kraken 2010-05-17 14:58:44 -07:00
Mike Lockwood
3e9e9696f1 am eb9cbb8f: Resurrect flashlight support in obsolete IHardwareService Binder API. 
Merge commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f' into froyo-plus-aosp

* commit 'eb9cbb8fdddf4c887004b20b504083035d57a15f':
  Resurrect flashlight support in obsolete IHardwareService Binder API.
 2010-05-17 14:56:53 -07:00
Mike Lockwood
eb9cbb8fdd Resurrect flashlight support in obsolete IHardwareService Binder API. 
This is to avoid flashlight apps that had been using reflection to access
this API after this class was removed after eclair.

Change-Id: I26ed929abad93345468eb33d4a15977a31ebea7e
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-05-17 17:47:20 -04:00
Kenny Root
0b27542312 am 8ea405d1: am cfa2de30: Import revised translations 
Merge commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a' into kraken

* commit '8ea405d196c8b536047d961801bb2b6c18a3ea2a':
  Import revised translations
 2010-05-17 13:53:44 -07:00
Jean-Baptiste Queru
9eb7a72253 resolved conflicts for merge of f7fb5331 to kraken 
Change-Id: I61258dd7c7e52a6251c1d9499e113401ff375b20
 2010-05-17 13:50:32 -07:00
Grace Kloba
20ca117770 Update the mLatestProgress of CallbackProxy even 
mWebChromeClient is null as WebView needs it.

Fix http://b/issue?id=2685989
 2010-05-17 13:08:05 -07:00
Xia Wang
0b90d76ef8 ConnectivityManagerTestActivity can be launched from launcher. 
Help to track bug 2680352.
 Add a resource file for string.
 Corrent some typos.

Change-Id: I42fefe49c360168ec807ed82dc220ab68681d14e
 2010-05-17 12:08:05 -07:00
Kenny Root
8ea405d196 am cfa2de30: Import revised translations 
Merge commit 'cfa2de303e58b971e334363356d29601e61d11c8' into froyo-plus-aosp

* commit 'cfa2de303e58b971e334363356d29601e61d11c8':
  Import revised translations
 2010-05-17 11:37:35 -07:00
Kenny Root
cfa2de303e Import revised translations 
Change-Id: Id6bd3011874ff8544a030473cc994f9a0201c97d
 2010-05-17 11:18:04 -07:00
Derek Sollenberger
90b6e48793 Refactor the on-screen zoom controls into a separate class. 
This CL is the first in a series of CL's that will extract the
zoom code from WebView and put it into ZoomManager.  This initial
CL only extracts the on-screen zoom controls and required variables
into the ZoomManager.  Since the on-screen controls are well defined
I put them into their own class called ZoomControls.

All of WebView's zoom interactions are handled by the ZoomManager.
The ZoomManager can then handle the request internally or as in the
case of on-screen controls pass the request to another class.

Change-Id: Icfc91ed0456c88d633249c26b9afc7dd216f75a1
http://b/2671604
 2010-05-17 13:49:40 -04:00
Wu-cheng Li
c3848824f8 am a3b5ff07: am e339c5ed: Add camera focus distances API. 2010-05-17 09:21:03 -07:00
The Android Open Source Project
f7fb5331e5 merge from open-source master 
Change-Id: Ia0201ec7be4c112569b8775429d1c9674eb3b661
 2010-05-17 08:56:54 -07:00
Romain Guy
c4fee63301 Merge "Fixing indeterminate progress bar animation state." 2010-05-15 12:34:05 -07:00
David Sobreira Marques
52a35433cf Fixing indeterminate progress bar animation state. 
When showing a progress bar instance more than once
it will not animate after the first time.

Change-Id: I5104c551d561755005e533f2ab5257454567bf71
Signed-off-by: David Sobreira Marques <dpsmarques@gmail.com>
 2010-05-15 16:10:18 -03:00
Svetoslav Ganov
da35551845 Adding accessibility content provider responsible for user script injection. Adding support for injecting accessibility in WebViews with disabled JavaScript. 
Change-Id: I1576238a0f855bb54e25d19404b8404d7d0f6037
 2010-05-15 12:10:13 -07:00
Wu-cheng Li
e339c5edbe Add camera focus distances API. 
Applications can use this API to estimate the distance
between the subject and the camera.

bug:1955650
Change-Id: Ie6c8ea4971759cab6c9bcdda2c5ceb5925791c27
 2010-05-15 12:40:54 +08:00
Konstantin Lopyrev
a6418d8bc9 Merge "Fix 2571606: Correct message after too many failed attempts for password and pin." 2010-05-14 15:52:55 -07:00
Konstantin Lopyrev
c15dcf7ea1 Fix 2571606: Correct message after too many failed attempts for password and pin. 
Change-Id: Ib712c692804b067b95b261852afdd9fac40194c4
 2010-05-14 15:43:03 -07:00
Scott Main
060341fa2d am 33c06f91: am 6c034325: am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 2010-05-14 11:59:04 -07:00
Scott Main
6c034325a8 am 6d8e4fd8: am b83a283a: docs: add dev guide for backup 
Merge commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf' into kraken

* commit '6d8e4fd83bb7f4eabc942dd17fa229cf9baf5fcf':
  docs: add dev guide for backup
 2010-05-14 11:56:14 -07:00
Scott Main
6d8e4fd83b am b83a283a: docs: add dev guide for backup 
Merge commit 'b83a283ac178ab0a72f1d811189d79b26097835e' into froyo-plus-aosp

* commit 'b83a283ac178ab0a72f1d811189d79b26097835e':
  docs: add dev guide for backup
 2010-05-14 11:53:44 -07:00
Scott Main
b83a283ac1 docs: add dev guide for backup 
Change-Id: I168f6b15d3441c9cbea2cd9699612476c7244530
 2010-05-14 11:47:42 -07:00
Dianne Hackborn
0efa0c45a1 Merge "More fragment stuff:" 2010-05-14 11:26:40 -07:00
Dianne Hackborn
6e8304e57e More fragment stuff: 
- New startActivityForResult() API.
- Fragments now should have the correct lifecycle while hanging around
  in the back stack (not being destroyed and re-created).
- Rework of state save/restore to make it simpler and better.  In theory
  now any fragment (including layout and others in the hierarchy) can
  now be retained across config changes, though this hasn't been tested.

Change-Id: I2a7fe560e14e567f5675a2f172a23fca67b3e97f
 2010-05-14 11:22:48 -07:00
Adam Powell
a1700783b5 ActionBar - custom navigation views 
Change-Id: Ibc98565816c713474eefd4e96fb51175abfb0187
 2010-05-14 10:35:21 -07:00
The Android Open Source Project
1443eddab6 am f7c12cf5: am db20eeb2: am 9167ba50: merge from open-source master 2010-05-14 09:19:03 -07:00
The Android Open Source Project
db20eeb246 am 9167ba50: merge from open-source master 
Merge commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1' into kraken

* commit '9167ba50e4d7e08e02119d9c4a0f0392296cc3f1':
  Corrected debug message in WindowManager
  Put the wifi status icon in the right place.
 2010-05-14 09:15:41 -07:00
The Android Open Source Project
9167ba50e4 merge from open-source master 
Change-Id: I57f108d2b3415eddb0b20a4a9dec4c44285de226
 2010-05-14 09:11:31 -07:00
Ben Murdoch
f4442311b8 Merge Webkit at r58956: Update User agent with new WebKit version. 
Change-Id: I8da1b80114e71d6d7b208f794ee978f88f1b4bf5
 2010-05-14 10:24:56 +01:00
Jeff Hamilton
7cd51efcbd Remove the deprecated cursor methods. 
Change-Id: Ie3571fea9f36996c31c327240b11086f8cc487f0
 2010-05-13 23:44:09 -05:00
Andrew Sapperstein
8d9db8e4c7 Added getNumColumns function to GridView.java. 
Change-Id: I1cec19c77d0ee47278d93c6b0a112edae777e4e9
 2010-05-13 17:45:50 -07:00
Joe Onorato
1b44ebda70 Merge "Put the wifi status icon in the right place." 2010-05-13 16:33:22 -07:00
Suchi Amalapurapu
4952aef1c5 am 8e8bb02f: am 3f5ed04f: am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:09:30 -07:00
Suchi Amalapurapu
3f5ed04f7f am b63ea5f7: am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810' into kraken

* commit 'b63ea5f784b7862a7ab28e0134f6da47f6275810':
  Fix 2672155
 2010-05-13 16:05:54 -07:00
Suchi Amalapurapu
b63ea5f784 am c928a11e: Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 
Merge commit 'c928a11e34678296511d5ea34582292be7368618' into froyo-plus-aosp

* commit 'c928a11e34678296511d5ea34582292be7368618':
  Fix 2672155
 2010-05-13 16:04:24 -07:00
Suchi Amalapurapu
c928a11e34 Merge "Fix 2672155 Check the code path when enabling disabling packages." into froyo 2010-05-13 16:02:20 -07:00
Suchi Amalapurapu
1ace5bc070 Fix 2672155 
Check the code path when enabling disabling packages.

Add unit test

Change-Id: I0f0f482a3735234eab3f63ba1f6462574b70144e
 2010-05-13 15:48:39 -07:00
Nick Kralevich
f5523645a9 am c5fdcaa2: am cf67d18a: Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:39:02 -07:00
Nick Kralevich
cf67d18a1d Merge "Get rid of warnings when compiled with -Wformat-security" into kraken 2010-05-13 15:35:48 -07:00
Nick Kralevich
79290ae976 Get rid of warnings when compiled with -Wformat-security 
Change-Id: I5a7ad5be2aaf0fa0d164204d3c1bebf02ec55745
 2010-05-13 15:31:00 -07:00
The Android Open Source Project
a4bb641040 am 1331ded8: am e28776bb: am b1110149: merge from open-source master 2010-05-13 14:59:22 -07:00