summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Save the history of InputMethodSubtype for reverting the subtype when IME ↵satok2010-11-112-47/+236
| | | | | | | | | | | was changed. - Re-revert the change https://android-git.corp.google.com/g/#q,78962,n,z *** If you want to see the diff between reverted change and new change, please see the diff between patch set 1 and the latest patch set - TODO: Add a public function "switchToLastInputMethod" Change-Id: Ic85d54b3b68e47a22360acaeb81202a366a34586
* am 1ed7d65b: am fac4a689: Merge "Fix the audio mode glitch during hangup." ↵John Wang2010-11-101-1/+5
|\ | | | | | | | | | | | | into gingerbread * commit '1ed7d65b5d781d10de91a199fbd94d6d445d1def': Fix the audio mode glitch during hangup.
| * am fac4a689: Merge "Fix the audio mode glitch during hangup." into gingerbreadJohn Wang2010-11-101-1/+5
| |\ | | | | | | | | | | | | * commit 'fac4a689f86b0d46a2c76cec0a6ce2f4bac2a22a': Fix the audio mode glitch during hangup.
| | * Merge "Fix the audio mode glitch during hangup." into gingerbreadJohn Wang2010-11-101-1/+5
| | |\
| | | * Fix the audio mode glitch during hangup.John Wang2010-11-101-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug # 3136179. Keep audio mode as IN_CALL during hangup DISCONNECTING state to prevent the NORMAL and IN_CALL glitch in auiod setMode. Change-Id: I5513a3d5c65bd13ac054c9718c4dbd7d6db9eaf3
* | | | Merge "Add new runtime debug flags."Romain Guy2010-11-108-1/+63
|\ \ \ \
| * | | | Add new runtime debug flags.Romain Guy2010-11-108-1/+63
| | | | | | | | | | | | | | | | | | | | Change-Id: I07955de166a89b5053c6c13f250bb3e2936ca86e
* | | | | Fixing current.xmlAdam Cohen2010-11-101-18/+18
| | | | | | | | | | | | | | | | | | | | Change-Id: Ida4077f26bb1bfd6e2070a3b58adabbcfd761c68
* | | | | am 63f40387: am 34594e75: Merge "Fix issue #3177284: Account for wake lock ↵Dianne Hackborn2010-11-101-0/+9
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | power usage on Crespo" into gingerbread * commit '63f40387d931b5cd555b4743a4d8ff4f1ccf9558': Fix issue #3177284: Account for wake lock power usage on Crespo
| * | | | am 34594e75: Merge "Fix issue #3177284: Account for wake lock power usage on ↵Dianne Hackborn2010-11-101-0/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | Crespo" into gingerbread * commit '34594e75e4a7962840f34c0b57116ecf1497f118': Fix issue #3177284: Account for wake lock power usage on Crespo
| | * | | Merge "Fix issue #3177284: Account for wake lock power usage on Crespo" into ↵Dianne Hackborn2010-11-101-0/+9
| | |\ \ \ | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | Fix issue #3177284: Account for wake lock power usage on CrespoDianne Hackborn2010-11-081-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5e3d6c4772f08277ee775dba191a5054dd5a4ca2
* | | | | | Merge "Adding widget auto-advance capability"Adam Cohen2010-11-109-9/+117
|\ \ \ \ \ \
| * | | | | | Adding widget auto-advance capabilityAdam Cohen2010-11-109-9/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I058573f40a48fd7b5c2efa5f1041a1199919a51a
* | | | | | | Merge "Refine AbsListView transcript mode behavior."Adam Powell2010-11-101-3/+14
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Refine AbsListView transcript mode behavior.Adam Powell2010-11-101-3/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | Merge "Fix summary for FragmentTransaction.show()"Jim Shuma2010-11-101-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix summary for FragmentTransaction.show()Jim Shuma2010-11-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | An apparent copy-paste left out a change that should have been made in the method summary. Change-Id: I158a30462fadcf617240047960e1b187b8210f6c
* | | | | | | | am 5314335c: (-s ours) am 00e5dd44: Merge "Fix JNI reference leak in ↵Jeff Brown2010-11-100-0/+0
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NativeActivity. (DO NOT MERGE)" into gingerbread * commit '5314335c9e28673923ad034e5f8a5ba765552a08': Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
| * | | | | | | am 00e5dd44: Merge "Fix JNI reference leak in NativeActivity. (DO NOT ↵Jeff Brown2010-11-101-0/+2
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | MERGE)" into gingerbread * commit '00e5dd44f6d014fff8c65b9c718f5641f5eae4bb': Fix JNI reference leak in NativeActivity. (DO NOT MERGE)
| | * | | | | | Merge "Fix JNI reference leak in NativeActivity. (DO NOT MERGE)" into ↵Jeff Brown2010-11-101-0/+2
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | Fix JNI reference leak in NativeActivity. (DO NOT MERGE)Jeff Brown2010-11-081-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change ensures that the native activity releases the KeyEvent objects that it allocates since they will not be released automatically and eventually the JNI slot table will overflow and crash the process. Bug: 3170494 Change-Id: I2ea527f056096fae9bc9e7685dccb56ec7a0e8b4
* | | | | | | | | am d4b5d85e: (-s ours) am 77f5c954: resolved conflicts for merge of 5a726729 ↵Scott Main2010-11-100-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to gingerbread * commit 'd4b5d85e2cbf8fb7150a0b0030132e28d7e4d9e2': docs: remove "new" tags from sample apps
| * | | | | | | | am 77f5c954: resolved conflicts for merge of 5a726729 to gingerbreadScott Main2010-11-101-6/+6
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '77f5c9542e159cb9f2f2908227212d4add8ce74c': docs: remove "new" tags from sample apps
| | * | | | | | | resolved conflicts for merge of 5a726729 to gingerbreadScott Main2010-11-101-6/+6
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6060f31c45d49dfe4dbda52836150311b8992b15
| | | * | | | | | | docs: remove "new" tags from sample appsScott Main2010-11-101-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I74dafa69f3638e2fe13c5edc7a54096943ffa164
* | | | | | | | | | Merge "Move ApplicationPackageManager out of ContextImpl.java"Brad Fitzpatrick2010-11-103-1072/+1115
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move ApplicationPackageManager out of ContextImpl.javaBrad Fitzpatrick2010-11-103-1072/+1115
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I706bce3fc4a5c7e6ee351d677899a01ac222960c
* | | | | | | | | | | Merge "Move SharedPreferencesImpl out of ContextImpl.java"Brad Fitzpatrick2010-11-102-484/+521
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Move SharedPreferencesImpl out of ContextImpl.javaBrad Fitzpatrick2010-11-102-484/+521
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3a58ec4c9501e906c133e841b5c5ec6bced04a02
* | | | | | | | | | | Merge "Add description and configuration methods to the transport interface"Chris Tate2010-11-102-2/+39
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add description and configuration methods to the transport interfaceChris Tate2010-11-102-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | Merge "Close the file input stream if the XML file parsing fails."Gil Dobjanschi2010-11-101-101/+106
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Close the file input stream if the XML file parsing fails.Gil Dobjanschi2010-11-101-101/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I254633a173d61ff8be3f2f399a2d41305076ed78
* | | | | | | | | | | | | am d6c7893d: (-s ours) am 17fd21fc: Merge "DO NOT MERGE. workaround ↵Mathias Agopian2010-11-100-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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
| * | | | | | | | | | | | am 17fd21fc: Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() ↵Mathias Agopian2010-11-101-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | | | | | | | | | | Merge "DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the ↵Mathias Agopian2010-11-101-0/+4
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong pointer for some GL extensions" into gingerbread
| | | * | | | | | | | | | | DO NOT MERGE. workaround [3177481] eglGetProcAddress() returns the wrong ↵Mathias Agopian2010-11-091-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | pointer for some GL extensions We just make sure eglGetProcAddress() will return NULL for glEGLImageTargetTexture2DOES glEGLImageTargetRenderbufferStorageOES which is better than returning the address of the wrong implementation. the correct fix is more involved. Change-Id: I585a1f40e564f862e5dd382224609ccd069cd3b5
* | | | | | | | | | | | | | Merge "Fix uninitialized variable"James Dong2010-11-101-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix uninitialized variableJames Dong2010-11-101-0/+1
| | |_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o This was missed while the rotation patch was hand merged. Change-Id: I4016f9fb9cd54c5e853da15bbaaa50b1d1dac8c8
* | | | | | | | | | | | | Merge "Code cleanup to make formatting consistent across all the ↵Alex Sakhartchouk2010-11-1081-1803/+1039
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | renderscript files."
| * | | | | | | | | | | | Code cleanup to make formatting consistentAlex Sakhartchouk2010-11-1081-1803/+1039
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | across all the renderscript files. Change-Id: Idf5fcc60877e44c8f074f7176e37f70b3b895a3c
* | | | | | | | | | | | | Merge "Fix bug 3183378 - make theme attribute selectableItemBackground public."Adam Powell2010-11-102-5/+17
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix bug 3183378 - make theme attribute selectableItemBackground public.Adam Powell2010-11-102-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | | Merge "Move all debug flags in a single place."Romain Guy2010-11-1013-32/+132
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | / / | | |_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | |
| * | | | | | | | | | | Move all debug flags in a single place.Romain Guy2010-11-1013-32/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | | | | | | | | am bf44ebae: am 9de93424: Merge "Without SD card the shutdown sequence was ↵Brad Fitzpatrick2010-11-101-0/+11
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | delayed" * commit 'bf44ebae04f837596b9942ccb15d3d47bad4acec': Without SD card the shutdown sequence was delayed
| * | | | | | | | | | | am 9de93424: Merge "Without SD card the shutdown sequence was delayed"Brad Fitzpatrick2010-11-101-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '9de93424cc05446e3a216f406c55a3937c028416': Without SD card the shutdown sequence was delayed
| | * \ \ \ \ \ \ \ \ \ \ Merge "Without SD card the shutdown sequence was delayed"Brad Fitzpatrick2010-11-101-0/+11
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Without SD card the shutdown sequence was delayedJohan Alfven2010-11-091-0/+11
| | |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the memory card is not inserted (or removed) from the phone the shut down process is very long. It takes almost 24 seconds. For the phone with memory card the averige is 5-6 seconds Make sure to send onShutDownComplete even if an SD card is not mounted and no unmount is done. Change-Id: I0e79b82e294a971f5e7144cdd3cc16b7ff414b9c