Commit Graph

10597 Commits

Author SHA1 Message Date
Mike Cleron
6af6edf5b5 am 1ca9b13b: am 3ecd58c6: Fix build
Merge commit '1ca9b13bf4b0b95c1beeb11732e3f2af376551e9'

* commit '1ca9b13bf4b0b95c1beeb11732e3f2af376551e9':
  Fix build
2009-09-28 11:54:09 -07:00
Evan Millar
551ac8aaf7 am 93d0b335: am 14f65ff9: Merge change 27243 into eclair
Merge commit '93d0b335a65149b1dc3c31cda89c076e6360c6f8'

* commit '93d0b335a65149b1dc3c31cda89c076e6360c6f8':
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:54:02 -07:00
James Dong
d4a9711057 am 9365c8fa: am 99638e74: Merge change 27466 into eclair
Merge commit '9365c8fa7c66c62de98b859f08c881ea2ad65980'

* commit '9365c8fa7c66c62de98b859f08c881ea2ad65980':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:53:55 -07:00
Mike Cleron
1ca9b13bf4 am 3ecd58c6: Fix build
Merge commit '3ecd58c650371206008efd687933c370e4e28a34' into eclair-plus-aosp

* commit '3ecd58c650371206008efd687933c370e4e28a34':
  Fix build
2009-09-28 11:49:36 -07:00
Evan Millar
93d0b335a6 am 14f65ff9: Merge change 27243 into eclair
Merge commit '14f65ff9451747d6bb802e1b754afae1110ad759' into eclair-plus-aosp

* commit '14f65ff9451747d6bb802e1b754afae1110ad759':
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 11:49:29 -07:00
James Dong
9365c8fa7c am 99638e74: Merge change 27466 into eclair
Merge commit '99638e747251929191f7773d2a81bbea223f1e09' into eclair-plus-aosp

* commit '99638e747251929191f7773d2a81bbea223f1e09':
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 11:49:22 -07:00
Android (Google) Code Review
14f65ff945 Merge change 27243 into eclair
* changes:
  Add drop shadow to contact name in ContactHeaderWidget
2009-09-28 14:44:42 -04:00
Mike Cleron
3ecd58c650 Fix build 2009-09-28 11:44:36 -07:00
Android (Google) Code Review
99638e7472 Merge change 27466 into eclair
* changes:
  Turn on thubmnail capture unit test for media metadata retriever
2009-09-28 14:40:34 -04:00
Amith Yamasani
b0ee99fd15 am e086e1d1: am fedb3269: Merge change 27349 into eclair
Merge commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f'

* commit 'e086e1d177306e7a79a1f4200723eeafcdd1116f':
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:22:43 -07:00
Nick Pelly
d4312b1ffc am 75ce6b10: am 96e42b3a: Merge change 27462 into eclair
Merge commit '75ce6b103810efbc61af4b786651d9cc414107fd'

* commit '75ce6b103810efbc61af4b786651d9cc414107fd':
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:22:35 -07:00
Amith Yamasani
e086e1d177 am fedb3269: Merge change 27349 into eclair
Merge commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f' into eclair-plus-aosp

* commit 'fedb32696ace93afeefa216b2a5e90b2793ec85f':
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 11:16:53 -07:00
Nick Pelly
75ce6b1038 am 96e42b3a: Merge change 27462 into eclair
Merge commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce' into eclair-plus-aosp

* commit '96e42b3a5414cf8525841bb404bbad34aa7dbcce':
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 11:16:45 -07:00
Mike Cleron
b4e5dc1518 am 91d53844: am f116bf88: Fading scrollbars return. But you have to opt in.
Merge commit '91d538447029330921e0d960f8616aac1929fb66'

* commit '91d538447029330921e0d960f8616aac1929fb66':
  Fading scrollbars return. But you have to opt in.
2009-09-28 11:16:42 -07:00
Android (Google) Code Review
fedb32696a Merge change 27349 into eclair
* changes:
  Fix 2143297: Fix transition from password -> visible password
