Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
14,831 Commits 3 Branches 0 Tags
5e04bbc7613da127ad830c51113d161cef4c3296
Commit Graph

14831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mathias Agopian
5e04bbc761 am 9aaf01b9: am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair 
Merge commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be'

* commit '9aaf01b9d03e931c9d37858562ea47dbaf44a3be':
  backout a workaround that is not needed anymore
 2009-11-19 17:45:20 -08:00
Mike Chan
cc829a652b am 26a9a13a: am b2a51667: am 23b3ef82: Merge change I99194df1 into eclair 
Merge commit '26a9a13ac32a9109300e323d26af5865bf5244cc'

* commit '26a9a13ac32a9109300e323d26af5865bf5244cc':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
 2009-11-19 17:44:59 -08:00
Mathias Agopian
0fd4a3007c am ce18c968: am fc64165e: am 74a331b5: Merge change I4c29c948 into eclair 
Merge commit 'ce18c9680e3c151dcd4df5cdaa9fa352ad134691'

* commit 'ce18c9680e3c151dcd4df5cdaa9fa352ad134691':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
 2009-11-19 17:44:33 -08:00
Andreas Huber
9bc2167ea2 am 7227e72b: (-s ours) am 57c70146: am f854e077: (-s ours) Merge change I8134d6ed into eclair 
Merge commit '7227e72bf4b9f6f4bcf5a3ec8006a3318efd3cca'

* commit '7227e72bf4b9f6f4bcf5a3ec8006a3318efd3cca':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
 2009-11-19 17:43:45 -08:00
Jason Sams
857d2b1565 am 93f409b5: am d581b1a8: am ddac83a5: Fix extended logging for object dumping. 
Merge commit '93f409b5f7992767594107b7f468143e4a89a8c1'

* commit '93f409b5f7992767594107b7f468143e4a89a8c1':
  Fix extended logging for object dumping.
 2009-11-19 17:43:24 -08:00
Daisuke Miyakawa
35e3d527d3 am 1b3a7b43: am eb114de5: Merge change I639b0f03 into eclair-mr2 
Merge commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5'

* commit '1b3a7b433cfca22f9e69d9103cae0ace216010b5':
  Make vCard exporter append neighborhood to locality field instead of extended address,
 2009-11-19 17:42:27 -08:00
Grace Kloba
42328e3a1f am 3003f30d: am 98fdda09: Merge change I86773fbb into eclair-mr2 
Merge commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601'

* commit '3003f30ddee0cb2f73d894a19bc1449fbe7cd601':
  If overview width is the same as the current width,
 2009-11-19 17:41:56 -08:00
Steve Block
cfdd6cd352 am 74dcb02f: am 57534f1b: Improves documentation for GeolocationPermissions class. 
Merge commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72'

* commit '74dcb02f5997d70fa9a514f01ace04bb80ef3c72':
  Improves documentation for GeolocationPermissions class.
 2009-11-19 17:41:13 -08:00
Fred Quintana
3ab6aeefcd am f1efe8e3: am f61ab007: am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place 
Merge commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715'

* commit 'f1efe8e32a20855fa53a306053ef18c8ad9e2715':
  -hide AccountManagerResponse, which never should have been exposed in the first place
 2009-11-19 17:40:45 -08:00
Dianne Hackborn
6a682f72f7 am 805df376: am 4ee93666: am e4260f4e: Fix build. 
Merge commit '805df37632f9736ed7e66f0a51e16abae71414ce'

* commit '805df37632f9736ed7e66f0a51e16abae71414ce':
  Fix build.
 2009-11-19 17:40:21 -08:00
lknguyen
c9a306c409 am 904a4b7a: am 8250530c: Merge change I194f0808 into eclair-mr2 
Merge commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7'

* commit '904a4b7aaf270d4e58cb3bbb877a63559c760ee7':
  Add Gservices flag so that Market can turn on performance logging for specific groups.
 2009-11-19 17:38:11 -08:00
Mathias Agopian
9aaf01b9d0 am 793810f6: am 23aa34a7: Merge change I137dac6f into eclair 
Merge commit '793810f68fcf1ace817f6ebcb42a6adb13c28582' into eclair-mr2-plus-aosp

* commit '793810f68fcf1ace817f6ebcb42a6adb13c28582':
  backout a workaround that is not needed anymore
 2009-11-19 16:34:17 -08:00
Mathias Agopian
793810f68f am 23aa34a7: Merge change I137dac6f into eclair 
Merge commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a' into eclair-mr2

* commit '23aa34a743ae18e0d45b459f0c7010eb47a2147a':
  backout a workaround that is not needed anymore
 2009-11-19 16:29:30 -08:00
Mike Chan
26a9a13ac3 am b2a51667: am 23b3ef82: Merge change I99194df1 into eclair 
Merge commit 'b2a5166704ae76cc468b49710d4c967b58112359' into eclair-mr2-plus-aosp

* commit 'b2a5166704ae76cc468b49710d4c967b58112359':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
 2009-11-19 16:29:04 -08:00
