summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Mark configuration strings as not translatable.Eric Fischer2012-02-291-13/+13
| | | | Change-Id: I041a6a951dfe70881a095d7ef085b0246a9d4c3b
* docs: Android Design downloads section, linkable H2s.Roman Nurik2012-02-2949-62/+588
| | | | Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
* Merge "fix bug 5911175" into ics-mr1Robert Ly2012-02-281-1/+1
|\
| * fix bug 5911175Robert Ly2012-02-221-1/+1
| | | | | | | | Change-Id: I528e7c30e81c85ec31a5abbd74e85cc364a8362f
* | Merge "Fix issue #6073913: onActivityResult() not getting called..." into ↵Dianne Hackborn2012-02-282-33/+31
|\ \ | | | | | | | | | ics-mr1
| * | Fix issue #6073913: onActivityResult() not getting called...Dianne Hackborn2012-02-282-33/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | ...if the process is killed and restarted Try to ensure that in all cases we deliver an activity result if one was requested. Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
* | | DO NOT MERGEfelipeal2012-02-281-1/+1
|/ / | | | | | | | | | | (from master: Fixed minor typo on Javadoc) Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
* | Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1Jason Noguchi2012-02-282-12/+102
|\ \
| * | Adding time lapse test to mediaframework stress suite.Jason Noguchi2012-02-222-12/+102
| | | | | | | | | | | | Change-Id: Ia244352cd16f77c090c4f1dad6f9b09a8b3e8f47
* | | NumberPicker showing IME when its input field gains focus.Svetoslav Ganov2012-02-272-17/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The NumberPicker was showing the IME if the input field gets focus and hiding it when the the arrows are pressed. The leads to a nasty behavior when the input is the first focusable and the uses presser an arrow button. In such a case the IME shows and hides on every arrow press pushing the window content up and down - this looks pretty ugly. Now the IME is show on double tap of the input field. 2. The NumberPicker input now by default has an IME action done, hence after editing it the IME goes away. 3. The NumberPicker input now clears focus when it gets IME action done, so the last picker in a sequence does not show selection which is focus driven. 4. NumberPicker was incorrectly detecting double tap to begin edit and it was possble to start edit on singe tap if the user has double tapped before to start an edit. Now double tap detection is using the double tap timeout correctly. bug:6071977 Change-Id: I0ff5a491064e51663b3abec675d839d0a65b986a
* | | Merge "docs: fix bug 5990526" into ics-mr1Robert Ly2012-02-271-1/+1
|\ \ \
| * | | docs: fix bug 5990526Robert Ly2012-02-221-1/+1
| | |/ | |/| | | | | | | Change-Id: Ife7e9a66c5fc23a9caa2c26046741880833f4b9a
* | | Support rendering layout that use the new res-auto namespace.Xavier Ducrohet2012-02-242-3/+13
| | | | | | | | | | | | Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
* | | Merge "Fix build." into ics-mr1Dianne Hackborn2012-02-241-5/+8
|\ \ \
| * | | Fix build.Dianne Hackborn2012-02-241-5/+8
| | | | | | | | | | | | | | | | Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
* | | | Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1Dianne Hackborn2012-02-243-81/+172
|\ \ \ \ | |/ / /
| * | | Fix issue #6048808: sometimes auto-correct is inactiveDianne Hackborn2012-02-243-81/+172
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | My previous change to speed up the time the IME is dismissed was fundamentally flawed. That change basically switched the order the application called the input method manager service from doing startInput() and then windowGainedFocus(), to first windowGainedFocus() and then startInput(). The problem is that the service relies on startInput() being done first, since this is the mechanism to set up the new input focus, and windowGainedFocus() is just updating the IME visibility state after that is done. However, by doing the startInput() first, that means in the case where we are going to hide the IME we must first wait for the IME to re-initialize editing on whatever input has focus in the new window. To address this, the change here tries to find a half-way point between the two. We now do startInput() after windowGainedFocus() only when this will result in the window being hidden. It is not as easy as that, though, because these are calls on to the system service from the application. So being able to do that meant a fair amount of re-arranging of this part of the protocol with the service. Now windowGainedFocus() is called with all of the information also needed for startInput(), and takes care of performing both operations. The client-side code is correspondingly rearranged so that the guts of it where startInput() is called can instead call the windowGainedFocus() entry if appropriate. So... in theory this is safer than the previous change, since it should not be impacting the behavior as much. In practice, however, we are touching and re-arranging a lot more code, and "should" is not a promise. Change-Id: Icb58bef75ef4bf9979f3e2ba88cea20db2e2c3fb
* | | | Move the automatic namespace outside of the res namespace. do not merge.Xavier Ducrohet2012-02-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | (cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225) Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
* | | | Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.inazaruk2012-02-231-3/+9
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added support for predefined namespace http://schemas.android.com/apk/res/auto that aapt tool recognizes and treats as namespace with package name taken from current application's AndroidManifest.xml, //manifest/package attribute. Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com> (cherry picked from commit e348909c1966c3d192841cc131a32be6ed90da18) Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
* | | Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" ↵Joe Fernandez2012-02-231-1/+1
|\ \ \ | | | | | | | | | | | | into ics-mr1
| * | | docs: NDK overview, remove x86 instruction set mention (b/6044027)Joe Fernandez2012-02-221-1/+1
| | | | | | | | | | | | | | | | Change-Id: I37ee68fb78f2ed5edc1c34ff7198340b1ab5c49b
* | | | Don't allow screen invalidations to go outside bounds of screenMichael Jurka2012-02-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Fixes invalidation issue in Launcher Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
* | | | Merge "docs: fix broken link" into ics-mr1Scott Main2012-02-221-1/+1
|\ \ \ \
| * | | | docs: fix broken linkScott Main2012-02-171-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I13e29ec18bb503ea33ee59d187f588c5be8fd109
* | | | | Merge "Make sure resource references are resolved." into ics-mr1Xavier Ducrohet2012-02-222-19/+176
|\ \ \ \ \
| * | | | | Make sure resource references are resolved.Xavier Ducrohet2012-02-212-19/+176
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | XmlPullAttribute can query for attributes and return them in a given format. We need to make sure they are first resolved before trying to convert them to int/float/boolean/... Change-Id: I2aaced022a0382e501978c396e49d6191d53bdc8
* | | | | | Merge "docs: Added Lint into Android Training and removed Layoutopt." into ↵Rich Hyndman2012-02-222-22/+23
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | ics-mr1
| * | | | | docs: Added Lint into Android Training and removed Layoutopt.Rich Hyndman2012-02-202-22/+23
| | |/ / / | |/| | | | | | | | | | | | | Change-Id: Ib818ba3ab12fff79dbede69ebf543a8e4be6f3df
* | | | | Fix issue #6037252: Screen shifts after all apps are upgradedDianne Hackborn2012-02-213-3/+17
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Two things: (1) make sure the boot message is always positioned within the entire unrestricted display, and (2) allow the dim background to go on top of the nav bar when being used for the boot message (this latter is really a hack that should be more generally fixed in the future). Change-Id: I7261b044eb802a39cadff931b50a679ff18781d6
* | | | Merge "fix NPE in race condition." into ics-mr1Tsu Chiang Chuang2012-02-171-0/+7
|\ \ \ \
| * | | | fix NPE in race condition.Tsu Chiang Chuang2012-02-161-0/+7
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic1df67f8a5379ff1cd804fb55e143f078e369ccf
* | | | | Bug 6021294 - Contextual action bar animation tweaksAdam Powell2012-02-171-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the right-to-left cascade effect from action mode menu items. Animation time is now fixed at 300ms for scaling in menu items. Change-Id: I8eef2ed9f93c2af804663dd5e6b3f4915ed45cb1
* | | | | Use &#39; for apostrophe in HTML encoding DO NOT MERGEMarc Blank2012-02-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * We were using &apos; which is not correct Chery-pick of CL: https://android-git.corp.google.com/g/165367
* | | | | Fix last change -- don't call startInputInner() with lock held.Dianne Hackborn2012-02-161-4/+9
| |_|_|/ |/| | | | | | | | | | | Change-Id: Ie7a145c5a07f08ae8a3f5954a1c389bfbd946b69
* | | | Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1Justin Ho2012-02-166-0/+0
|\ \ \ \
| * | | | Update WiMAX notification iconsJustin Ho2012-02-156-0/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | Bug: 5724605 Change-Id: I03f9c2e7c9e94f1d3dc38d9eee3c90c45c0422a6
* | | | Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1Justin Ho2012-02-161-11/+22
|\ \ \ \
| * | | | Part of fixing issue #6006757: Keyboard dismissal lagsDianne Hackborn2012-02-151-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adjust various paths through InputMethodManager so that the flow in switching focus from one application to another is cleaner, resulting in less work being done, resulting in it being able to happen quicker. Some of the changes here avoid doing stuff when not needed, such as when we are told to unbind but are not currently the active input. A big part is also a change to the flow when a window receives input. Previously this would first do a checkFocus() which would tell the input method to switch focus to whatever view has focus in the window, followed by the windowGainedFocus() call telling it the window had gained focus. This would result in extra work because the input method service would first handle the focus switch, seeing the IME is currently displayed, so the IME would remain up and reset its focus to the new view. The app would immediately then tell it about the window, causing the service to find out the IME should be hidden and telling the IME, but the IME couldn't hide itself until it had first take care of switching its input. There is the definite potential of this breaking IME showing/hiding in cases depending on the order things may be relying on them to happen. I haven't seen any problems with a brief trip through the UI. Change-Id: I8494cbd6e19e2ab6db03f2463d9906680dda058b
* | | | | Merge "docs: move USB installation info into the OEM USB Drivers document ↵Scott Main2012-02-153-206/+212
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1
| * | | | | docs: move USB installation info into the OEM USB Drivers document becauseScott Main2012-02-153-206/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs. Change-Id: Ice78c997cbb147865ead78fb037d0b6b64db75bd
* | | | | | docs: Google+ badge now sizes properly; remove reposition hackScott Main2012-02-151-1/+1
| |_|/ / / |/| | | | | | | | | | | | | | Change-Id: If5e402b8acb249e0ea81436f3d5ecf468934b81f
* | | | | Merge "Stop using shared DUN APN when tethering stops." into ics-mr1Robert Greenwalt2012-02-147-39/+146
|\ \ \ \ \
| * | | | | Stop using shared DUN APN when tethering stops.Robert Greenwalt2012-02-147-39/+146
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Backported from master, including a bug fix and a cdma enhancement. Even if other people are sharing the connection (ie, carrier wants default and tethered traffic on the same APN) stop using a carrier- described APN when the tethering stops. bug:5972599 Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
* | | | | Merge "Add a config to set Dun capabilities." into ics-mr1Robert Greenwalt2012-02-142-2/+26
|\ \ \ \ \
| * | | | | Add a config to set Dun capabilities.Robert Greenwalt2012-02-142-2/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since CDMA doesn't use APN settings there was no place to say what a cdma device's DUN connection would support, so by default normal device originating traffic would be blocked on a tethering single-connection device. With this change you can (via overlay) say that it supports everything so mms and on-device browsing/email will still work even when on a dun connection. The reason to allow both: some carriers will charge per byte for dun access and so they don't want lots of non-tethering traffic used (costs the user alot) but other carriers just use a dun connection to limit access to tethering, but once there give unlimited data, so it makes sense to support everything there. bug:5972599 Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
* | | | | | Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" ↵Justin Ho2012-02-142-0/+0
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | into ics-mr1
| * | | | | Update 4G WiMAX assets for notification area as wellJustin Ho2012-02-142-0/+0
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5724605 Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
* | | | | Merge "docs: Android NDK r7b Release Notes" into ics-mr1Joe Fernandez2012-02-142-10/+120
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | docs: Android NDK r7b Release NotesJoe Fernandez2012-02-142-10/+120
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib1a92b1bbdb190f3aae6dcc69a78cbf5ad3c4760
* | | | | Merge "Don't pulse LED on new notification unless notification has LED flag ↵Mike Lockwood2012-02-141-1/+3
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | set" into ics-mr1