summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "PowerUI: Suppress warning on incremental drops." into lmp-mr1-devJohn Spurlock2014-10-291-0/+5
|\
| * PowerUI: Suppress warning on incremental drops.John Spurlock2014-10-291-0/+5
| | | | | | | | | | | | | | | | If the user explicitly dismisses the warning notification, don't update the notification until the next threshold value. Bug: 17691122 Change-Id: I840f33f787f1dd6f217de543a291bc9f65b1b046
* | Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-devJason Monk2014-10-291-1/+4
|\ \
| * | QS: Only hide grid if there is detail to showJason Monk2014-10-291-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the animation ends at the 'same' time as handleShowDetail is running it is possible for the grid content to get cleared by the animation callback just after it is shown in handleShowDetail. This checks mDetailRecord to avoid that chance. Bug: 18009138 Change-Id: Ia2951f44b5a1470321bf6580daf33917bbcb1ffd
* | | Merge "Listen for package changes for all users not just owner." into ↵Kenny Guy2014-10-291-7/+27
|\ \ \ | | | | | | | | | | | | lmp-mr1-dev
| * | | Listen for package changes for all users not just owner.Kenny Guy2014-10-281-7/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Listen for package changes for all users to cancel notifications for secondary users and profiles when an app is uninstalled. Bug: 18151696 Change-Id: I6921729e2878e1e5890411b173a56849eb2e0745
* | | | Merge "Reveal notification listener settings APIs." into lmp-mr1-devChris Wren2014-10-292-4/+4
|\ \ \ \
| * | | | Reveal notification listener settings APIs.Chris Wren2014-10-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant to be the actual value to which the settings app responds. Bug: 10023397 Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
* | | | | Merge "Be more conservative about current buffer" into lmp-mr1-devJohn Reck2014-10-291-5/+4
|\ \ \ \ \
| * | | | | Be more conservative about current bufferJohn Reck2014-10-271-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18065565 Change-Id: I0b9c85ecf384ebe525e3a38803ab77d7ee37f33a
* | | | | | Merge "Improve doze transitions" into lmp-mr1-devJorim Jaggi2014-10-296-37/+127
|\ \ \ \ \ \
| * | | | | | Improve doze transitionsJorim Jaggi2014-10-296-37/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change animates the status bar and the bottom area when exiting doze mode from touch. We also prevent all animations when exiting from other means, i.e. usually when the power button is pressed, so we don't have a distracting animation there. In addition, this also optimizes the scrim animations a bit in terms of interpolation and duration to make the experience smoother and cleans up some logic. Bug: 18146441 Bug: 17717584 Change-Id: I495ce480c25de24b6433adebdfe923b637d98f66
* | | | | | | Merge "Import translations. DO NOT MERGE" into lmp-mr1-devGeoff Mendal2014-10-2972-5/+797
|\ \ \ \ \ \ \
| * | | | | | | Import translations. DO NOT MERGEGeoff Mendal2014-10-2972-5/+797
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9ae72e34f8e819d5c8e8b3f5c96cd737d680bde0 Auto-generated-cl: translation import
* | | | | | | Merge "Tune spacing in navigation bar for small and big devices" into ↵Jorim Jaggi2014-10-295-24/+111
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | Tune spacing in navigation bar for small and big devicesJorim Jaggi2014-10-295-24/+111
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18032228 Change-Id: Ia187fa3c108b93f4ca74e109d3fa76e625b711e3
* | | | | | Cancel ripple animations when window is hiddenJorim Jaggi2014-10-292-12/+13
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 17737340 Change-Id: I0acb4bb20365634875489269bc84ade5161ea3ac
* | | | | Merge "Fix the length of a profiler system property" into lmp-mr1-devCalin Juravle2014-10-291-1/+1
|\ \ \ \ \
| * | | | | Fix the length of a profiler system propertyWei Jin2014-10-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes the profiler system property "dalvik.vm.profile.max-stack-depth" to "dalvik.vm.profile.stack-depth" so that the length of the option is less than PROP_NAME_MAX. Bug: 17294224 (cherry picked from commit 4d033e1c44c1b94ea5311713b8cc8bfb56bdcdd2) Change-Id: I10dd0b3bfa46b836def437a3822f6c48538167dd
* | | | | | Treat optimistic addresses as global preferred.Erik Kline2014-10-292-1/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the kernel sends notification of an optimistic address then treat is a useable address (isGlobalPreferred()). Note that addresses flagged as IFA_F_OPTIMISTIC are simultaneously flagged as IFA_F_TENTATIVE (when the tentative state has cleared either DAD has succeeded or failed, and both flags are cleared regardless). Additionally: do not consider RFC 4193 ULA addresses sufficient for "global preffered". They are, by definition, of global scope but not sufficient for global reachability. Bug: 17769720 Change-Id: I759623b28fd52758f2d4d76d167f3cafd9319d6a
* | | | | | Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-devJinsuk Kim2014-10-291-1/+15
|\ \ \ \ \ \
| * | | | | | CEC: Use language code "chi" for Traditional ChineseJinsuk Kim2014-10-291-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android by default returns "zho" for all sorts of Chinese variants. Use "chi" for traditional one used in Taiwan/Hong Kong/Macau as required in CEC standard. Bug: 18149804 Change-Id: I86ac7e2f0f1121641c52032a0d98a6405554457c
* | | | | | | Added a function to clear accounts for a specified package.Anthony Lee2014-10-281-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Right now, clearAcounts() only clears the accounts for the calling package. This new function will allow a class like PhoneAccoutBroadcastReceiver to clear accounts for any package. Bug: 17689845 Change-Id: I24db104268535e7e0e33e093e8fab63765df0b08
* | | | | | | Merge "Support more than one clatd at a time." into lmp-mr1-devLorenzo Colitti2014-10-295-134/+170
|\ \ \ \ \ \ \
| * | | | | | | Support more than one clatd at a time.Lorenzo Colitti2014-10-295-134/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Make Nat464Xlat a per-network object, one for every network requiring clat, instead of a ConnectivityService singleton. 2. Make the NetworkManagementService clatd commands take an interface. 3. When we attempt to start clatd on a network, store its Nat464Xlat object in the NetworkAgentInfo, so we have an authoritative way of knowing whether clat is running on a given network. 4. Rework Nat464Xlat, hopefully simplifying it. Bug: 12111730 Change-Id: I1fa5508ef020cd1c3d1c7a1f7b06370ac5fc2ae2
* | | | | | | | Merge "Inflate ActionMode items against the ActionBarContextView theme" into ↵Alan Viverette2014-10-292-4/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-mr1-dev
| * | | | | | | | Inflate ActionMode items against the ActionBarContextView themeAlan Viverette2014-10-282-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | BUG: 18078900 Change-Id: I300a0268bacf7e1ebcd64eac3d79548e1c4a9606
* | | | | | | | | Merge "Undo erroneous delete done by ↵Shishir Agrawal2014-10-291-7/+56
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev
| * | | | | | | | | Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37Shishir Agrawal2014-10-281-7/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The change above deleted these lines by mistake. Bug: 18153840 Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
* | | | | | | | | | Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-devIhab Awad2014-10-282-24/+112
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | PhoneAccounts include literal icon bitmap (1/4)Ihab Awad2014-10-282-24/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9110d983c0ca6610075bd24975f1e90d123ef9c1
* | | | | | | | | | Merge "Remove checks to support new sim color selection." into lmp-mr1-devSanket Padawe2014-10-281-2/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove checks to support new sim color selection.Sanket Padawe2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove checks to support new sim color selection in multi-sim settings UI. Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
* | | | | | | | | | | Merge "Update drag-to-open menu close behavior" into lmp-mr1-devAlan Viverette2014-10-281-8/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update drag-to-open menu close behaviorAlan Viverette2014-10-271-8/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Menu now closes if the user opens using long-press and then lifts their finger when touching outside of the menu. This is consistent with the normal drag-to-open interaction model. BUG: 16352041 Change-Id: I06aafae7b702ef44000ed19707c46e2bb595095e
* | | | | | | | | | | Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-devYorke Lee2014-10-281-0/+5
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add comment to TelecomManager.getCallStateYorke Lee2014-10-281-0/+5
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explain why READ_PHONE_STATE permission is not required so that people don't try to add it in the future. Requiring the permission causes stability crashes with legacy apps and system components that don't have the permission. Change-Id: Idf8766aa409d4a2c4ed3d6f81a398f4a0eb24615
* | | | | | | | | | Merge "Close keyguard user switcher on tap outside" into lmp-mr1-devAdrian Roos2014-10-285-31/+87
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Close keyguard user switcher on tap outsideAdrian Roos2014-10-285-31/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also closes when tapping the current user. Also fixes a bug, where the background alpha was not properly initialized. And while we're at it, fixes a bug where the user switcher was closable in simple mode by extending quick settings. Bug: 17691134 Change-Id: I5444fe42a8a2887ab012ef6cbdcc57ba81a8c1c2
* | | | | | | | | | | Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-devJohn Spurlock2014-10-281-2/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Zen: Fix quantity format specifiers for quantity=1.John Spurlock2014-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16824863 Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
* | | | | | | | | | | | Merge "Update javadocs for Telecom APIs." into lmp-mr1-devSantos Cordon2014-10-281-6/+49
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update javadocs for Telecom APIs.Santos Cordon2014-10-281-6/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 18142177 Change-Id: I78461f3634d281a6927cec9c555825a1bdab7a24
* | | | | | | | | | | | | Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-devJeff Davidson2014-10-281-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Check UID instead of package name when preparing VPN.Jeff Davidson2014-10-241-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a package is uninstalled and reinstalled, it should no longer be considered a prepared VPN in prepare(). While the package name remains constant in this case, the UID should not. Bug: 17980393 Change-Id: I29edf22ebe0550a7938d5a36c746c83dc068a0f9
* | | | | | | | | | | | | | am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app ↵Joe Fernandez2014-10-281-5/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review" into lmp-docs automerge: 56a8cb7 * commit '56a8cb7fd1eff26da30c4ebcb58eae71b9774b81': docs: Update timing of Android Wear app review
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app ↵Joe Fernandez2014-10-281-5/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | review" into lmp-docs * commit '5c0ed74b3886c5765c576e9e427b93c76b37635a': docs: Update timing of Android Wear app review
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into ↵Joe Fernandez2014-10-281-5/+6
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | lmp-docs * commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7': docs: Update timing of Android Wear app review
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "docs: Update timing of Android Wear app review" into lmp-docsJoe Fernandez2014-10-281-5/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | docs: Update timing of Android Wear app reviewJoe Fernandez2014-10-271-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3d31a9828b5934a871964139b8abc6b12fe8586