summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am 7f00c22b: Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0Irfan Sheriff2011-11-021-14/+101
|\ | | | | | | | | * commit '7f00c22b7fa7b38b644585c0a3c6faadc5def94c': Avoid duplicate dialogs leading to NPE
| * Merge "Avoid duplicate dialogs leading to NPE" into ics-mr0Irfan Sheriff2011-11-021-14/+101
| |\
| | * Avoid duplicate dialogs leading to NPEIrfan Sheriff2011-11-011-14/+101
| | | | | | | | | | | | | | | Bug: 5548268 Change-Id: I383d5dba5ed2d77c1623d03990f1139872a65e2a
* | | am 451fa13e: Merge "Ignore errors when untethering" into ics-mr0Robert Greenwalt2011-11-021-52/+27
|\ \ \ | |/ / | | | | | | | | | * commit '451fa13e82ea1226895b41282fdb33bf9fea5d19': Ignore errors when untethering
| * | Merge "Ignore errors when untethering" into ics-mr0Robert Greenwalt2011-11-021-52/+27
| |\ \
| | * | Ignore errors when untetheringRobert Greenwalt2011-11-021-52/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sometimes the interface is removed before we can untether leading to errors when cleanup up various rules (iptables). Do as much as we can and then let a re-tether result in error if needed. bug:5536516 Change-Id: Ib1d064ecc8e9022566f9b0e4678b33144906971c
* | | | am aea8d850: docs: a couple typos bugs 5552478 5553096Scott Main2011-11-021-2/+2
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'aea8d8500395f7e7dce3f670933f7aaf02be7b11': docs: a couple typos bugs 5552478 5553096
| * | | docs: a couple typosScott Main2011-11-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | bugs 5552478 5553096 Change-Id: Ibeafacd446edf99096e125f5dfaa7c13a6ab1776
* | | | Merge "Update KeyBoardView to reflect the interaction model in Latin IME" ↵Svetoslav Ganov2011-11-021-25/+10
|\ \ \ \ | | | | | | | | | | | | | | | into ics-mr1
| * | | | Update KeyBoardView to reflect the interaction model in Latin IMESvetoslav Ganov2011-11-011-25/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A new patch checked in Latin IME makes it behave like any other Views. Touch explore announces the letter under the finger and subsequent tap types in the letter. Making KeyBoardView consistent with that. bug:5552217 Change-Id: Ifeb6c3f071a5d64d0a16de584bf04ea40fff62fc
* | | | | Merge "Make the notification panel header opaque." into ics-mr1Peter Ng2011-11-021-1/+1
|\ \ \ \ \
| * | | | | Make the notification panel header opaque.Daniel Sandler2011-11-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5504753 Change-Id: If820e4cb0dca342ca2d39ea1eb198987915c58b7
* | | | | | Merge "making slide unlock on tablet have a larger radius" into ics-mr1Peter Ng2011-11-024-4/+11
|\ \ \ \ \ \
| * | | | | | making slide unlock on tablet have a larger radiusPeter Ng2011-11-014-4/+11
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -removed assets from zygote because it was caching the incorrect mdpi assets -increased radius on slide unlock for tablet Bug: 5514500 Change-Id: I2e4705cb9c372ebb5baec7bb3dd7a34ced4f10ba Conflicts: core/res/res/values-sw600dp/dimens.xml
* | | | | | Merge "Don't expand the SearchView if already expanded." into ics-mr1Amith Yamasani2011-11-021-0/+2
|\ \ \ \ \ \
| * | | | | | Don't expand the SearchView if already expanded.Amith Yamasani2011-11-011-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0699f9f8fea0b62b4cf6d45e920bd2f515944005
| | | | | | |
| \ \ \ \ \ \
*-. \ \ \ \ \ \ Reconcile with ics-mr0-release ics-factoryrom-2-releaseThe Android Open Source Project2011-11-020-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I493695d0ea182f32bbfe0e148e192ad1f60ff001
| | * | | | | | | Revert "Merge "BatteryService(jni): properly handle read's return value" ↵The Android Automerger2011-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0" This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
| | * | | | | | | Revert "Merge "Update camera continuous autofocus javadoc." into ics-mr0"The Android Automerger2011-11-022-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 4b6353ea0265bfed52d0637abd1b17596ce25ff0, reversing changes made to af675222f6340a8a9edbe9e8635014a18521e5e0.
| | * | | | | | | Revert "Merge "Fix potential segfault in RS watchdog." into ics-mr0"The Android Automerger2011-11-021-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit af675222f6340a8a9edbe9e8635014a18521e5e0, reversing changes made to 6e91e5b689a3eb8e6a6f3c038322b8044a9d6670.
| | * | | | | | | Revert "Merge "Improve the slow query instrumentation." into ics-mr0"The Android Automerger2011-11-027-76/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 2d280f754e32e556407df05d977cfabdfff1c070, reversing changes made to 2cc1c5d067736f221554be593c2ba2c96390f847.
| | * | | | | | | merge in ics-factoryrom-2-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Revert "Merge "BatteryService(jni): properly handle read's return value" ↵The Android Automerger2011-11-021-3/+3
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr0" This reverts commit f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3, reversing changes made to bd9b1528051a1b257768fdbc5077a2d4473b02dd.
| * | | | | | | merge in ics-mr0-release history after reset to ics-mr0The Android Automerger2011-11-020-0/+0
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge "Bug 5513073 - IllegalArgumentException: View not attached to window ↵Adam Powell2011-11-021-1/+9
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | manager" into ics-mr1
| * | | | | | | | Bug 5513073 - IllegalArgumentException: View not attached to windowAdam Powell2011-11-011-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | manager Remove extra queued dialog dismiss messages when applicable. Log an error if the app tries to dismiss a dialog when its window has been destroyed. Change-Id: Ice8383d4420c052e31fbbd9fcd25051f3bd9b58d
* | | | | | | | | Merge "CalendarView title incorrectly updated for different languages." into ↵Svetoslav Ganov2011-11-021-13/+13
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1
| * | | | | | | | | CalendarView title incorrectly updated for different languages.Svetoslav Ganov2011-10-311-13/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The formatting rule was hard-coded. bug:5517162 Change-Id: I323bf623df3d9b7c0c173dc0f35ebfba070588b2
* | | | | | | | | | Merge "Accessibility window query APIs should respect root name space." into ↵Svetoslav Ganov2011-11-022-10/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1
| * | | | | | | | | | Accessibility window query APIs should respect root name space.Svetoslav Ganov2011-10-312-10/+8
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The window query API used to not-respect the root name space while traversing the parent relation i.e. a client was able to fetch the parent of a root name space node. 2. Children that are root name space were reported but their descendants not. Actually such children should not be reported since they are the root of a separate logical sub-tree. Such a tree is exposed by its root allowing its traversal. The accessibility APIs should be able to explore a virtual tree, i.e. one with a descendant which is root name space, only if an accessibility event from there was received. bug:5480096 Change-Id: I4c4d805aa2f6d4edba86eda213b5239bea83eed2
* | | | | | | | | | Merge "Updating NumberPicker, TimePicker, DatePicker to fit different screen ↵Svetoslav Ganov2011-11-028-121/+151
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and font sizes." into ics-mr1
| * | | | | | | | | | Updating NumberPicker, TimePicker, DatePicker to fit different screen and ↵Svetoslav Ganov2011-11-018-121/+151
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | font sizes. 1. Now the NumberPicker has minWidth/minHeight that is the lower bound of the correspodning size for which the widget looks well enough to be usable. There is also maxWidth/masHeight that is the upper bound of the corresponding size for which the widget looks best. The picker tries to greedily reach the max dimesions for which it looks best. 2. The NumberPicker was not taking care of the max width of the items is shows numbers/strings mapped to numbers. Now if not explicitly specified the widget computes the maxWidth at which it looks best based on the content it shows. 3. Removed an unnecessary layout for number picker on tablets. 4. Updated the TimePicker/DatePicker to not hard-code width for the number pickers it uses, rahter wrap the content. bug:5417100 Change-Id: I432aa96185961e59a058a2565b15265ba7394818
* | | | | | | | | | am 953005e8: Merge "Specify component name for provisioning" into ics-mr0Irfan Sheriff2011-11-021-4/+13
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '953005e8243e4dc898a00d9a1612ae82772913b9': Specify component name for provisioning
| * | | | | | | | | Merge "Specify component name for provisioning" into ics-mr0Irfan Sheriff2011-11-011-4/+13
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Specify component name for provisioningIrfan Sheriff2011-11-011-4/+13
| | | |_|_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5544654 Change-Id: I977cad131f7c4d9776997fc3153f4c0d12063af2
* | | | | | | | | | am db0ab2e7: Merge "Process AMS events in NetworkPolicy handler." into ics-mr0Jeff Sharkey2011-11-021-29/+41
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'db0ab2e731d755f64583c5704fa406bc0e7a2af4': Process AMS events in NetworkPolicy handler.
| * | | | | | | | | Merge "Process AMS events in NetworkPolicy handler." into ics-mr0Jeff Sharkey2011-11-011-29/+41
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Process AMS events in NetworkPolicy handler.Jeff Sharkey2011-11-011-29/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a process changes foreground status or dies, NetworkPolicy updates its internal state with a lock held. In cases where there is contention, this can block the AMS handler and prevent other events, such as broadcasts, from being dispatched. This change moves the incoming AMS events to an existing internal NetworkPolicy handler thread, where they can execute without blocking AMS. Bug: 5497544 Change-Id: Ie0c620a620fd9f0f4eb02af510bd819efa4deb6a
* | | | | | | | | | Merge "Add new OOM adjustment for the "previous" process." into ics-mr1Dianne Hackborn2011-11-015-7/+55
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add new OOM adjustment for the "previous" process.Dianne Hackborn2011-11-015-7/+55
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the process that you had previously been interacting with in the UI before the current one. Treating it specially should allow us to improve the scenario of switching back and forth between two apps. Also add API constent for ICS MR1. Change-Id: Ib3fe4df36b270be11dfd6b7e8d107c9994058a4d
* | | | | | | | | | am bcf05a69: Fix bug #5553401 TextLayoutCache is too verbose: ↵Fabrice Di Meglio2011-11-021-1/+5
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | "computeValuesWithHarfbuzz -- need to force to single run" * commit 'bcf05a69090f342d328f1537d1d83406b883290b': Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz -- need to force to single run"
| * | | | | | | | Fix bug #5553401 TextLayoutCache is too verbose: "computeValuesWithHarfbuzz ↵Fabrice Di Meglio2011-11-011-1/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -- need to force to single run" - make single run case non verbose Change-Id: I5c3b87aeb613697233290ddecac3ca00f58f8313
* | | | | | | | Merge "Some optimizations." into ics-mr1Dianne Hackborn2011-11-019-107/+196
|\ \ \ \ \ \ \ \
| * | | | | | | | Some optimizations.Dianne Hackborn2011-11-019-107/+196
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't try to create a thumbnail bitmap on the client side. This wastes 64k, and isn't needed since we are doing screenshots. - Optimize View to put all of the callback pointers out of line. Added a couple new APIs so these don't need to be protected/public. - Lazily create ViewGroup's cache paint. - Change FrameworkPerf app to not use HW accel drawing, to give better comparison with GB. Change-Id: Iec56d02459820d74a4cc9c7ec9c1856563c82c7b
* | | | | | | | | Merge "Fix bug 5528574 - "View not attached to window manager" upon ↵Adam Powell2011-11-011-0/+21
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation change when there is a dialog with ActionMode on" into ics-mr1
| * | | | | | | | | Fix bug 5528574 - "View not attached to window manager" uponAdam Powell2011-11-011-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orientation change when there is a dialog with ActionMode on Fix a bug closing down active action modes as dialogs are closing. Change-Id: I0d28e3b3845d5ed50fbb55b180dafa1b11957b81
* | | | | | | | | | am d5b25ecc: Merge "Doc Update: Update list of widget classes" into ics-mr0Katie McCormick2011-11-021-0/+4
|\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / | |/| | | | | | / / | |_|_|_|_|_|_|/ / |/| | | | | | | | * commit 'd5b25ecc07efb9d7f725731f29241217266b4c0c': Doc Update: Update list of widget classes
| * | | | | | | | Merge "Doc Update: Update list of widget classes" into ics-mr0Katie McCormick2011-11-011-0/+4
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Doc Update: Update list of widget classesKatie McCormick2011-11-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I820848b45e991be6e5b7e7bc2f280caf60fb7f7e
* | | | | | | | | | am f0ad147f: Merge "BatteryService(jni): properly handle read\'s return ↵Dima Zavin2011-11-011-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | / / / / / / / | |_|/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | value" into ics-mr0 * commit 'f0ad147fc33cf55cd9427010b2cdb3eb89b9eec3': BatteryService(jni): properly handle read's return value