summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Additional changes to SubscriptionManager API as per API council.Wink Saville2014-11-2221-493/+601
| | | | | bug: 17575308 Change-Id: Idd98aa46c15a9219ccf28091c62602ac8bf16c62
* am fbdfdef4: am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese ↵Joe Fernandez2014-11-223-898/+0
|\ | | | | | | | | | | | | Lollipop translations, fixing zh-cn resources * commit 'fbdfdef43da5d946e8559d47d8bd79db0bceedb1': docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
| * am 9034ead0: am 5b94d00b: docs: URGENT Removing Chinese Lollipop ↵Joe Fernandez2014-11-213-898/+0
| |\ | | | | | | | | | | | | | | | | | | translations, fixing zh-cn resources * commit '9034ead0ba8ce1d0c8c162d9516ca188b783d407': docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
| | * am 5b94d00b: docs: URGENT Removing Chinese Lollipop translations, fixing ↵Joe Fernandez2014-11-213-898/+0
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | zh-cn resources * commit '5b94d00b896b2bbc71a0c925e92e8c7e08978975': docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resources
| | | * docs: URGENT Removing Chinese Lollipop translations, fixing zh-cn resourcesJoe Fernandez2014-11-213-898/+0
| | | | | | | | | | | | | | | | | | | | | | | | - Chinese pages are showing Japanese (not good) - Chinese resource page is not rendering because of bad video links Change-Id: Ia4508c2db85b9cbd5bdad34ae8bedc411df98360
* | | | am 63108ee3: am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 ↵Scott Rowe2014-11-221-0/+44
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs * commit '63108ee3623cc2b57c3a0a2e730dc9bf5c06c825': docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
| * | | am 02cb1fe6: am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update ↵Scott Rowe2014-11-211-0/+44
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs * commit '02cb1fe6c4a12c15ef44c2982fcab71ba6346c9b': docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
| | * | am 14f78ed7: Merge "docs: b/17996176 [DAC-review-bug] Update Hardware ↵Scott Rowe2014-11-211-0/+44
| | |\ \ | | | |/ | | | | | | | | | | | | | | | | | | | | Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs * commit '14f78ed7b8c374017fa37f29cfed2208a072ea28': docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
| | | * Merge "docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table ↵Scott Rowe2014-11-211-0/+44
| | | |\ | | | | | | | | | | | | | | | to API 21 Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31" into lmp-docs
| | | | * docs: b/17996176 [DAC-review-bug] Update Hardware Accelerated Table to API 21Scott Rowe2014-11-071-0/+44
| | | | | | | | | | | | | | | | | | | | Change-Id: I3bb972cc1defd3e6fa6295664e41311b85698f31
* | | | | Merge "Make default carrier name string look better." into lmp-mr1-devSanket Padawe2014-11-211-1/+1
|\ \ \ \ \
| * | | | | Make default carrier name string look better.Sanket Padawe2014-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18390441 Change-Id: Ib1575dd0f46535d9d4ad0106c4dcd59f6d928147
* | | | | | Merge "It's super critical to call nStart" into lmp-mr1-devJohn Reck2014-11-212-8/+33
|\ \ \ \ \ \
| * | | | | | It's super critical to call nStartJohn Reck2014-11-212-8/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18204974 Even if we are canceling or ending an animation nStart() *must* be called, otherwise the native-side listener is not attached (lazy-attached for JNI cyclic reference reasons), and then Animator::callOnFinishedListener() no-ops as there's no listener set Add a lifecycle verifier to ensure that nStart is always called on animators that are attached and get finished Change-Id: Ibc345b5be97b6d3f95a11c361ebe020d030fd3b6
* | | | | | | Merge "Reset the task stack instead of the view when Recents is hidden. ↵Winson Chung2014-11-217-85/+50
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | (Bug. 18436876, Bug. 18394126, Bug. 18432310)" into lmp-mr1-dev
| * | | | | | | Reset the task stack instead of the view when Recents is hidden. (Bug. ↵Winson Chung2014-11-217-85/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 18436876, Bug. 18394126, Bug. 18432310) This will remove the need for having all the null checks in TaskStackView. We also remove the check when launching tasks (the fail case is worse when the activity fails to load). And the CL also fix the header focus animation, and an issue with tasks not getting laid out when the stack is set again. Change-Id: I9b4cd50d76f72ba3d16dd1b8e2d9bbf9f1f24d2b
* | | | | | | | Merge "Avoid NPE in forceStopPackageLocked()." into lmp-mr1-devJeff Sharkey2014-11-211-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Avoid NPE in forceStopPackageLocked().Jeff Sharkey2014-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18477180 Change-Id: I5d91ae11ed2fd6e1e67e54d83fa945bb4dcee221
* | | | | | | | | Merge "Treat screen-on while pausing as pause timeout." into lmp-mr1-devCraig Mautner2014-11-211-0/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Treat screen-on while pausing as pause timeout.Craig Mautner2014-11-201-0/+4
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If an activity is started pausing when the screen turns off and hasn't completed pausing by the time the screen turns back on then we will end up showing the activity below it when the pause times out. In particular pausing the secure camera exposes the activity on the top of the stack if you turn the screen off and back on immediately. Immediately forcing the existing pause to complete when the screen comes back on allows the keyguard to obscure anything that might otherwise be shown. Fixes bug 17713150. Change-Id: Ibe275991aa325a7d326bf2a24511aeb4dcbb7e1b
* | | | | | | | | Merge "Supporrt tapas build for vector tests" into lmp-mr1-devztenghui2014-11-212-1/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Supporrt tapas build for vector testsztenghui2014-11-212-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Such that UX team has less pain on building the VD / AVD assets. This also requires removing internal API dependence in the test. To build the VectorDrawableTest with prebuilt SDK. <root dir>/tapas VectorDrawableTest <root dir>/make -j64 showcommand Then later for incremental build. <root dir>/mmm ./frameworks/base/tests/VectorDrawableTest/ -j20 b/18260896 Change-Id: Id559074df78d7c2a5c529c545834da23986bc15f
* | | | | | | | | | Merge "Different messages when wiping user and not device" into lmp-mr1-devAmith Yamasani2014-11-215-24/+145
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Different messages when wiping user and not deviceAmith Yamasani2014-11-215-24/+145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are 3 types of users 1. Primary - device will be wiped 2. Managed profile - profile will be removed 3. Secondary user - user will be removed Show different messages for almost wipe and wipe in each of these 3 cases. Bug: 16843155 Change-Id: Icecfe520622773da9e45465bf2217e8ed38b266e
* | | | | | | | | | | Merge "Revert "Add a way to override Xfermode DO NOT MERGE"" into lmp-mr1-devChris Craik2014-11-215-62/+12
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "Add a way to override Xfermode DO NOT MERGE"Chris Craik2014-11-215-62/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Feature no longer needed. bug:18448377 This reverts commit 4678dcc5524258908eadc5fe1e5e1874768967eb. Change-Id: Ib0a19946e966a54857165555827b5fa7b34b6bea
* | | | | | | | | | | | Merge "Lightweight checkin output for network stats." into lmp-mr1-devJeff Sharkey2014-11-219-54/+295
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Lightweight checkin output for network stats.Jeff Sharkey2014-11-219-54/+295
| | |_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define and print a compact version of network statistics when dump is requested with the "--checkin" flag. Defaults to last 24 hours, but included data can be tweaked with various flags. Groups together detailed network identities into larger umbrella terms like "mobile" and "wifi." Bug: 18415963 Change-Id: I70cf9c828ea5c6e5bb6884837d3608f66fbad2e6
* | | | | | | | | | | | Merge "resolved conflicts for merge of 694c1d2b to lmp-mr1-dev" into lmp-mr1-devJeff Brown2014-11-216-177/+214
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ resolved conflicts for merge of 694c1d2b to lmp-mr1-devJeff Brown2014-11-216-177/+214
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9a9b724e0fd12aa161ff276540431b9d8e218e2b
| | * | | | | | | | | | | Merge "Support keeping activities resumed while dozing." into lmp-sprout-devJeff Brown2014-11-215-177/+212
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Support keeping activities resumed while dozing.Jeff Brown2014-11-205-177/+212
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the lock screen is not shown, then let activities keep running while dozing. This is important to support ambient mode on watches since it allows the home app to keep running. To make this possible, we need to inform the activity manager about the exact wakefulness state, not just the overall boolean interactive state. Bug: 18284212 Change-Id: Ia35c99127ce51ffc178f3a2f51fca67d24061c71
* | | | | | | | | | | | | | Merge "CEC: Enable log for non-user builds" into lmp-mr1-devJinsuk Kim2014-11-211-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | CEC: Enable log for non-user buildsJinsuk Kim2014-11-221-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This helps get better bugreports for dogfooding. Accompanying bug will be kept track of to ensure the log is turned off before shipping. See ag/175890 for reference. Bug: 18471978 Change-Id: Ic67d64526fee3c52fee6c7f1e0201ead4ae6a3e7
* | | | | | | | | | | | | | Merge "Improve GridLayout's weight calculations" into lmp-mr1-devYigit Boyar2014-11-211-24/+57
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Improve GridLayout's weight calculationsYigit Boyar2014-11-191-24/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This CL improves the method by which excess space is distributed in GridLayout. Previously, GridLayout would assume weights were arranged in a 'line' and sum the weights in the assumed line to figure out the proportional allocation to each view. The system involved running GridLayout's internal constraint solver twice. Behavior was unspecified (and surprising) when weights appeared in views that were not linked together linearly, typically leaving the last view in each axis with more space than expected (in GridLayout's Bellman-Ford constraint solver, remaining space goes to the last span of the axis). This CL changes the weight distribution mechanism to effectively integrate it with the Bellman-Ford constraint resolution algorithm. It does this by returning a boolean value from the constraint solver saying whether or not the constraints could be solved and then using a binary chop to find a maximum amount of space that can be distributed without violating the constraints. This implementation runs the solver log(<axis size> * <number of Views>) times until finding the maximum amount of space that can be distributed according to the weights without causing a contradiction. We expect the cost of this variation to be around a factor of 10 worse than the previous implementation but to provide a simple and general definition of space distribution via weights that will be open to many future optimizations. As a side effect, this CL also fixes a bug in GridLayout where remaining space was distributed only along the major axis. Bug: 17485996 Change-Id: I120f39e95e90b5b35072ef8a6c348ec541aae42a
* | | | | | | | | | | | | | | Merge "Make default windows features configurable." into lmp-mr1-devBryce Lee2014-11-215-3/+36
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Make default windows features configurable.Bryce Lee2014-11-215-3/+36
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18434078 Change-Id: I0bafce1a201088a8681f4b9e43237e23b49296a2
* | | | | | | | | | | | | | | | Merge "Add multi-sim support to keyguard" into lmp-mr1-devJim Miller2014-11-2110-96/+344
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Add multi-sim support to keyguardJim Miller2014-11-2010-96/+344
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use new telephony APIs. Clean up SIM state machine code. Use cached copy of SubscriptionInfo. Make SIM PIN and SIM PUK work. Tested on single and multi-SIM devices. Fixes bug 18147652 Change-Id: Ic69a4d2898999a5438e6a70b5851705bc05443f1
* | | | | | | | | | | | | | | | Merge "Explicitly specify user for public mode" into lmp-mr1-devAdrian Roos2014-11-212-1/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Explicitly specify user for public modeAdrian Roos2014-11-212-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18417850 Change-Id: I9d564a47fe66cb8035d73c8a2eedb912920410a2
* | | | | | | | | | | | | | | | | Merge "String literals for CL ag/586597" into lmp-mr1-devRubin Xu2014-11-212-0/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | String literals for CL ag/586597Rubin Xu2014-11-212-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mini-CL to get the strings in for translations. Bug: 17657954 Change-Id: Ibbe053b886dadf0f42b3b830c44e86b0df158727
* | | | | | | | | | | | | | | | | Merge "Camera2: Doc updates for aeExposureCompensation." into lmp-mr1-devRuben Brunk2014-11-211-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Camera2: Doc updates for aeExposureCompensation.Ruben Brunk2014-11-201-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18467471 Change-Id: I3c270c535fa5e7f3eb40bd699898a759c07d986b
* | | | | | | | | | | | | | | | | Merge "Shutdown backup manager service when device owner is set" into ↵Zoltan Szatmary-Ban2014-11-211-0/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | | | | | | | | | | | Shutdown backup manager service when device owner is setZoltan Szatmary-Ban2014-11-131-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16641441 Change-Id: I3fe54e43324c15dabd56834a923e8e8cb4eea98d
* | | | | | | | | | | | | | | | | | Merge "Adding method to query backup manager service activity status" into ↵Zoltan Szatmary-Ban2014-11-212-1/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / | | | | / / / / / / / / / / / / / / | |_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | | | | | | | | | | Adding method to query backup manager service activity statusZoltan Szatmary-Ban2014-11-122-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 17367491 Change-Id: I9920c07d56c4c0ccb1f3dce637c0fb390902d2ff
generated by cgit v1.1 at 2025-01-25 18:37:46 +0000