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

8328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hung-ying Tyan
64a3302bd6 am e39725c9: am 57fc4114: Merge change 24132 into eclair 
Merge commit 'e39725c9c07bd7cfa0302da1843a2d92ec124e26'

* commit 'e39725c9c07bd7cfa0302da1843a2d92ec124e26':
  Add two CertTool helper classes.
 2009-09-10 09:23:13 -07:00
Tammo Spalink
7fce418709 am 9183d361: am a8cdbc85: Merge change 24501 into eclair 
Merge commit '9183d361e0571b10e5ebbfac06eee5171f701da4'

* commit '9183d361e0571b10e5ebbfac06eee5171f701da4':
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
 2009-09-10 09:22:54 -07:00
Jeff Sharkey
d475d6e011 am 2a6bd015: am 6ba23c59: Handle cases where TYPE can be undefined, such as EAS. 
Merge commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda'

* commit '2a6bd01548cb24f1d173d8b22efbafe8b097ecda':
  Handle cases where TYPE can be undefined, such as EAS.
 2009-09-10 09:22:45 -07:00
Hung-ying Tyan
e39725c9c0 am 57fc4114: Merge change 24132 into eclair 
Merge commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d' into eclair-plus-aosp

* commit '57fc41143d9c855b9a04f4d5f0a21bb99298d67d':
  Add two CertTool helper classes.
 2009-09-10 01:21:34 -07:00
Android (Google) Code Review
57fc41143d Merge change 24132 into eclair 
* changes:
  Add two CertTool helper classes.
 2009-09-10 04:16:56 -04:00
Tammo Spalink
9183d361e0 am a8cdbc85: Merge change 24501 into eclair 
Merge commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96' into eclair-plus-aosp

* commit 'a8cdbc85c003eae8c1b7178fcd70f8bc711aed96':
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
 2009-09-10 00:45:07 -07:00
Android (Google) Code Review
a8cdbc85c0 Merge change 24501 into eclair 
* changes:
  Make Phone.updateServiceLocation acquire a one-shot wake lock.
 2009-09-10 03:40:54 -04:00
Tammo Spalink
7a043b351b Make Phone.updateServiceLocation acquire a one-shot wake lock. 
Phone.updateServiceLocation() is the internal routine triggered by
external calls to CellLocation.requestLocationUpdate().

addresses bug http://b/issue?id=1724246

Change-Id: Id3d5cab1a77df12d3e94373a58ae94688a8630c6
 2009-09-10 15:38:01 +08:00
Jeff Sharkey
2a6bd01548 am 6ba23c59: Handle cases where TYPE can be undefined, such as EAS. 
Merge commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017' into eclair-plus-aosp

* commit '6ba23c59f24b443cd21c6289fa0aac3df8f17017':
  Handle cases where TYPE can be undefined, such as EAS.
 2009-09-09 23:14:39 -07:00
Jeff Sharkey
6ba23c59f2 Handle cases where TYPE can be undefined, such as EAS. 
When TYPE not provided, assume a default value and check
that label isn't empty when CUSTOM is used.
 2009-09-09 23:05:34 -07:00
Hung-ying Tyan
9249cc69b8 Add two CertTool helper classes. 
Also add the unlock action string to Keystore.
 2009-09-10 12:51:07 +08:00
Mathias Agopian
1b03cb204e am 7ca8cacd: am 24d237db: add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 
Merge commit '7ca8cacd8035989c4b0a71787f76ffac9dd9e9f1'

* commit '7ca8cacd8035989c4b0a71787f76ffac9dd9e9f1':
  add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
 2009-09-09 19:34:18 -07:00
Mathias Agopian
92d8b80800 am a76a792f: am bbe14a17: Merge change 24473 into eclair 
Merge commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4'

* commit 'a76a792f52b8dd7f955bcf781a58c540a57de5d4':
  fix [2074427] SurfaceView doesn't disappear on GONE
 2009-09-09 19:34:13 -07:00
Mathias Agopian
7ca8cacd80 am 24d237db: add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 
Merge commit '24d237db943051942b5966f5e788d67050ec0ba5' into eclair-plus-aosp

* commit '24d237db943051942b5966f5e788d67050ec0ba5':
  add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition
 2009-09-09 19:25:53 -07:00
Mathias Agopian
a76a792f52 am bbe14a17: Merge change 24473 into eclair 
Merge commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf' into eclair-plus-aosp

* commit 'bbe14a1758a5b99689b7aa13a6d4f58e61705ebf':
  fix [2074427] SurfaceView doesn't disappear on GONE
 2009-09-09 19:25:49 -07:00
Mathias Agopian
24d237db94 add a debug property to disable h/w composition. debug.sf.hw, when set to 0 will disable h/w composition 2009-09-09 19:20:10 -07:00
Android (Google) Code Review
bbe14a1758 Merge change 24473 into eclair 
* changes:
  fix [2074427] SurfaceView doesn't disappear on GONE
 2009-09-09 22:17:45 -04:00
