Romain Guy
6ae689201f
Merge "Add new runtime debug flags."
2010-11-10 19:06:17 -08:00
Romain Guy
e190aa6975
Add new runtime debug flags.
...
Change-Id: I07955de166a89b5053c6c13f250bb3e2936ca86e
2010-11-10 19:01:29 -08:00
Adam Cohen
2f8b27bfe5
Fixing current.xml
...
Change-Id: Ida4077f26bb1bfd6e2070a3b58adabbcfd761c68
2010-11-10 18:20:31 -08:00
Dianne Hackborn
c600720638
am 63f40387: am 34594e75: Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
...
* commit '63f40387d931b5cd555b4743a4d8ff4f1ccf9558':
Fix issue #3177284 : Account for wake lock power usage on Crespo
2010-11-10 18:06:55 -08:00
Dianne Hackborn
63f40387d9
am 34594e75: Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
...
* commit '34594e75e4a7962840f34c0b57116ecf1497f118':
Fix issue #3177284 : Account for wake lock power usage on Crespo
2010-11-10 18:01:21 -08:00
Dianne Hackborn
34594e75e4
Merge "Fix issue #3177284 : Account for wake lock power usage on Crespo" into gingerbread
2010-11-10 17:58:28 -08:00
Adam Cohen
f0504eb470
Merge "Adding widget auto-advance capability"
2010-11-10 17:26:10 -08:00
Adam Powell
6e3d6cf2e9
Merge "Refine AbsListView transcript mode behavior."
2010-11-10 17:21:23 -08:00
Adam Cohen
a02fdf1ba0
Adding widget auto-advance capability
...
Change-Id: I058573f40a48fd7b5c2efa5f1041a1199919a51a
2010-11-10 17:18:37 -08:00
Adam Powell
0785279dad
Refine AbsListView transcript mode behavior.
...
Make transcript mode only scroll to the bottom if the last item is
already scrolled fully to the bottom when the change occurs Before
this, transcript mode would cause a list to scroll to the bottom as
long as the last item in the adapter was visible at all. Long items
would make this behave unexpectedly.
Change-Id: Ia6a52c969ea6d50653cf2b8cd4dc30ba517cf803
2010-11-10 17:07:35 -08:00
Jim Shuma
ec4d82046b
Merge "Fix summary for FragmentTransaction.show()"
2010-11-10 16:11:32 -08:00
Jeff Brown
6f20923064
am 5314335c: (-s ours) am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
...
* commit '5314335c9e28673923ad034e5f8a5ba765552a08':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:09:02 -08:00
Jeff Brown
5314335c9e
am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
...
* commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb':
Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
2010-11-10 16:04:13 -08:00
Jeff Brown
00e5dd44f6
Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into gingerbread
2010-11-10 16:00:37 -08:00
Scott Main
0996daa748
am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2':
docs: remove "new" tags from sample apps
2010-11-10 15:10:13 -08:00
Brad Fitzpatrick
182e2d25cf
Merge "Move ApplicationPackageManager out of ContextImpl.java"
2010-11-10 15:07:28 -08:00
Brad Fitzpatrick
b82f04df75
Merge "Move SharedPreferencesImpl out of ContextImpl.java"
2010-11-10 15:07:15 -08:00
Chris Tate
85a4ec0d2e
Merge "Add description and configuration methods to the transport interface"
2010-11-10 15:00:48 -08:00
Scott Main
d4b5d85e2c
am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbread
...
* commit '77f5c9542e159cb9f2f2908227212d4add8ce74c':
docs: remove "new" tags from sample apps
2010-11-10 14:55:48 -08:00
Scott Main
77f5c9542e
resolved conflicts for merge of 5a726729 to gingerbread
...
Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
2010-11-10 14:46:44 -08:00
Chris Tate
a8ddef346c
Add description and configuration methods to the transport interface
...
It's now possible for the transport to supply a descriptive string to inform
the user about the nature of the backup destination (e.g. telling the user
what account the data is being stored under), and to supply an Intent with
which the system can initiate a configuration Activity supplied by the
transport (e.g. allowing the user to select which account their data is
being stored under).
The transport interface is not public.
Part of bug 2753632 and bug 2987804
Change-Id: I911f70a3ea440daf2a7a04710e9d7e65b61a58db
2010-11-10 14:45:07 -08:00
Gil Dobjanschi
a71f52bf32
Merge "Close the file input stream if the XML file parsing fails."
2010-11-10 14:43:19 -08:00
Mathias Agopian
da38b6dce2
am d6c7893d: (-s ours) am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit 'd6c7893d663aa74840bb491ddbce500bc0752ac5':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:20:26 -08:00
James Dong
d1970b8c6e
Merge "Fix uninitialized variable"
2010-11-10 14:18:26 -08:00
Scott Main
5a72672977
docs: remove "new" tags from sample apps
...
Change-Id: I74dafa69f3638e2fe13c5edc7a54096943ffa164
2010-11-10 14:16:09 -08:00
Mathias Agopian
d6c7893d66
am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
...
* commit '17fd21fc0638d8734867b6f189efbabb227f3ae1':
DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions
2010-11-10 14:15:57 -08:00
Mathias Agopian
17fd21fc06
Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong pointer for some GL extensions" into gingerbread
2010-11-10 14:09:17 -08:00
James Dong
5d0b783c44
Fix uninitialized variable
...
o This was missed while the rotation patch was hand merged.
Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
2010-11-10 14:07:13 -08:00
Brad Fitzpatrick
390dae1a8b
Move ApplicationPackageManager out of ContextImpl.java
...
Change-Id: I706bce3fc4a5c7e6ee351d677899a01ac222960c
2010-11-10 14:02:52 -08:00
Brad Fitzpatrick
d3da440320
Move SharedPreferencesImpl out of ContextImpl.java
...
Change-Id: I3a58ec4c9501e906c133e841b5c5ec6bced04a02
2010-11-10 14:02:52 -08:00
Alex Sakhartchouk
95ab69f4f4
Merge "Code cleanup to make formatting consistent across all the renderscript files."
2010-11-10 12:16:50 -08:00
Adam Powell
cf7ae94bce
Merge "Fix bug 3183378 - make theme attribute selectableItemBackground public."
2010-11-10 12:11:47 -08:00
Adam Powell
a4dba7f515
Fix bug 3183378 - make theme attribute selectableItemBackground public.
...
This will always be a reference to a state list drawable that shows
proper pressed/focused/etc background highlights for the current
theme.
Change-Id: I60671e581ad0fa8cc2f6a808beafa506784112de
2010-11-10 12:07:44 -08:00
Romain Guy
bb69143ef5
Merge "Move all debug flags in a single place."
2010-11-10 12:04:05 -08:00
Romain Guy
c15008e72e
Move all debug flags in a single place.
...
This change also adds a new memory usage flag. When turned on, the
following is printed after every frame:
D/OpenGLRenderer( 3723): Current memory usage / total memory usage (bytes):
D/OpenGLRenderer( 3723): TextureCache 3766680 / 20971520
D/OpenGLRenderer( 3723): LayerCache 3538944 / 8388608
D/OpenGLRenderer( 3723): GradientCache 135168 / 524288
D/OpenGLRenderer( 3723): PathCache 41180 / 4194304
D/OpenGLRenderer( 3723): TextDropShadowCache 0 / 2097152
D/OpenGLRenderer( 3723): FontRenderer 0 262144 / 262144
D/OpenGLRenderer( 3723): FontRenderer 1 262144 / 262144
D/OpenGLRenderer( 3723): FontRenderer 2 262144 / 262144
D/OpenGLRenderer( 3723): Other:
D/OpenGLRenderer( 3723): FboCache 2 / 12
D/OpenGLRenderer( 3723): PatchCache 31 / 512
D/OpenGLRenderer( 3723): Total memory usage:
D/OpenGLRenderer( 3723): 8268404 bytes, 7.89 MB
This should help tracking possibe memory issues.
Change-Id: I83f483ca1d2dbef904829bce368e33fe5503e8d6
2010-11-10 11:59:15 -08:00
Alex Sakhartchouk
ed9f210568
Code cleanup to make formatting consistent
...
across all the renderscript files.
Change-Id: Idf5fcc60877e44c8f074f7176e37f70b3b895a3c
2010-11-10 11:30:51 -08:00
Brad Fitzpatrick
c65347f239
am bf44ebae: am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit 'bf44ebae04f837596b9942ccb15d3d47bad4acec':
Without SD card the shutdown sequence was delayed
2010-11-10 11:11:40 -08:00
Brad Fitzpatrick
bf44ebae04
am 9de93424: Merge "Without SD card the shutdown sequence was delayed"
...
* commit '9de93424cc05446e3a216f406c55a3937c028416':
Without SD card the shutdown sequence was delayed
2010-11-10 11:07:18 -08:00
Scott Main
890729c88f
am 12a22635: am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit '12a22635ebfcdf9f5dff7081740da680c9b689ae':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 11:05:39 -08:00
Scott Main
12a22635eb
am f4724cdd: Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
...
* commit 'f4724cdd0b39eddb14a686ecaec05ff44258a7f7':
docs: update eclipse guide for eclipse 3.6 also update system requirements
2010-11-10 10:59:45 -08:00
Brad Fitzpatrick
9de93424cc
Merge "Without SD card the shutdown sequence was delayed"
2010-11-10 10:58:50 -08:00
Scott Main
f4724cdd0b
Merge "docs: update eclipse guide for eclipse 3.6 also update system requirements" into gingerbread
2010-11-10 10:46:36 -08:00
Eric Fischer
403f16ae0b
Merge changes I40bfa0f8,I9fe6a999
...
* changes:
Restore deleted string still referenced from AndroidManifest.
Import revised translations.
2010-11-10 10:26:08 -08:00
Robert Greenwalt
cec30a7a02
Merge "Fix data state change callbacks"
2010-11-10 10:12:09 -08:00
Mike Lockwood
f1094227f8
Merge changes I49b383d3,I70809401
...
* changes:
MTP: Don't dump data packets twice in debug output.
Add support for range and enum forms in MTP ObjectPropDescs
2010-11-10 09:57:34 -08:00
Mike Lockwood
83cff86dcd
MTP: Don't dump data packets twice in debug output.
...
Change-Id: I49b383d39aea101a58ae6902952ba91b44e7dc3b
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-11-10 12:49:36 -05:00
Mike Lockwood
4a65e281fa
Add support for range and enum forms in MTP ObjectPropDescs
...
Change-Id: I70809401e37a1cfb82f5dbf86947be7d9500ccf1
Signed-off-by: Mike Lockwood <lockwood@android.com >
2010-11-10 12:48:39 -05:00
Gil Dobjanschi
1fbeece669
Close the file input stream if the XML file parsing fails.
...
Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
2010-11-10 09:27:13 -08:00
Brian Carlstrom
5d4c6226ca
Merge "Correctly parse cookies with spaces after = in attributes"
2010-11-10 08:52:33 -08:00
Owen Lin
5ee0c8832f
am 8ffb135d: am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread
...
* commit '8ffb135dc892c09f1781231f783b0890515b3d60':
Make sure the controller will get repositioned after size changing.
2010-11-10 08:37:51 -08:00