2009-09-28 14:12:03 -04:00
Android (Google) Code Review
96e42b3a54 Merge change 27462 into eclair
* changes:
  Add an API to request a system activity to turn on Bluetooth.
2009-09-28 14:09:47 -04:00
Amith Yamasani
a8c0edb8fb Fix 2143297: Fix transition from password -> visible password 2009-09-28 11:08:57 -07:00
Mike Cleron
91d5384470 am f116bf88: Fading scrollbars return. But you have to opt in.
Merge commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9' into eclair-plus-aosp

* commit 'f116bf8884b5b58aae261d148003811aa4a7c6e9':
  Fading scrollbars return. But you have to opt in.
2009-09-28 11:07:14 -07:00
Nick Pelly
1acdcc1a50 Add an API to request a system activity to turn on Bluetooth.
Change-Id: I2fca33ad27017ea4e2ecba37854b749682d07672
2009-09-28 11:04:00 -07:00
James Dong
525ad18663 Turn on thubmnail capture unit test for media metadata retriever 2009-09-28 10:57:17 -07:00
Andrei Popescu
742420d073 am c2ae2865: am 5d062bc3: Merge change 27426 into eclair
Merge commit 'c2ae2865138e8a42d49abd17542981b33a044ed4'

* commit 'c2ae2865138e8a42d49abd17542981b33a044ed4':
  Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:51:51 -07:00
Mike Cleron
f116bf8884 Fading scrollbars return. But you have to opt in. 2009-09-28 10:47:04 -07:00
Andrei Popescu
c2ae286513 am 5d062bc3: Merge change 27426 into eclair
Merge commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c' into eclair-plus-aosp

* commit '5d062bc3de2406bd96c08ddb9c0940f4e75b4d7c':
  Handle the case where GoogleLocationSettingObserver::onChange
2009-09-28 10:42:13 -07:00
Android (Google) Code Review
5d062bc3de Merge change 27426 into eclair
* changes:
  Handle the case where GoogleLocationSettingObserver::onChange is called after GoogleLocationSettingObserver::doNotObserve().
2009-09-28 13:33:01 -04:00
Grace Kloba
06f54af0b9 am 963cd288: am 0d03b914: Before we send VIEW_SIZE_CHANGED after first layout, we should remove VIEW_SIZE_CHANGED in the queue if there is any as we are going to send the message in the front of the queue.
Merge commit '963cd288a5bef260d06fbfd096e6f02793b83532'

* commit '963cd288a5bef260d06fbfd096e6f02793b83532':
  Before we send VIEW_SIZE_CHANGED after first layout,
2009-09-28 10:21:34 -07:00
Suchi Amalapurapu
f0c310c12a am 9e57be22: am fee73ee2: Merge change 27411 into eclair
Merge commit '9e57be227d11d890e709ad9e38412ad029e5cf22'

* commit '9e57be227d11d890e709ad9e38412ad029e5cf22':
  Cache inflated view to avoid inflation of layouts in preferences
2009-09-28 10:21:28 -07:00
Guang Zhu
6bd7f71b11 am ecae28bc: am 1cdb55aa: Merge change 27457 into eclair
Merge commit 'ecae28bc3ea9e68b7b4f1b5879a52f46b9bbc33c'

* commit 'ecae28bc3ea9e68b7b4f1b5879a52f46b9bbc33c':
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 10:21:21 -07:00
Grace Kloba
963cd288a5 am 0d03b914: Before we send VIEW_SIZE_CHANGED after first layout, we should remove VIEW_SIZE_CHANGED in the queue if there is any as we are going to send the message in the front of the queue.
Merge commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1' into eclair-plus-aosp

* commit '0d03b91407aecab52d0fe8b6f849a0398878a2c1':
  Before we send VIEW_SIZE_CHANGED after first layout,
2009-09-28 10:15:00 -07:00
Suchi Amalapurapu
9e57be227d am fee73ee2: Merge change 27411 into eclair
Merge commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3' into eclair-plus-aosp

