summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add new Display API for secure video capabilities." into jb-mr1-devJeff Brown2012-10-0212-47/+69
|\
| * Add new Display API for secure video capabilities.Jeff Brown2012-10-0212-51/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | Added a new API to determine whether the display supports protected buffers so that an application can choose a different content stream or change how it decodes the content so that it will be viewable on the display. At present, wifi display does not fully support protected buffers although this may be enhanced in the future. Bug: 6986623 Change-Id: If53a53d72b0ec92753cc4b29f99fcb131e00449b
* | Merge "Send masked soft input mode into method." into jb-mr1-devCraig Mautner2012-10-021-4/+4
|\ \
| * | Send masked soft input mode into method.Craig Mautner2012-10-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sending the unmasked soft input mode int setAttachedWindowFrames included the SOFT_INPUT_STATE bits and guaranteed that the adjust test would always pass. Bug 7256294 Change-Id: Iaf5368432c7b350fe70687d08c0a08e814b35e94
* | | Merge "Up motion event not injected by the touch explorer at the end of a ↵Svetoslav Ganov2012-10-021-1/+15
|\ \ \ | | | | | | | | | | | | drag." into jb-mr1-dev
| * | | Up motion event not injected by the touch explorer at the end of a drag.Svetoslav Ganov2012-10-021-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. The up event was not injected when the last pointer went up, i.e. at the end of the drag. This patch sends an up event if the dragging pointer goes up for both cases, when the dragging pointer goes up first and when it goes up second. bug:7272830 Change-Id: I708a2b93ee2d0a4c46dbeea002841666e919602d
* | | | Merge "Fix bug #7266459 ↵Fabrice Di Meglio2012-10-021-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO" into jb-mr1-dev
| * | | | Fix bug #7266459 ↵Fabrice Di Meglio2012-10-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | android.widget.cts.TableLayoutTest#testColumnStretchableEffect failures on JO - do not ask for requestLayout() nor invalidate() in View.onMeasure() when resolving RTL properties Change-Id: I7961fcb4c046d96391a4e748350573534481ae2b
* | | | | Merge "Fix issue #7272775: Auto Start Apps Not Starting" into jb-mr1-devDianne Hackborn2012-10-022-13/+3
|\ \ \ \ \
| * | | | | Fix issue #7272775: Auto Start Apps Not StartingDianne Hackborn2012-10-022-13/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bad defaults were causing stopped state to be set at each boot. Change-Id: I49b04e9c62f6ac391054201b508fddb6c7985615
* | | | | | Merge "Fix package verification with multi-user" into jb-mr1-devrich cannings2012-10-021-7/+14
|\ \ \ \ \ \
| * | | | | | Fix package verification with multi-userrich cannings2012-10-021-7/+14
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes the porblem of PackageManagerService always sending Intents to user 0. Bug: 7272549 Change-Id: I25995d8b2b9a24346f4813e6d8d9a84e5d5d2b6b
* | | | | | Merge "Attempt to fix missing transport control in keyguard" into jb-mr1-devJim Miller2012-10-023-44/+51
|\ \ \ \ \ \
| * | | | | | Attempt to fix missing transport control in keyguardJim Miller2012-10-023-44/+51
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This attempts to fix a bug where the transport control would sometimes be inoperative. The problem is that we had two transport control layouts on some devices because they were being declared in the layout file. The fix is to only inflate the layout once when KeyguardHostView is created. Also removes redundant KeyguardStatusView. Fixes bug 7254833 Change-Id: Iab84e8326ff745ee57be5177ab2561114c8dc6f0
* | | | | | am a142be8e: (-s ours) am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE ↵Scott Main2012-10-020-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage * commit 'a142be8ea9003442b486e0a0f8558361b1525c93': DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
| * \ \ \ \ \ am 33b8f417: am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev ↵Scott Main2012-10-020-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage * commit '33b8f4175719b746ee290fd95478fae4643fad42': DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
| | * \ \ \ \ \ am 11f03b4b: (-s ours) DO NOT MERGE cherrypick from jb-dev Change-Id: ↵Scott Main2012-10-020-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage * commit '11f03b4b694f506ed5dcb7c12a9984b653f93b42': DO NOT MERGE cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage
| | | * | | | | | DO NOT MERGEScott Main2012-10-026-1/+906
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | cherrypick from jb-dev Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429 docs: android training - Data Storage Change-Id: I62b6d5385355555aa3e184bfd4418a0d2e0c1719
* | | | | | | | | Merge "Call Surface.destroy when Display is removed." into jb-mr1-devCraig Mautner2012-10-025-66/+129
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call Surface.destroy when Display is removed.Craig Mautner2012-10-025-66/+129
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Prevents leaked Surfaces. Bug: 7272421. Change-Id: I6c87eb11bb0bedcf8de451b04477c70c248f905d
* | | | | | | | | | Merge "Bring back Netflix progress bar Bug #7274157" into jb-mr1-devRomain Guy2012-10-021-0/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Bring back Netflix progress barRomain Guy2012-10-021-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7274157 Gradients and color filters are multiplied by the paint's color so it needs to be set to opaque black to have an effect. Change-Id: Ib5dd1e6185f758f55b57a0f4496dfae98f1a096b
* | | | | | | | | | Merge "Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean ↵Fabrice Di Meglio2012-10-021-8/+8
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 4.1.1" into jb-mr1-dev
| * | | | | | | | | | Fix bug #7274075 Non-functional CheckedTextView on Nexus 7 Jelly Bean 4.1.1Fabrice Di Meglio2012-10-021-8/+8
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This regression has been introduced by this Change: Ia846de16bbc54f0729608259aa4b530da9404245 - in CHOICE_MODE_SINGLE you need to clear the checked states before doing anything - rename variables for better readability too Change-Id: I89b4390e5ebb192ca280fea2c06f991b537a2870
* | | | | | | | | | Merge "Re-add default sms_short_codes." into jb-mr1-devRobert Greenwalt2012-10-022-0/+190
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Re-add default sms_short_codes.Robert Greenwalt2012-09-302-0/+190
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The new gservices-delivered file may not appear on all devices, so we should give better defaults. bug:7254595 Change-Id: Id525f7f101f92a203cc4135f293cbc3769c2a4e0
* | | | | | | | | | | am b847f0b5: am 04c63a40: docs: android training - Data StorageScott Main2012-10-026-1/+906
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b847f0b578d861647be4908fc3a8d575ba4d726b': docs: android training - Data Storage
| * | | | | | | | | | am 04c63a40: docs: android training - Data StorageScott Main2012-10-026-1/+906
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '04c63a4098293dd00aeaf561b05a33c04a8d7853': docs: android training - Data Storage
| | * | | | | | | | | docs: android training - Data StorageScott Main2012-10-026-1/+906
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9579a7eb04cb39d3b457dde390b6b2a7b240a429
* | | | | | | | | | | Merge "Add operator name to network notification" into jb-mr1-devIrfan Sheriff2012-10-021-6/+21
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add operator name to network notificationIrfan Sheriff2012-10-021-6/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7087564 Change-Id: Ibe7a09fc6858dfea5f65092777bbd6ca82177043
* | | | | | | | | | | am e81e42d7: (-s ours) Reconcile with jb-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e81e42d7a6bb1bc7b29d0a7d475f750b524e3fec': Show plmn in emergency call allowed mode.
| * | | | | | | | | | Reconcile with jb-release - do not mergeThe Android Open Source Project2012-10-020-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie81134aa556b0deb90dcba3d914d58558f3600a9
| | * | | | | | | | | | Show plmn in emergency call allowed mode.John Wang2012-09-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When emergency call is allowed, plmn string is used to pass up the "Emergency calls only" string. This change set showPlmn to true in that situation regardless the SIMRecords.SPN_RULE_SHOW_PLMN value. bug:7103854 Change-Id: I35ce0cc265d648191cb3b5f87261895f862143db
* | | | | | | | | | | | Merge "Draw stroked rectangle as meshes instead of textures Bug #7233734" ↵Romain Guy2012-10-022-5/+30
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | | Draw stroked rectangle as meshes instead of texturesRomain Guy2012-10-022-5/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #7233734 Stroked rectangles were rendered using software generated textures which would lead to slightly misaligned results. Instead, let's use the new convex path rendering code that will do the right thing (and save a lot of bandwidth.) Change-Id: Ib95ff581e56c1ecead97e4919298e6fd146ca167
* | | | | | | | | | | Merge "Disable quick settings for users until USER_SETUP_COMPLETE." into ↵John Spurlock2012-10-022-2/+41
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | | | | | Disable quick settings for users until USER_SETUP_COMPLETE.John Spurlock2012-10-022-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the current user has not yet made it through the setup wizard, disable the quick settings panel entirely. Use Settings.Secure.USER_SETUP_COMPLETE as the signal. This is a per-user setting, so be careful to observe only on the current user's behalf. Bug:6712493 Change-Id: I3076a8a550165a9eeccf7fb129d470ef4ddeaed4
* | | | | | | | | | | | Merge "Fix camera disambiguation in secure keyguard" into jb-mr1-devJim Miller2012-10-024-7/+43
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix camera disambiguation in secure keyguardJim Miller2012-10-014-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When there are multiple activities that respond to MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE we need to show the disambiguation dialog to the user. However the disambiguation "dialog" is actully an activity themed as a dialog. Hence, we can't show it in the secure keyguard. This works around the issue by prompting the user for their credentials directly when the intent needs disambiguation. This will take them out of keyguard and prompt them for which activity they want to use. We'll provide a more robust solution in a future release. Fixes bug 7109816 Change-Id: I94e643d3cb503e1ce6de24c82400b4d5fcbb9d95
* | | | | | | | | | | | | Merge "Migrate more System and Secure settings to Global." into jb-mr1-devJeff Sharkey2012-10-0210-120/+262
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Migrate more System and Secure settings to Global.Jeff Sharkey2012-10-0210-120/+262
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Includes telephony, WindowManager, PackageManager, and debugging settings. Update API to point towards moved values. Bug: 7231764, 7231252, 7231156 Change-Id: I5828747205708872f19f83a5bc821ed0a801cb79
* | | | | | | | | | | | | Merge "re-use status bar DateView in QuickSettings." into jb-mr1-devChris Wren2012-10-022-47/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | re-use status bar DateView in QuickSettings.Chris Wren2012-10-022-47/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7221083 Change-Id: Ic1cb7118d8e5f83a8e5e1101a609791a1e0fbab1
* | | | | | | | | | | | | | Merge "Fix jump cut when dismissing items in Recents" into jb-mr1-devMichael Jurka2012-10-021-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fix jump cut when dismissing items in RecentsMichael Jurka2012-10-021-3/+3
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (fixing horizontal scroll view in this CL... whoops). Bug: 7070897 Change-Id: I3a63799ce7f3d9a50869755ee3289e641fa82fa4
* | | | | | | | | | | | | Merge "Touch explorer and magnifier do not work well together." into jb-mr1-devSvetoslav Ganov2012-10-024-42/+64
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Touch explorer and magnifier do not work well together.Svetoslav Ganov2012-10-024-42/+64
| | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. If tocuh exploration and screen magnification are enabled and the screen is currently magnified, gesture detection does not work well. The reason is because we are transforming the events if the screen is magnified before passing them to the touch explorer to compensate for the magnification so the user can poke what he thinks he pokes. However, when doing gesture detection/velocity computing this compensating shrinks the gestured shape/ decreases velocity leading to poor gesture reco/incorrect velocity. This change adds a onRawMotionEvent method in the event transformation chain which will process the raw touch events. In this method of the touch explorer we are passing events to the gesture recognized and the velocity tracker. 2. Velocity tracker was not cleared on transitions out of touch exploring state which is the only one that uses velocity. bug:7266617 Change-Id: I7887fe5f3c3bb6cfa203b7866a145c7341098a02
* | | | | | | | | | | | Merge "Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry..." ↵Raph Levien2012-10-022-28/+16
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | | | | | | | | Fix for bug 7234184 F/TextLayoutCache: Failed to put an entry...Raph Levien2012-10-022-28/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This bug was triggered by user code concurrently mutating the character array while calling into a drawText method in another thread. When the value of the array changed, it caused inconsistent state, leading to assert failures. This is arguably bad behavior by the user code, but it shouldn't cause a native crash. The fix is to do a defensive copy of the text into the key, so the value is guaranteed to remain constant throughout the text layout process. The change is mostly deletion of code, because there was an optimization to try to avoid such a copy. That optimization was not actually effective, however, because the indexOfKey() operation in the KeyedVector underlying the TextLayoutCache did the copy anyway. Thus, even though this change looks like it's introducing a copy where there wasn't one before, the actual performance impact should be nil. Note that the ability to handle a mutating argument is now part of the contract for TextLayoutEngine::getValue(), and is now documented. That contract may change, as the result of future optimization. Also, care was taken to only use the value after the copy. Other performance issues with TextLayoutCache are tracked in bug 7271109. Change-Id: I9c90e8e4d501f3f37e2f22a7851f032808d46fbe
generated by cgit v1.1 at 2024-09-19 14:42:24 +0000