Mike Chan
b2a5166704 am 23b3ef82: Merge change I99194df1 into eclair 
Merge commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7' into eclair-mr2

* commit '23b3ef82c0c4175e8c953740306ee6b080dae8e7':
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
 2009-11-19 16:23:56 -08:00
Android (Google) Code Review
23aa34a743 Merge change I137dac6f into eclair 
* changes:
  backout a workaround that is not needed anymore
 2009-11-19 16:23:29 -08:00
Android (Google) Code Review
23b3ef82c0 Merge change I99194df1 into eclair 
* changes:
  frameworks: base: dumpstate: Dump kernel cpufreq speeds.
 2009-11-19 16:18:51 -08:00
Mike Chan
c6b406f0eb frameworks: base: dumpstate: Dump kernel cpufreq speeds. 
Change-Id: I99194df1d6c46254affef86ea8eb39e784c3dfb3
Signed-off-by: Mike Chan <mike@android.com>
 2009-11-19 16:01:05 -08:00
Mathias Agopian
137dac6f10 backout a workaround that is not needed anymore 
we had to add a call to glFinish() before glReadPixels() because of a bug in the GL ES
driver of a certain device. This is not needed anymore.
 2009-11-19 15:52:28 -08:00
Mathias Agopian
ce18c9680e am fc64165e: am 74a331b5: Merge change I4c29c948 into eclair 
Merge commit 'fc64165ef7116a385ae6d9983ab077adc47a6326' into eclair-mr2-plus-aosp

* commit 'fc64165ef7116a385ae6d9983ab077adc47a6326':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
 2009-11-19 15:51:22 -08:00
Mathias Agopian
fc64165ef7 am 74a331b5: Merge change I4c29c948 into eclair 
Merge commit '74a331b5dd1d39da44b608743c36ab3523f598d2' into eclair-mr2

* commit '74a331b5dd1d39da44b608743c36ab3523f598d2':
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
 2009-11-19 15:47:37 -08:00
Android (Google) Code Review
74a331b5dd Merge change I4c29c948 into eclair 
* changes:
  fix [2269022] The raw picture displayed post shutter seems to have low-resolution
 2009-11-19 15:44:13 -08:00
Dianne Hackborn
415e045add Hopefully fix integration. 2009-11-19 15:29:53 -08:00
Andreas Huber
7227e72bf4 am 57c70146: am f854e077: (-s ours) Merge change I8134d6ed into eclair 
Merge commit '57c701463f57ea50f6116690641f376e84c4c290' into eclair-mr2-plus-aosp

* commit '57c701463f57ea50f6116690641f376e84c4c290':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
 2009-11-19 15:05:02 -08:00
Jason Sams
93f409b5f7 am d581b1a8: am ddac83a5: Fix extended logging for object dumping. 
Merge commit 'd581b1a8c6103b55d2e13318e9c35103b8689810' into eclair-mr2-plus-aosp

* commit 'd581b1a8c6103b55d2e13318e9c35103b8689810':
  Fix extended logging for object dumping.
 2009-11-19 15:04:19 -08:00
Andreas Huber
57c701463f am f854e077: (-s ours) Merge change I8134d6ed into eclair 
Merge commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4' into eclair-mr2

* commit 'f854e0770207e93ef9d1bf6d50ed18537a107ca4':
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
 2009-11-19 15:01:14 -08:00
Jason Sams
d581b1a8c6 am ddac83a5: Fix extended logging for object dumping. 
Merge commit 'ddac83a516e939b55f20b226365596760159c9df' into eclair-mr2

* commit 'ddac83a516e939b55f20b226365596760159c9df':
  Fix extended logging for object dumping.
 2009-11-19 14:56:39 -08:00
Android (Google) Code Review
f854e07702 Merge change I8134d6ed into eclair 
* changes:
  DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering.
 2009-11-19 14:52:57 -08:00
Mathias Agopian
4c29c9487e fix [2269022] The raw picture displayed post shutter seems to have low-resolution 
Make sure to always enable linear filtering in LayerBuffer. This change doesn't affect
devices using overlays.
 2009-11-19 14:46:26 -08:00
Dianne Hackborn
1c391ed88c resolved conflicts for merge of a82e7e24 to master 2009-11-19 14:26:47 -08:00
Daisuke Miyakawa
1b3a7b433c am eb114de5: Merge change I639b0f03 into eclair-mr2 
Merge commit 'eb114de5037bba89333bd7d57d305ae989727096' into eclair-mr2-plus-aosp

* commit 'eb114de5037bba89333bd7d57d305ae989727096':
  Make vCard exporter append neighborhood to locality field instead of extended address,
 2009-11-19 14:18:11 -08:00
Android (Google) Code Review
eb114de503 Merge change I639b0f03 into eclair-mr2 
* changes:
  Make vCard exporter append neighborhood to locality field instead of extended address, per China convention.
 2009-11-19 14:13:31 -08:00
Daisuke Miyakawa
639b0f032b Make vCard exporter append neighborhood to locality field instead of extended address, 
per China convention.

Internal issue number: 2195990
 2009-11-20 07:06:40 +09:00