Dmitri Plotnikov
ea7a1ad6ce am 081dc178: am 0d134509: Merge change 24468 into eclair 
Merge commit '081dc1785f19a66e18d2840130125182f2f93fb6'

* commit '081dc1785f19a66e18d2840130125182f2f93fb6':
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
 2009-09-09 19:16:45 -07:00
Tammo Spalink
458c053bf8 am 67b1ee25: am d0f02a4d: Merge change 24138 into eclair 
Merge commit '67b1ee2525c73efc27bab5a7bb419e875db1ca71'

* commit '67b1ee2525c73efc27bab5a7bb419e875db1ca71':
  Do not die when printing empty prefs.
 2009-09-09 19:16:40 -07:00
Amith Yamasani
529bda79cc am b02c4c41: am 67af9f5b: Merge change 24471 into eclair 
Merge commit 'b02c4c41f575c23ee5158931de8278fc1f0e0c75'

* commit 'b02c4c41f575c23ee5158931de8278fc1f0e0c75':
  Fixed the fastscroll thumb asset in hdpi.
 2009-09-09 19:16:35 -07:00
Dmitri Plotnikov
081dc1785f am 0d134509: Merge change 24468 into eclair 
Merge commit '0d134509f4f7b05776542996f54c4d306e66dbec' into eclair-plus-aosp

* commit '0d134509f4f7b05776542996f54c4d306e66dbec':
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
 2009-09-09 19:11:50 -07:00
Tammo Spalink
67b1ee2525 am d0f02a4d: Merge change 24138 into eclair 
Merge commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342' into eclair-plus-aosp

* commit 'd0f02a4da1413743c90a51426bc3221bfa6ff342':
  Do not die when printing empty prefs.
 2009-09-09 19:11:45 -07:00
Amith Yamasani
b02c4c41f5 am 67af9f5b: Merge change 24471 into eclair 
Merge commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f' into eclair-plus-aosp

* commit '67af9f5bf1abdaeedbdf21c1de9502d33de8f16f':
  Fixed the fastscroll thumb asset in hdpi.
 2009-09-09 19:11:40 -07:00
Android (Google) Code Review
0d134509f4 Merge change 24468 into eclair 
* changes:
  Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size.
 2009-09-09 22:06:48 -04:00
Android (Google) Code Review
d0f02a4da1 Merge change 24138 into eclair 
* changes:
  Do not die when printing empty prefs.
 2009-09-09 21:36:48 -04:00
Grace Kloba
6e08757d65 am 416bfd60: am 9ca7d0c2: Merge change 24460 into eclair 
Merge commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e'

* commit '416bfd60ee45716eda1e24b0c95fe7b162accb2e':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
 2009-09-09 18:35:09 -07:00
Mathias Agopian
6b7f1a62b5 fix [2074427] SurfaceView doesn't disappear on GONE 2009-09-09 18:32:34 -07:00
Android (Google) Code Review
67af9f5bf1 Merge change 24471 into eclair 
* changes:
  Fixed the fastscroll thumb asset in hdpi.
 2009-09-09 21:31:07 -04:00
Grace Kloba
416bfd60ee am 9ca7d0c2: Merge change 24460 into eclair 
Merge commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171' into eclair-plus-aosp

* commit '9ca7d0c2efe76798e0963fd0b27a7224e9819171':
  The empty path and no path mean default path. So "a=d" should replace "a=c".
 2009-09-09 18:30:15 -07:00
Amith Yamasani
da256fabed Fixed the fastscroll thumb asset in hdpi. 
Asset was 1 pixel taller than necessary and was causing scaling artifacts.
 2009-09-09 18:28:44 -07:00
Android (Google) Code Review
9ca7d0c2ef Merge change 24460 into eclair 
* changes:
  The empty path and no path mean default path. So "a=d" should replace "a=c".
 2009-09-09 21:23:46 -04:00
Grace Kloba
d0990d4a78 The empty path and no path mean default path. So "a=d" should replace "a=c". 2009-09-09 18:22:44 -07:00
Dmitri Plotnikov
b43b58d349 Increasing uninterrupted sleep quantum in SQLiteDatabase to increase transaction size. 2009-09-09 18:10:42 -07:00
Mathias Agopian
36e40a1f22 am 0df661eb: am b33f92dd: Merge change 24465 into eclair 
Merge commit '0df661eb70488c846d7d925695667ed22e15385c'

* commit '0df661eb70488c846d7d925695667ed22e15385c':
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
 2009-09-09 18:01:24 -07:00
Scott Main
90adb47d95 am e3a3a872: am 0c910494: am aa4511cf: docs only. revise ADC2 announcement 
Merge commit 'e3a3a872a9ad7ee579c05d35125552a93f8ff031'