* commit 'fee73ee2d6eb3e875e39a64c410d6a1ff8508ad3':
  Cache inflated view to avoid inflation of layouts in preferences
2009-09-28 10:14:53 -07:00
Guang Zhu
ecae28bc3e am 1cdb55aa: Merge change 27457 into eclair
Merge commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5' into eclair-plus-aosp

* commit '1cdb55aa97d8035a941a4bd7cf23063f18360ab5':
  Added code style fix that actually did not get submitted in 2nd patch of previous change.
2009-09-28 10:14:47 -07:00
Evan Millar
b71e554d7e Add drop shadow to contact name in ContactHeaderWidget
Change-Id: Ieb6555bfca014b98567d1a981eaeb04e887e4dff
2009-09-28 10:10:33 -07:00
Grace Kloba
0d03b91407 Before we send VIEW_SIZE_CHANGED after first layout,
we should remove VIEW_SIZE_CHANGED in the queue if
there is any as we are going to send the message in
the front of the queue.

Fix http://b/issue?id=2133222
2009-09-28 10:10:15 -07:00
Grace Kloba
42651c876c am 85808955: am 207308a7: WebView may get message after destroy() is called. Just return in this case.
Merge commit '858089557514424175a4bd9c89276dca1f92b95d'

* commit '858089557514424175a4bd9c89276dca1f92b95d':
  WebView may get message after destroy() is called.
2009-09-28 10:07:57 -07:00
Andrew Stadler
f395134ff2 am cdb31ee2: am 3fd2a81e: Merge change 27410 into eclair
Merge commit 'cdb31ee2dd20c592fc3b8bc2c3e0586ae9f5a870'

* commit 'cdb31ee2dd20c592fc3b8bc2c3e0586ae9f5a870':
  Add extension->mime type mappings
2009-09-28 10:07:50 -07:00
Marco Nelissen
3089841a4d am 14e8e988: am 7d973514: Merge change 27449 into eclair
Merge commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660'

* commit '14e8e988cfdd01b665f5b49fb6f95a6c11ce3660':
  Always consider m4a files as audio, even when they contain a video track.
2009-09-28 10:07:30 -07:00
Guang Zhu
2201845b65 am 89172dbc: am c18b0ebc: Merge change 27185 into eclair
Merge commit '89172dbc0dcc62a5921a2e619612c78b48de9514'

* commit '89172dbc0dcc62a5921a2e619612c78b48de9514':
  Add checks for double-dumping on webkit data.
2009-09-28 10:07:23 -07:00
Android (Google) Code Review
fee73ee2d6 Merge change 27411 into eclair
* changes:
  Cache inflated view to avoid inflation of layouts in preferences If layout id is specified for a Preference object, convertView is set to null in its adapter which results in inflation of Preference view in getView each time the Preference object is laid out on the screen. Just use an instance variable to cache the inflated view nulling it whenever the layout changes and use it in initing the convertView in getView.
2009-09-28 13:07:16 -04:00
Daniel Sandler
8fbf90981b am 12482dea: am b19774d5: Updated status bar graphics (drop date 9/25/09).
Merge commit '12482deafbe520ed9e88691e0caaa6f5e0e49519'

* commit '12482deafbe520ed9e88691e0caaa6f5e0e49519':
  Updated status bar graphics (drop date 9/25/09).
2009-09-28 10:06:47 -07:00
Mathias Agopian
b00f76f396 am c87c76f6: am 81384bf9: don\'t emit GL commands when sf is in freeze mode
Merge commit 'c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435'

* commit 'c87c76f6fc6deeb6a0fbbcbb345bfa5e6b6dc435':
  don't emit GL commands when sf is in freeze mode
2009-09-28 10:05:54 -07:00
Mathias Agopian
5abce46e43 am 8521fe4e: am 1a3c8950: Merge change 27387 into eclair
Merge commit '8521fe4ef2e74bd7b38aaeb95d5380fc213d4b7f'

