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

36059 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Owen Lin
8ffb135dc8 am 45ca778d: Merge "Make sure the controller will get repositioned after size changing." into gingerbread 
* commit '45ca778d8ed90aff3f72fc85f806cedbd4121cc1':
  Make sure the controller will get repositioned after size changing.
 2010-11-10 08:25:02 -08:00
Brian Carlstrom
87ad930037 Correctly parse cookies with spaces after = in attributes 
Bug: 3167208
Change-Id: I8adebf9f9e92967a3250e61ccfbb45e02bbee3f9
 2010-11-09 22:03:17 -08:00
Jim Shuma
baa1553c8d Fix summary for FragmentTransaction.show() 
An apparent copy-paste left out a change that should have
been made in the method summary.

Change-Id: I158a30462fadcf617240047960e1b187b8210f6c
 2010-11-09 20:37:03 -08:00
Dianne Hackborn
6c8e20f96a Implement new task transition animations. 
Change-Id: I62c10e7b2afac4371b3739f1cd5948c655edc125
 2010-11-09 19:04:49 -08:00
Owen Lin
45ca778d8e Merge "Make sure the controller will get repositioned after size changing." into gingerbread 2010-11-09 19:02:23 -08:00
Jim Miller
cb120a9ba7 Merge "Initial pass to update RecentApps panel to new UI specification." 2010-11-09 18:11:38 -08:00
Mathias Agopian
90d6b69426 am 0e438287: am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread 
* commit '0e438287995698aacdda715713300fc01a6d1585':
  Improve gyro and accelerometer java doc
 2010-11-09 17:43:16 -08:00
Jim Miller
fefef31191 Initial pass to update RecentApps panel to new UI specification. 
This updates recent apps to show a vertical list, complete
with thumbnails and a text description of the application.

Change-Id: I178ed8d7d32e790ac51aa7f88593aa24d6786a78
 2010-11-09 17:42:49 -08:00
Jason Sams
eaf6bd1a69 Merge "Continue error check improvements and write some docs." 2010-11-09 17:38:20 -08:00
Eric Fischer
363eedcd65 Restore deleted string still referenced from AndroidManifest. 
I think this must have been an accidental deletion since the comment
is still there.

Change-Id: I40bfa0f839efed19c073a0e9fc0b48b65d3eb293
 2010-11-09 17:32:09 -08:00
Vasu Nori
3f6a1f5e59 Merge "on readonly databases, don't set journal mode and don't allow WAL" 2010-11-09 17:29:37 -08:00
Eric Fischer
6362b3f077 Import revised translations. 
Change-Id: I9fe6a999fc665faefbf0e7e222d5dfb4fdbcd3b1
 2010-11-09 17:25:54 -08:00
Mathias Agopian
0e43828799 am b48189cc: Merge "Improve gyro and accelerometer java doc" into gingerbread 
* commit 'b48189ccfe42a408fb713565e54e165d255c6d66':
  Improve gyro and accelerometer java doc
 2010-11-09 17:24:57 -08:00
Shimeng (Simon) Wang
3bf77b1fb3 Merge "Update textwrap scale when content width changes in overview mode." 2010-11-09 17:15:02 -08:00
Mathias Agopian
b48189ccfe Merge "Improve gyro and accelerometer java doc" into gingerbread 2010-11-09 17:12:11 -08:00
Jason Sams
06d69de788 Continue error check improvements and write some docs. 
Change-Id: I345b08490da21d9ee715ff1ddc80c1a816b579f4
 2010-11-09 17:11:40 -08:00