* commit 'e3a3a872a9ad7ee579c05d35125552a93f8ff031':
  docs only.
 2009-09-09 18:01:19 -07:00
Jeff Sharkey
8a199ad070 am 55f8ac79: am f46a9cf3: API to combine LOOKUP_KEY and Contacts._ID together. 
Merge commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a'

* commit '55f8ac79bffc543ee2e2b486e0620bd73c36732a':
  API to combine LOOKUP_KEY and Contacts._ID together.
 2009-09-09 18:01:14 -07:00
Mathias Agopian
0df661eb70 am b33f92dd: Merge change 24465 into eclair 
Merge commit 'b33f92dd5666134782a06b191a9025544711f85b' into eclair-plus-aosp

* commit 'b33f92dd5666134782a06b191a9025544711f85b':
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
 2009-09-09 17:56:40 -07:00
Scott Main
e3a3a872a9 am 0c910494: am aa4511cf: docs only. revise ADC2 announcement 
Merge commit '0c91049482cd9467a29c2387766cfcef371d859c' into eclair-plus-aosp

* commit '0c91049482cd9467a29c2387766cfcef371d859c':
  docs only.
 2009-09-09 17:52:13 -07:00
Jeff Sharkey
55f8ac79bf am f46a9cf3: API to combine LOOKUP_KEY and Contacts._ID together. 
Merge commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3' into eclair-plus-aosp

* commit 'f46a9cf38207d03730c04d02cf40aa3859cd9ad3':
  API to combine LOOKUP_KEY and Contacts._ID together.
 2009-09-09 17:52:08 -07:00
Android (Google) Code Review
b33f92dd56 Merge change 24465 into eclair 
* changes:
  fix [2102410] Home Screen is not displayed in the background in Landscape Mode
 2009-09-09 20:52:03 -04:00
Mathias Agopian
e7c11d770a fix [2102410] Home Screen is not displayed in the background in Landscape Mode 
the blurring code now handles NPOT textures.
 2009-09-09 17:47:15 -07:00
Scott Main
0c91049482 am aa4511cf: docs only. revise ADC2 announcement 
Merge commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369' into eclair

* commit 'aa4511cfcde8edfb3e63fd6127ad6f3102c69369':
  docs only.
 2009-09-09 17:46:50 -07:00
Jeff Sharkey
f46a9cf382 API to combine LOOKUP_KEY and Contacts._ID together. 2009-09-09 17:41:18 -07:00
Scott Main
aa4511cfcd docs only. 
revise ADC2 announcement

Change-Id: Ia2130b8c334053e8e27a4ab680f3bcf57de9504b
 2009-09-09 17:36:09 -07:00
James Stokebrand
36f5e74f83 am 7ff0d9a6: am 16b72bbb: Merge change 24391 into eclair 
Merge commit '7ff0d9a60ab6af7025eb283d01158f0fd4736173'

* commit '7ff0d9a60ab6af7025eb283d01158f0fd4736173':
  RIO-7461: Update media scanner to scan AAC files.
 2009-09-09 16:30:52 -07:00
Tom Taylor
3c0b799802 am be52ad33: am 1048ad55: Merge change 24395 into eclair 
Merge commit 'be52ad33c73411d88a2e5c41aa9c3e55baf154e6'

* commit 'be52ad33c73411d88a2e5c41aa9c3e55baf154e6':
  Make NumberPicker subclassable
 2009-09-09 16:30:31 -07:00
Chia-chi Yeh
27e89b397b am 1b2ba40e: am 7dcf5c7b: Merge change 24426 into eclair 
Merge commit '1b2ba40ee990d53ee0157bc745e4762102b0c9af'

* commit '1b2ba40ee990d53ee0157bc745e4762102b0c9af':
  keystore: remove "#include <openssl/engine.h>".
 2009-09-09 16:30:26 -07:00
Grace Kloba
99f9890d29 am a8f0f77b: am d82bc515: Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case. 
Merge commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265'

* commit 'a8f0f77b2e3eed77e97dd7ddd553e0dccefaf265':
  Avoid the rounding error, as Math.round(Math.round(viewWidth * mInvActualScale) * mActualScale) not necessary to be viewWidth, we special case when the content exactly fit in the view case.
 2009-09-09 16:29:55 -07:00
Leon Scroggins
529e6fae15 am 6f1c854a: am f416264a: Merge change 24398 into eclair 
Merge commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185'

* commit '6f1c854a9e70512ed9cf363eb8dd2ab2f46ea185':
  Adjust the WebTextView's text size according to density.
 2009-09-09 16:29:50 -07:00
Romain Guy
5a51a91c2e am de311222: am d380586a: Merge change 24413 into eclair 
Merge commit 'de3112227a6e7696fc41116b8461aca105e9f662'

* commit 'de3112227a6e7696fc41116b8461aca105e9f662':
  Remove the FallRS demo, now promoted as a wallpaper.
 2009-09-09 16:29:28 -07:00