summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Doc change: removing debugging tips from nav"Robert Ly2011-01-041-4/+0
|\
| * Doc change: removing debugging tips from navRobert Ly2011-01-041-4/+0
| | | | | | | | Change-Id: I02074c9fa20ebc6ed7a8ff7773bf796b2d781ab2
* | Merge "Few little fragment, wm tweaks."Dianne Hackborn2011-01-043-47/+73
|\ \
| * | Few little fragment, wm tweaks.Dianne Hackborn2011-01-043-47/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Deal with fragments being restored when their containing view is gone. Try to put in a black background during rotation. Currently commented out because it appears to cause surface flinger to hang. Change-Id: I150d061e64488356d17513f4e2d124d7c3d04f6b
* | | Merge "Doc change: Updating titles"Robert Ly2011-01-042-2/+2
|\ \ \
| * | | Doc change: Updating titlesRobert Ly2010-12-292-2/+2
| | | | | | | | | | | | | | | | Change-Id: Ie6e359e8e0dc78d61a7eff08c5891ac50bde0f10
* | | | Merge "Doc change: Updating titles"Robert Ly2011-01-045-5/+81
|\ \ \ \
| * | | | Doc change: Updating titlesRobert Ly2010-12-295-5/+81
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib0098dce10967567c7fb372770e48235c0224f2d
* | | | | Merge "Always file DUN requests for tethering."Robert Greenwalt2011-01-043-4/+10
|\ \ \ \ \
| * | | | | Always file DUN requests for tethering.Robert Greenwalt2011-01-043-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A bit of a hack so that first trySetupData call uses the proper APN in strange edge cases. Made a new startUsingNetworkFeature string that ConnectivityService knows means always pass the request to telephony even if telephony connections are not currently available. bug:3133178 Change-Id: I2559b9cbaed4b4ec02bdf7ea78e6003ee2be64f2
* | | | | | Merge "Fix testGetAllVisitedUrls to match BP1 behavior"John Reck2011-01-041-2/+4
|\ \ \ \ \ \
| * | | | | | Fix testGetAllVisitedUrls to match BP1 behaviorJohn Reck2010-12-221-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3306953 Previously with BrowserProvider1 all bookmarks were considered visited URLs. Updated Browser.getAllVisitedUrls to match that behavior when using BrowserProvider2 Change-Id: I15e6e4e91af4e7d1b21860aabf4ce5a5c6a9d81e
* | | | | | | Merge "Fixing bugs 3315632 3235958, performing a clean up of the WebView ↵Svetoslav Ganov2011-01-042-17/+40
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | | | | | | | accessibility feature. Updated event hadndling to deliver all key events to javaScript if a screen reader is injected since the latter is responsible for the full set of navigation and exploration actions."
| * | | | | | Fixing bugs 3315632 3235958, performing a clean up of the WebView ↵Svetoslav Ganov2011-01-032-17/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | accessibility feature. Updated event hadndling to deliver all key events to javaScript if a screen reader is injected since the latter is responsible for the full set of navigation and exploration actions. Change-Id: Id1639828559161e0850dee04baa0a7afb2576ea8
* | | | | | | Merge "Make AwesomePlayer's reset process more verbose to track down ANRs."Andreas Huber2011-01-041-0/+14
|\ \ \ \ \ \ \
| * | | | | | | Make AwesomePlayer's reset process more verbose to track down ANRs.Andreas Huber2011-01-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I8c9fa872263796ba61b3e8de6bc05d50f57833f5 related-to-bug: 3302399
* | | | | | | | Preventive update-api as the build may break.Gilles Debunne2011-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id936a3edc1c603d13b28bdba4e5f4652def454f9
* | | | | | | | Multi-line EditText background is set using a state. Step 2.Gilles Debunne2011-01-048-53/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change 86347 for Step 1. New state_multiline state flag, handled in TextView drawable background drawables. Change-Id: I230df16c7ddee3296da180fd80ef341a4ac17dc0
* | | | | | | | Multi-line EditText background is set using a state.Gilles Debunne2011-01-044-21/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Step 1/2: remove the previous code that relied on a specific theme attribute. Bug 3214105 Change-Id: Ib4fc55a9093d64e69ac798ec56503ccdb284cbec
* | | | | | | | Text selection is preserved upon device rotation.Gilles Debunne2011-01-041-5/+23
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Note that this used to create problems with ExtractEditText. These potential issues were not handled in that CL. Bug 3236848 Change-Id: I4b83ce8f66eba04f34c2faa8e38b83eb992637f0
* | | | | | | Merge "LayoutLib: Misc javadoc fixes."Xavier Ducrohet2011-01-045-15/+15
|\ \ \ \ \ \ \
| * | | | | | | LayoutLib: Misc javadoc fixes.Xavier Ducrohet2011-01-035-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iabe081c20b361b034c2e66b975b8756c0fdcd3d1
* | | | | | | | am c5caaf5f: am 8f49c025: Merge "Added response flags and DSFID extras for ↵Nick Pelly2011-01-032-0/+20
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NfcV technology (API part)." into gingerbread * commit 'c5caaf5ff816a664939f305ead1091eb2c02cbf5': Added response flags and DSFID extras for NfcV technology (API part).
| * \ \ \ \ \ \ \ am 8f49c025: Merge "Added response flags and DSFID extras for NfcV ↵Nick Pelly2011-01-032-0/+20
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | technology (API part)." into gingerbread * commit '8f49c025ca5b4ed84290fb9e5e0b7acb1c139b35': Added response flags and DSFID extras for NfcV technology (API part).
| | * \ \ \ \ \ \ \ Merge "Added response flags and DSFID extras for NfcV technology (API ↵Nick Pelly2011-01-032-0/+20
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | part)." into gingerbread
| | | * | | | | | | | Added response flags and DSFID extras for NfcV technology (API part).Martijn Coenen2011-01-042-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed a missing assignment in NfcB technology. Change-Id: Ic564a0a17a9638c11fa528056da40f74ed37e9e6
* | | | | | | | | | | am d81c68c3: am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, ↵Nick Pelly2011-01-031-7/+20
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | | | | | / / / / / / | |_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | expand javadoc." into gingerbread * commit 'd81c68c31e916fa201f4cd608261afa4d1f0adb6': Tweak Ndef.getType() API. Rename constants, expand javadoc.
| * | | | | | | | | am a743448a: Merge "Tweak Ndef.getType() API. Rename constants, expand ↵Nick Pelly2011-01-031-7/+20
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | javadoc." into gingerbread * commit 'a743448a1b34d950b1e6f06e308ce113cbc9abcb': Tweak Ndef.getType() API. Rename constants, expand javadoc.
| | * | | | | | | | Merge "Tweak Ndef.getType() API. Rename constants, expand javadoc." into ↵Nick Pelly2011-01-031-7/+20
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | Tweak Ndef.getType() API. Rename constants, expand javadoc.Nick Pelly2011-01-041-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d2c83411411fea4ef46bb7c30ebdbcd9ee3e7d8
* | | | | | | | | | am a3e4293c: am 163bd407: Merge "Added getType() to NDEF technology class ↵Nick Pelly2011-01-031-0/+19
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (API part)." into gingerbread * commit 'a3e4293cdc7d09ac93c95d233e4052ac4435773e': Added getType() to NDEF technology class (API part).
| * | | | | | | | | am 163bd407: Merge "Added getType() to NDEF technology class (API part)." ↵Nick Pelly2011-01-031-0/+19
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into gingerbread * commit '163bd407492bbadcdc8f0759191e1b9142d06859': Added getType() to NDEF technology class (API part).
| | * | | | | | | | Merge "Added getType() to NDEF technology class (API part)." into gingerbreadNick Pelly2011-01-031-0/+19
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Added getType() to NDEF technology class (API part).Martijn Coenen2011-01-041-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idfa391dd9d4a401e1daa3dc90ca57e4a3d9e0fa3
* | | | | | | | | | am 30ce5f85: am 8c09ef91: Merge "Removed selectAid() from IsoDep." into ↵Nick Pelly2011-01-031-15/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit '30ce5f8567df2132736486bb93a60f49582508ec': Removed selectAid() from IsoDep.
| * | | | | | | | | am 8c09ef91: Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-031-15/+0
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8c09ef91aef0706a012e449ba3d16c03e0d64508': Removed selectAid() from IsoDep.
| | * | | | | | | | Merge "Removed selectAid() from IsoDep." into gingerbreadNick Pelly2011-01-031-15/+0
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Removed selectAid() from IsoDep.Martijn Coenen2011-01-041-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's a convenience method that can be implemented with transceive(); not really needed for now. Change-Id: Idd855c85b15d97ae679d11d908834be3cb2741d8
* | | | | | | | | | am 7e4d74f7: am 4b94dee8: Merge "Added transfer/restore convience cmds to MF ↵Nick Pelly2011-01-031-2/+29
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Classic tech." into gingerbread * commit '7e4d74f7b9355e8abd6e2fa30e284c9116a08998': Added transfer/restore convience cmds to MF Classic tech.
| * | | | | | | | | am 4b94dee8: Merge "Added transfer/restore convience cmds to MF Classic ↵Nick Pelly2011-01-031-2/+29
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tech." into gingerbread * commit '4b94dee8336a1135e4fc67a5911223bb5aabad99': Added transfer/restore convience cmds to MF Classic tech.
| | * | | | | | | | Merge "Added transfer/restore convience cmds to MF Classic tech." into ↵Nick Pelly2011-01-031-2/+29
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread
| | | * | | | | | | | Added transfer/restore convience cmds to MF Classic tech.Martijn Coenen2011-01-041-2/+29
| | | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I675993bc3aae6a741d63be458a0dfea240dd5316
* | | | | | | | | | Merge "Fix bug 3300456 - Prevent duplicate action bar backgrounds in shared ↵Adam Powell2011-01-031-0/+3
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container"
| * | | | | | | | | | Fix bug 3300456 - Prevent duplicate action bar backgrounds in sharedAdam Powell2011-01-031-0/+3
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | container Change-Id: I8edb99739be43c7ee82eb4dc4b82a9be17f92d0c
* | | | | | | | | | Merge "Again maybe fix issue #3169193..."Dianne Hackborn2011-01-031-2/+5
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Again maybe fix issue #3169193...Dianne Hackborn2011-01-031-2/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...com.google.android.youtube: java.lang.NullPointerException at com.google.android.youtube.async.UserAuthorizer$3.onCancel(UserAuthorizer.java:324) Only perform one cancel callback for a particular start of the dialog. Change-Id: Ib448fcae2489a63c9b63affdc518658447e90920
* | | | | | | | | | Merge "Fix a layout alignment issue in RingtonePickerActivity."Amith Yamasani2011-01-031-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix a layout alignment issue in RingtonePickerActivity.Amith Yamasani2010-12-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3307324
* | | | | | | | | | | Merge "Fixed the NumberPicker to adjust to the closest value while ↵Svetoslav Ganov2011-01-031-2/+13
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | scrolling/flinging"
| * | | | | | | | | | Fixed the NumberPicker to adjust to the closest value while scrolling/flingingSvetoslav Ganov2011-01-031-2/+13
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I782603d9a187d0ce9196e3fc90f28e372637584c