Grace Kloba
3003f30dde am 98fdda09: Merge change I86773fbb into eclair-mr2 
Merge commit '98fdda09256072ae4f45a08ee40178b3ef643c9f' into eclair-mr2-plus-aosp

* commit '98fdda09256072ae4f45a08ee40178b3ef643c9f':
  If overview width is the same as the current width,
 2009-11-19 13:51:20 -08:00
Android (Google) Code Review
98fdda0925 Merge change I86773fbb into eclair-mr2 
* changes:
  If overview width is the same as the current width, don't change the mode when double tap or zoom out.
 2009-11-19 13:47:24 -08:00
Jason Sams
ddac83a516 Fix extended logging for object dumping. 2009-11-19 13:08:17 -08:00
Steve Block
74dcb02f59 am 57534f1b: Improves documentation for GeolocationPermissions class. 
Merge commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66' into eclair-mr2-plus-aosp

* commit '57534f1b9f52cea094e8197d1ca40f0d2f68cc66':
  Improves documentation for GeolocationPermissions class.
 2009-11-19 12:08:01 -08:00
Fred Quintana
f1efe8e32a am f61ab007: am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place 
Merge commit 'f61ab00770c6010d83280644263d6f530c75028e' into eclair-mr2-plus-aosp

* commit 'f61ab00770c6010d83280644263d6f530c75028e':
  -hide AccountManagerResponse, which never should have been exposed in the first place
 2009-11-19 12:07:37 -08:00
Dianne Hackborn
805df37632 am 4ee93666: am e4260f4e: Fix build. 
Merge commit '4ee936667181975cd755acd81c653ba686d6106d' into eclair-mr2-plus-aosp

* commit '4ee936667181975cd755acd81c653ba686d6106d':
  Fix build.
 2009-11-19 12:07:13 -08:00
Charles Chen
b4fbe768f8 Adding the ability to specify the speech synthesis 
engine to use for text-to-speech.
 2009-11-19 12:02:55 -08:00
Steve Block
57534f1b9f Improves documentation for GeolocationPermissions class. 
Also sets an explicit type for GeolocationPermissions.getOrigins.

This is a partial fix for bug http://b/issue?id=2271636

Change-Id: Ife478917a979b68e242c467798358a018455957f
 2009-11-19 19:59:14 +00:00
Fred Quintana
f61ab00770 am 5994cd28: -hide AccountManagerResponse, which never should have been exposed in the first place 
Merge commit '5994cd2898ad3c76d1f5068137a884024f521163' into eclair-mr2

* commit '5994cd2898ad3c76d1f5068137a884024f521163':
  -hide AccountManagerResponse, which never should have been exposed in the first place
 2009-11-19 11:41:48 -08:00
lknguyen
904a4b7aaf am 8250530c: Merge change I194f0808 into eclair-mr2 
Merge commit '8250530c507653d57c768677d8a542cd769aaf99' into eclair-mr2-plus-aosp

* commit '8250530c507653d57c768677d8a542cd769aaf99':
  Add Gservices flag so that Market can turn on performance logging for specific groups.
 2009-11-19 11:41:35 -08:00
Dianne Hackborn
4ee9366671 am e4260f4e: Fix build. 
Merge commit 'e4260f4e7da4da32bfab2737018cf9cf75215894' into eclair-mr2

* commit 'e4260f4e7da4da32bfab2737018cf9cf75215894':
  Fix build.
 2009-11-19 11:40:48 -08:00
Android (Google) Code Review
8250530c50 Merge change I194f0808 into eclair-mr2 
* changes:
  Add Gservices flag so that Market can turn on performance logging for specific groups.
 2009-11-19 11:36:42 -08:00
Grace Kloba
86773fbb4e If overview width is the same as the current width, 
don't change the mode when double tap or zoom out.

Fix http://b/issue?id=2240785
 2009-11-19 11:25:20 -08:00
Andreas Huber
d66a901e6a DO NOT MERGE: Instead of inserting semi-random delays after submission to surface flinger, delay releasing buffers to the next display time to avoid flickering. 2009-11-19 11:24:18 -08:00
Dianne Hackborn
a82e7e24ea am 2b38a09f: am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs 
Merge commit '2b38a09f044ad0bb14db7360b352fcca612f49ac' into eclair-mr2-plus-aosp

* commit '2b38a09f044ad0bb14db7360b352fcca612f49ac':
  Fix most of issue #2271640: Fix wallpaper etc docs
 2009-11-19 11:14:34 -08:00
Dianne Hackborn
2b38a09f04 am 23ef7b48: Fix most of issue #2271640: Fix wallpaper etc docs 
Merge commit '23ef7b4836d66d31430fedee2aac36275bb30d4b' into eclair-mr2

* commit '23ef7b4836d66d31430fedee2aac36275bb30d4b':
  Fix most of issue #2271640: Fix wallpaper etc docs
 2009-11-19 11:09:11 -08:00
Fred Quintana
5994cd2898 -hide AccountManagerResponse, which never should have been exposed in the first place 2009-11-19 10:19:23 -08:00