summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Make SENSOR orientation modes trump rotation lock.Jeff Brown2011-10-054-13/+22
| | | | | | Bug: 5371750 Change-Id: I4d18b6c8ba1de0afd5929ddb8d7123272e35fbe2
* Merge "Wrapping new API with #defines to prevent old apps from using them."Jason Sams2011-10-055-1/+16
|\
| * Wrapping new API with #defines to prevent old apps from using them.Alex Sakhartchouk2011-09-285-1/+16
| | | | | | | | Change-Id: Ib3a2d19544ad72987ebec09d465bec8eeb6423c8
* | Merge "Streamline the layers update codepath. Directly update the layers ↵Nicolas Roard2011-10-051-5/+13
|\ \ | | | | | | | | | transform and position. This makes updates faster and less dependent on other webkit work."
| * | Streamline the layers update codepath.Nicolas Roard2011-10-041-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | Directly update the layers transform and position. This makes updates faster and less dependent on other webkit work. bug:5218173 Change-Id: I5f784ef64eda1be3cee406aa23702e5378c8de9e
* | | Turn off logging.Dianne Hackborn2011-10-051-1/+1
| | | | | | | | | | | | Change-Id: I5b050e33fe918c08b24091c6ccb9c5fe2b01d496
* | | Merge "Always unfreeze display."Dianne Hackborn2011-10-051-1/+1
|\ \ \
| * | | Always unfreeze display.Dianne Hackborn2011-10-041-1/+1
| | | | | | | | | | | | | | | | Change-Id: I7a0f3be49fe723fe59cf6268861bc5fe7f49bc62
* | | | Merge "Some new ICS target SDK changes."Dianne Hackborn2011-10-051-0/+10
|\ \ \ \
| * | | | Some new ICS target SDK changes.Dianne Hackborn2011-09-221-0/+10
| | | | | | | | | | | | | | | | | | | | Change-Id: I5a500a5faddadbcb98bf181ad413c6d9fd7e663e
* | | | | Merge "Fix issue #5348948: Third Party app "Byki Turkish" shows..."Dianne Hackborn2011-10-052-12/+19
|\ \ \ \ \
| * | | | | Fix issue #5348948: Third Party app "Byki Turkish" shows...Dianne Hackborn2011-10-042-12/+19
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...a tiny dialog (works fine in GB and HC) I found two problems: - When first binding an application, we were not correctly computing the compat configuration. - When retrieving the display metrics to hand to Resources, we were using the one with compat applied. This is not right, because Resources will apply the compat itself, so in some cases the compat scaling was applied twice. Change-Id: I22c9cfed9e271290c1a7544fa3ffa54a2e65daf9
* | | | | Merge "Set crop params to ANative Window during Initialization."Andreas Huber2011-10-052-16/+24
|\ \ \ \ \
| * | | | | Set crop params to ANative Window during Initialization.Lakshman Gowda2011-10-052-16/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The native_window_set_crop() is called when port reconfig event callback comes from decoder's and crop parameters are changed from default getconfig() OMX_IndexConfigCommonOutputCrop values. Since the default crop params are same as port reconfig crop params, the native_window_set_crop() is not called, hence resulting in displaying the whole frame(paddedWidth x paddedHeight). By calling native_window_set_crop() during initilaization of output port of decoder ensures in setting up ANative window to crop region. Change-Id: I68926464a1f5c7e6053804615c8b9bd32ea85688 Signed-off-by: Lakshman Gowda <lakshman79@ti.com>
* | | | | | Merge "Handle unexpected interface up/down events"Irfan Sheriff2011-10-051-2/+21
|\ \ \ \ \ \
| * | | | | | Handle unexpected interface up/down eventsIrfan Sheriff2011-10-041-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WEXT on crespo has an issue where the interface up/down events can happen in an unexpected fashion. At a driver start, we can go from interface disabled to interface enabled, back to interface disabled and then eventually into an interface enabled state. Earlier, we were just expecting a single interface enable event that would trigger driver specific commands. Now, we just handle these events as individual driver stop and driver start situations so that we do appropriate things eventually Bug: 5239853 Change-Id: I6bd5d844edf9fadfdca4e8eb753c2ba738aa6ad5
* | | | | | | Merge changes I447cd196,I0c6cdae4Steve Block2011-10-053-41/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * changes: SSL-related cleanup in BrowserFrame and SslCertLookupTable Clean up SslErrorHandlerImpl
| * | | | | | | SSL-related cleanup in BrowserFrame and SslCertLookupTableSteve Block2011-10-052-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Fix a comment in BrowserFrame.certificate() - Simplify SslCertLookupTable by not storing 'deny' decisions. We only need to store 'allow' decisions, as we don't re-use 'deny' decisions. No change in behaviour. Bug: 5409251 Change-Id: I447cd1966fbb6c2dea8088b2e4c4e2de22405cb9
| * | | | | | | Clean up SslErrorHandlerImplSteve Block2011-10-051-34/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Use assert rather than junit.framework.Assert - Add some comments - There's no need for checkSslPrefTable() to call handleSslErrorResponse() as we'll never update the table. Instead call LoadListener.handleSslErrorResponse() directly. No functional change. Bug: 5409251 Change-Id: I0c6cdae43fa966f86f4a6c43b74c2f2a01f60319
* | | | | | | | Merge "Fix BrowserFrame to construct SslError using the full URL, rather ↵Steve Block2011-10-053-13/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | than the host"
| * | | | | | | Fix BrowserFrame to construct SslError using the full URL, rather than the hostSteve Block2011-10-053-13/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android-git.corp.google.com/g/#/c/133348 changed BrowserFrame to construct the SslError using only the host. This was done so that we match on just the host component of the URL when re-using previous decisions in case of an SSL error. It also means that the browser displays only the host when it shows the SSL error dialog. This change fixes BrowserFrame to pass the full URL to SslError. We modify SslCertLookupTable to keep the existing behaviour regarding matching on only the host component. There's no need to change Browser to continue displaying only the host as I think this change was an unintentional side-effect. Also remove dead code-path in BrowserFrame.reportSslCertError(). This method is used only with the Chromium HTTP stack. This code was added in https://android-git.corp.google.com/g/#/c/121023. No functional change. Bug: 5410252 Change-Id: Ief2dbf4558095fb6fa7ab0caac7d37fa4f640b66
* | | | | | | | Merge "docs: Camera class JavaDoc FixIts for ICS"Joe Fernandez2011-10-051-10/+14
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | docs: Camera class JavaDoc FixIts for ICSJoe Fernandez2011-10-041-10/+14
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | Change-Id: I03d96247d149baf82c53b33aa7737fca11906ce6
* | | | | | | Merge "Allow listeners to be set before the service connects."Narayan Kamath2011-10-051-15/+21
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Allow listeners to be set before the service connects.Narayan Kamath2011-10-041-15/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5408876 Change-Id: Ib7b2ad56c74e24cc84b55ce748053b80eb0f66e8
* | | | | | | Merge "Clean up SslError"Steve Block2011-10-051-59/+49
|\ \ \ \ \ \ \
| * | | | | | | Clean up SslErrorSteve Block2011-10-041-59/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Don't use runtime exceptions for programming errors - Avoid code duplication - Tweak JavaDoc for public API Bug: 5248376 Change-Id: I5a88e5d444094efd44cce323e92f279840cf857f
* | | | | | | | Fix 5317948: Don't display facelock when transport controls are showing.Jim Miller2011-10-041-6/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0061fa9ec184846b0ed82c977a2e48b36cb079af
* | | | | | | | Merge "LayoutLib: fix support for textScaleX."Xavier Ducrohet2011-10-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | LayoutLib: fix support for textScaleX.Xavier Ducrohet2011-10-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I821191a40012e9727b4a3573d580483c3ae1de48
* | | | | | | | | Merge "Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0"Romain Guy2011-10-041-23/+9
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Canvas.getClipBounds() was broken and unreliable with OpenGL ES 2.0Romain Guy2011-10-041-23/+9
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was affecting several third party applications. The bug was introduced by an optimization that prevented the local clip to be recomputed when needed. Change-Id: I7b5c464db21b5ff1a7274af75a3a64d0e9d84772
* | | | | | | | Merge "Layoutlib: Typeface support for loading fonts manually."Xavier Ducrohet2011-10-042-6/+61
|\ \ \ \ \ \ \ \
| * | | | | | | | Layoutlib: Typeface support for loading fonts manually.Xavier Ducrohet2011-10-042-6/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the font being loaded is a system font, then we can find the font file and manually load it. Change-Id: I95473b1f1b88df64316b77c41ed05d4d09ab61ed
* | | | | | | | | Merge "Layoutlib now parses system_fonts.xml instead of its own."Xavier Ducrohet2011-10-043-227/+135
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Layoutlib now parses system_fonts.xml instead of its own.Xavier Ducrohet2011-10-043-227/+135
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also parse fallback_fonts. This lets layoutlib automatically use the same fonts as the base platforms, for instance it now uses the new ICS fonts. Change-Id: Id6e778dc0e3f2a9112601e0eaf8499a9713ec433
* | | | | | | | | Merge "Adding a flag for if biometric weak has ever been used"Danielle Millett2011-10-041-0/+14
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adding a flag for if biometric weak has ever been usedDanielle Millett2011-10-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag will be used to show a tutorial screen first time it is used. The flag is set to true once facelock has been set (via the savePassword or savePattern when in fallback mode) Change-Id: I43e3f876810fd32d3d5a5a285201e8054c4b3098
* | | | | | | | | | Merge "Fix issue #5388352: font size change back to normal"Dianne Hackborn2011-10-041-0/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix issue #5388352: font size change back to normalDianne Hackborn2011-10-041-0/+1
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is another place where we are messed up by the stupid default Configuration having a 1.0 font scale. Argh. Change-Id: Iaa2550d4edab92fb8a52f98fbb9fd8ef5fab94b5
* | | | | | | | | | Merge "Revert "Fix bug #5387832 [UI/Visual] Address of the website is not ↵Fabrice Di Meglio2011-10-043-13/+9
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | displayed properly(second line of the address is partly shown)""
| * | | | | | | | | | Revert "Fix bug #5387832 [UI/Visual] Address of the website is not displayed ↵Fabrice Di Meglio2011-10-043-13/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | properly(second line of the address is partly shown)" This reverts commit a130e5f59dc6b2117e4c1a8ffef54828e9ea44c7
* | | | | | | | | | | Merge "Make prompt for headset while typing a password if accessibilbity is ↵Svetoslav Ganov2011-10-042-17/+25
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on less verbose."
| * | | | | | | | | | | Make prompt for headset while typing a password if accessibilbity is on less ↵Svetoslav Ganov2011-10-042-18/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | verbose. If accessibility is enabled and there is no headset we do not speak the pressed keys. In such a case we provide a prompt to the blind user to use a headset. This was announced on every keypress which is quite annoying. Now this is announced only once. bug:5342234 Change-Id: Ibe55ad991ad2153d09cde57b030544948fa0d73b
* | | | | | | | | | | | Merge "adding Android Beam sample"Scott Main2011-10-042-0/+12
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | |
| * | | | | | | | | | | adding Android Beam sampleRobert Ly2011-10-042-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I30df24bc41fe61ebaab29f23a8df54f2c9599394
* | | | | | | | | | | | Merge "Fix permission strings to match ICS-FactoryROM."Dave Santoro2011-10-041-6/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix permission strings to match ICS-FactoryROM.Dave Santoro2011-10-041-6/+7
| | |_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5394200 Change-Id: I2c6de49247c12d56d04304264dc7694987e4d28e
* | | | | | | | | | | | Merge "Add -nosystem flag to adb backup"Christopher Tate2011-10-043-12/+40
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add -nosystem flag to adb backupChristopher Tate2011-10-043-12/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it easy to back up everything that belongs to 3rd party apps, but nothing that comes with the system per se. If any system packages are explicitly named on the command line they will be included in the backup even if -nosystem was passed. So, for example, this will back up all 3rd party apps as well as system settings, but nothing else belonging to system-deployed apps: adb backup -all -nosystem com.android.provider.settings Bug 5361503 Change-Id: Iebe04b7d7027ca58b9f55e8eb7f219d6cca69269