summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* am ab1fb237: am 79106d1c: docs: Remove ADT-1 RMA form linkJoe Fernandez2015-06-051-8/+0
|\ | | | | | | | | * commit 'ab1fb23712c66286285ffdce2d1488c41565650f': docs: Remove ADT-1 RMA form link
| * am 79106d1c: docs: Remove ADT-1 RMA form linkJoe Fernandez2015-06-021-8/+0
| |\ | | | | | | | | | | | | * commit '79106d1cdea70d80a8e75655fa94cf794d0e91e0': docs: Remove ADT-1 RMA form link
| | * docs: Remove ADT-1 RMA form linkJoe Fernandez2015-06-021-8/+0
| | | | | | | | | | | | | | | | | | b/21320993 Change-Id: I5d3b192c69a1aa9c9ebbb16ce45b8ece0e44e164
* | | Merge "Fix Toolbar is not refreshed after Select All" into mnc-devClara Bayarri2015-06-052-3/+18
|\ \ \
| * | | Fix Toolbar is not refreshed after Select AllClara Bayarri2015-06-052-3/+18
| | | | | | | | | | | | | | | | | | | | Bug: 21361248 Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
* | | | Merge "AAPT2: Add manifest merging" into mnc-devAdam Lesinski2015-06-056-16/+599
|\ \ \ \ | |/ / / |/| | |
| * | | AAPT2: Add manifest mergingAdam Lesinski2015-06-046-16/+599
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that AAPT2 is library-aware, it needs to take care of all library related work, including merging manifests. The logic was taken from the current Java ManifestMerger. Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
* | | | Merge "Camera2: implement high speed video APIs" into mnc-devZhijun He2015-06-057-19/+375
|\ \ \ \
| * | | | Camera2: implement high speed video APIsZhijun He2015-06-047-19/+375
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21442271 Change-Id: Ia0ae5bbd3e8c81bad293c29987301a2457817d12
* | | | | Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-devDoris Liu2015-06-051-36/+55
|\ \ \ \ \
| * | | | | Make ListView's EdgeEffect respect the clipToPadding flagDoris Liu2015-06-041-36/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL sets the position of EdgeEffect based on whether clipToPadding is enabled. When enabled, the EdgeEffect will be bounded to the padding. Otherwise, it will be drawn at the view's bounds. Bug: 21595866 Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
* | | | | | Merge "Fix drawer selection to match Material spec." into mnc-devBen Kwa2015-06-053-6/+4
|\ \ \ \ \ \
| * | | | | | Fix drawer selection to match Material spec.Ben Kwa2015-06-043-6/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - highlighted text changed to match the application primary color - change highlighted background to light gray - remove highlight icon tinting (provides insufficient contrast against the new light gray background) BUG=18685226 Change-Id: I4040fa951fd2822cea324e0bd1924d10024b6a11
* | | | | | | Merge "Update the pdfium library - framework" into mnc-devSvet Ganov2015-06-053-9/+10
|\ \ \ \ \ \ \
| * | | | | | | Update the pdfium library - frameworkSvet Ganov2015-06-043-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4880e9310c02c6e26d4560fb8515f2ce51c597f4
* | | | | | | | Merge "Separate the SelectionActionMode into Insertion and Selection." into ↵Clara Bayarri2015-06-055-133/+185
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | Separate the SelectionActionMode into Insertion and Selection.Clara Bayarri2015-06-045-133/+185
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we got rid of the paste popup, we merged it into the Selection ActionMode and moved all its invocations to the ActionMode. Some apps actually want the paste popup without the Selection ActionMode, hence separating them again allows them to cancel the one they want. Bug: 21571422 Change-Id: I91bcd0d9c3e68d9c736698fe0bec010b4c9f5cf3
* | | | | | | | | Merge "TIF: Add sanitization code for the current position" into mnc-devDongwon Kang2015-06-051-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | TIF: Add sanitization code for the current positionDongwon Kang2015-06-041-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | + More documentation on the currnet position Bug: 21573422 Change-Id: I51d184d03a61270d3ea36b36f880f1f052a99cd1
* | | | | | | | | | Merge "Always have a handler for PendingIntents sent in the system process" ↵Wale Ogunwale2015-06-052-1/+17
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | | | | | into mnc-dev
| * | | | | | | | | Always have a handler for PendingIntents sent in the system processWale Ogunwale2015-06-042-1/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It is possible for deadlocks to occur when sending/processing PendingIntents due to components like AMS holding global service locks when dispatching the broadcast without specifying an handler and the receiver calling back into AMS. We now set a default handler to process the broadcast on if we are in the system process and a handler wasn't specified. Bug: 19502993 Change-Id: Iccde32c6c1df997784155bc41ef39e52ee0f7243
* | | | | | | | | | Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-devRoozbeh Pournader2015-06-042-8/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move NotoSansSymbols higher than CJK in the fallback chain.Roozbeh Pournader2015-06-042-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes sure that symbol characters who have both an alternative or "full-width" version in the CJK fonts and a more regular version in the symbols font get the default or "half-width" version by default in non-CJK locales. This is not a complete fix: such "full-width" symbol characters only exist in the Simplfied Chinese font for now, which means in Traditional Chinese, Japanese, and Korean locales, they characters would now appear "half-width", which *may* be sub-optimal. The complete fix would make sure the ones that actually need to be "full-width" in TC/J/K are also included in the TC/J/K font. Bug: 21525318 Bug: 21525012 Bug: 21524421 Bug: 21521330 Bug: 21520316 Bug: 21518544 Bug: 21517912 Bug: 21503807 Bug: 21502245 Bug: 21501669 Bug: 21525905 Bug: 21524018 Bug: 21503952 Bug: 21502678 Change-Id: I93cf7119b45ed3c080cd39d631a687e0ef9fd8ce
* | | | | | | | | | | Merge "Updates AlarmClock intent API." into mnc-devJohnson Hsieh2015-06-043-64/+87
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Updates AlarmClock intent API.Johnson Hsieh2015-06-043-64/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes to the AlarmClock intent API based on feedback from Alarm team: 1. s/VOICE_CANCEL_ALARM/DISMISS_ALARM/g - "Cancel" is a bit unclear, so we're changing it to "dismiss". Also, remove "VOICE_" since we should also add support for this in multi-modal. 2. Removed DELETE_ALARM - we will likely not complete this for Android M. 3. Removed ALARM_SEARCH_MODE_NONE = "none". Instead, if EXTRA_ALARM_SEARCH_MODE is missing (and alarm data URI is not given), then: * If exactly one active alarm exists, it is dismissed. * If more than one active alarm exists, the user is prompted to choose the alarm to dismiss. 4. Add ALARM_SEARCH_MODE_LABEL, which allows searching for alarms by a (partially) matching label. 5. Add SNOOZE_ALARM for snoozing an alarm, with optional extra EXTRA_ALARM_SNOOZE_DURATION. Change-Id: I39502532e54d5f0fe51a8545a4c586615f5e5e89
* | | | | | | | | | | | Merge "Report EditorInfo#packageName based on the actual uid." into mnc-devYohei Yukawa2015-06-041-1/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Report EditorInfo#packageName based on the actual uid.Yohei Yukawa2015-06-031-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a follow up CL for Ib871141e3381e45c2623c5f4d692da7a7e78fcc5, which introduced a verification mechanism between the applicaiton uid and EditorInfo#packageName reported from the application by using AppOpsManager#checkPackage. Regression Bug 21408239 caused by above change is really similar to the situation we saw in Bug 10688644. As well explained in the CL description of Ic04f77b3938585b02fccabbc12d2f0dc62b9ef25, the system has a special ability to run in the processes of other uids. Hence we need to use Context#getOpPackageName() instead of Context#getPackageName() in case components declared by the system is loaded into another process. Bug: 18931038 Bug: 21408239 Change-Id: I78510a2ea6ac06cfd5813a23c42f09f70c468493
* | | | | | | | | | | | | Merge "Change option label from "Duplex" to "Two-sided"" into mnc-devMakoto Onuki2015-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change option label from "Duplex" to "Two-sided"Makoto Onuki2015-06-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 21640154 Change-Id: Icab4754e0aeb23fc4da178e7306f5c7a74108c22
* | | | | | | | | | | | | | Merge "Manually jump ripples when preemptively aborting RT animation" into ↵Alan Viverette2015-06-041-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev
| * | | | | | | | | | | | | Manually jump ripples when preemptively aborting RT animationAlan Viverette2015-06-041-0/+4
| | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21079749 Change-Id: If79dcef59aba616c0446efc623863f563cb16250
* | | | | | | | | | | | | Merge "Speed up recents -> app #2" into mnc-devJorim Jaggi2015-06-042-28/+87
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Speed up recents -> app #2Jorim Jaggi2015-06-042-28/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Creating the thumbnail of the header for the transition was on the critical path for starting the activity. This moves it off this path by doing it after onPause(). Change-Id: Ic54a104d5ad4c40e88638566a3a69cc265a0a0fe
* | | | | | | | | | | | | | Merge "Speed up recents -> app" into mnc-devJorim Jaggi2015-06-045-7/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | Speed up recents -> appJorim Jaggi2015-06-045-7/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Because we created a bunch of layers, this delayed calling start activity in the window manager. Disable these layers, as they are not really needed. Change-Id: I59343a92726665f72215a0699c52ead76e78a4b3
* | | | | | | | | | | | | | Merge "Export KeyFactory backed by Android Keystore." into mnc-devAlex Klyubin2015-06-043-17/+133
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Export KeyFactory backed by Android Keystore.Alex Klyubin2015-06-043-17/+133
| | |_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The KeyFactory can be used to obtain information (KeyInfo) about Android Keystore private keys. Bug: 18088752 Change-Id: Ied1a69928f391537de6765cef7dc7d7241cf62bb
* | | | | | | | | | | | | | Merge "Iterate step of launch & iterate" into mnc-devJohn Reck2015-06-044-56/+97
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Iterate step of launch & iterateJohn Reck2015-06-044-56/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18052916 Tweaked colors, merged some categories Reduced significance of fast frames Increased visual weight of janky frames Change-Id: I5b4e86164c4d51debad7de0e0f8715dda34c7a60
* | | | | | | | | | | | | | | Merge "Make entering recents a lot faster" into mnc-devJorim Jaggi2015-06-047-43/+168
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / | |/| | | | | | | / / / / / / | |_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Make entering recents a lot fasterJorim Jaggi2015-06-047-43/+168
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Precache the bitmap for the window animation in the preload phase - Remove some post's so we have a faster path from UP -> startActivity - Don't dim the headers in the first frame drawn, because layer creation is slow. Instead, do it in the second frame, when the window animation is already running. All these changes combined make going to recents about 40-50ms faster. Change-Id: I3e4060af1ac57b3f359fe7f86f9e3814c6490323
| * | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-040-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | Fix buildDmitriy Ivanov2015-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21602590 Change-Id: Iffb9a7b74dc97bf30aea2014b0e3d2a96097291b
| | * | | | | | | | | | | | | SettingsLib/Wifi: Run pause/resumes on main threadJason Monk2015-06-031-12/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid our objects from disappearing out from under us. Bug: 21581533 Change-Id: Ia6fc9e56271f79c7d8b0f86f9c35351c39c35d29
| | * | | | | | | | | | | | | Fix NPE when requesting outsets for detached view.Filip Gruszczynski2015-06-031-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Outsets are used during measure/layout pass, but this can be called on a view that is not currently attached. Bug: 21602590 Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
| | * | | | | | | | | | | | | UsbDeviceManager: Don't unnecessarily touch propertiesNick Kralevich2015-06-031-3/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before setting the properties persist.sys.usb.config or sys.usb.config, check the existing values. If the values are the same as what we'd set it to, don't perform the set. Any USB property set, even if setting the property to the value it already has, triggers one of the "on property" triggers in system/core/rootdir/init.usb.rc . The script then reconfigures the driver unnecessarily, which causes instability and dropped connections when trying to use ADB. Avoid this instability by not performing property sets which would have no effect. Bug: 21404762 Bug: 18905620 Change-Id: Id3c2543308df994a0114a0661e20ca799c2dc0e8
| | * | | | | | | | | | | | | merge in mnc-release history after reset to mnc-devThe Android Automerger2015-06-030-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | Fix the NPE when checking mRebootReasonTao Bao2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21584198 Change-Id: Ie11092dbc771b54bd049d258dc705835a3eda494
| | | * | | | | | | | | | | | | Handle network info updates while scanning is pausedJason Monk2015-06-021-10/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21581533 Change-Id: I4216c3e9b64cb758e32dd93c39061f9d7a642ee0
| | | * | | | | | | | | | | | | Enabled WMS.DEBUG_STARTING_WINDOWWale Ogunwale2015-06-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To debug starting window issue reported in comment #38 of b/21384482 Bug 21384482 Change-Id: I2fbafda5fa79448057cf27a65d1be9b96894770e
generated by cgit v1.1 at 2025-01-15 00:12:53 +0000