* commit '8521fe4ef2e74bd7b38aaeb95d5380fc213d4b7f':
  fix [2147737] Pixel Flinger needs to set EGL_RENDERABLE_TYPE to EGL_OPENGL_ES_BIT
2009-09-28 10:05:19 -07:00
Dmitri Plotnikov
1dc0d978b1 am 46ed7413: am a60479d2: Fixing broken javadoc.
Merge commit '46ed7413314a008c0be8b9e7520e472c08648c83'

* commit '46ed7413314a008c0be8b9e7520e472c08648c83':
  Fixing broken javadoc.
2009-09-28 10:05:13 -07:00
Dmitri Plotnikov
1b5646b259 am 8e8ee1fd: am 879664e3: Adding columns to support attribution of status updates. Also renaming some columns to better describe their purpose.
Merge commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded'

* commit '8e8ee1fd722f6f0af818e31c7bcaa0eece125ded':
  Adding columns to support attribution of status updates.  Also renaming some columns to better describe their purpose.
2009-09-28 10:04:57 -07:00
Marco Nelissen
7425821ff0 am aa507136: am dba93b68: Merge change 27318 into eclair
Merge commit 'aa507136493b24a899b270367b08a7158085c9b8'

* commit 'aa507136493b24a899b270367b08a7158085c9b8':
  Check that playlist entries refer to a row in the audio table.
2009-09-28 10:04:50 -07:00
Wu-cheng Li
ed9b98ccd0 am 216638a0: am e883847f: Merge change 27292 into eclair
Merge commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0'

* commit '216638a0357e8f3abf452c4bd073d8ee2cdb4bb0':
  Add documentation about flash and change video-light to torch.
2009-09-28 10:04:04 -07:00
Mathias Agopian
e3e94b25af am 9da48f26: am 960972d4: Merge change 27375 into eclair
Merge commit '9da48f26028b61e3b757775f54a05293b9dca798'

* commit '9da48f26028b61e3b757775f54a05293b9dca798':
  Allways dump the list of allocated buffers when an allocation fails.
2009-09-28 10:03:39 -07:00
Jason Sams
bcc38007c4 am 7a5917d5: am 41c64ba7: Merge change 27364 into eclair
Merge commit '7a5917d5db3f9d9f3145e7be9c95a2533d35308e'

* commit '7a5917d5db3f9d9f3145e7be9c95a2533d35308e':
  Improve logging code to dump more detaild rs object info.  Fix bug with predefined elements not being recreated for contexts after one was destroyed. Add stricter type enforcement.
2009-09-28 10:03:07 -07:00
Doug Zongker
2554655fdf am 874054f8: am a78fcccd: Merge change 27348 into eclair
Merge commit '874054f8623f011f5e9e2f2198b697fce7b6b535'

* commit '874054f8623f011f5e9e2f2198b697fce7b6b535':
  fix "pacakge" typo in error log message
2009-09-28 10:02:53 -07:00
Dianne Hackborn
740b41e6de am 10146f23: am 02541fe6: Merge change 27351 into eclair
Merge commit '10146f239ca4c6300fa2513b3da0e34ad3a27fb4'

* commit '10146f239ca4c6300fa2513b3da0e34ad3a27fb4':
  Allow wallpaper picker to work.
2009-09-28 10:02:18 -07:00
Christopher Tate
d606745aba am f6c74a4f: am 4b35d699: Merge change 27342 into eclair
Merge commit 'f6c74a4f7273f41bea8751c4f5fc397b364bc991'

* commit 'f6c74a4f7273f41bea8751c4f5fc397b364bc991':
  Don't back up / restore "allow apps from unknown sources"
2009-09-28 10:01:13 -07:00
Yu Shan Emily Lau
f17f0ea3a5 am d155f6d7: am d021ea27: Merge change 27306 into eclair
Merge commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505'

* commit 'd155f6d79251ecc1f27e079e9ac05d7855dda505':
  Modified the test case name for the browser page load test.
2009-09-28 10:01:06 -07:00