summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-07-303-0/+24
|\
| * Import translations. DO NOT MERGEGeoff Mendal2014-07-303-0/+24
| | | | | | | | | | Change-Id: I548370fd62b7a26852d16ddbd22ef67ea6369080 Auto-generated-cl: translation import
* | Merge "Make startRecognition async" into lmp-devSandeep Siddhartha2014-07-245-79/+186
|\ \
| * | Make startRecognition asyncSandeep Siddhartha2014-07-305-80/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - This is needed for telephony and audio integration which should happen via async callbacks that'll end up starting/stopping recognition. e.g. if a startRecognition happens when in a phone call - the onDetectionStarted will get called once the phone call ends. For now the transient stoppages due to internal reasons will not be propagated back to the client. Bug: 16514535 Bug: 16515468 Change-Id: I1b2b8edd28f5c5e67c453f66c23e1a67a626114e
* | | Added LEANBACK_SETTINGS Intent categoryJose Lima2014-07-301-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | - Added new Intent category (as a hidden/system API) to be used to identify Leanback settings activities that should be listed in the Leanback launcher. Change-Id: Ia31244fb87a66f63ddad562e02e577111573d728
* | | Fix large memory corruption in AAPTAdam Lesinski2014-07-301-4/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | When assigning a new string pool to a package, don't release the reference to the old memory immediately, as the cleanup code that is called after references the old memory. Bug: 16155257 Change-Id: I3eaeb81191b71a282a0ef82856023f09707f1b17
* | | Merge "Use a new socket for each of the host's IP addresses." into lmp-devPaul Jensen2014-07-252-15/+15
|\ \ \
| * | | Use a new socket for each of the host's IP addresses.Lorenzo Colitti2014-07-302-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If Socket.connect() times out, the socket cannot be used any more - any attempt to do so fails with EBADF. Use a new socket for each IP address. Bug: 16664129 Change-Id: If3616df86f7c2da0eabd30dca5db65d0da85cb17
* | | | Using the selector to check if an intent can be forwarded.Nicolas Prevot2014-07-301-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | In IntentFowarderActivity, if the selector of an intent is defined, use it to check if the intent can be forwarded. Change-Id: Ic77f70bca5596e0a5fb0fec9b7a693afaa649089
* | | | Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-07-3072-1224/+1297
|\ \ \ \
| * | | | Import translations. DO NOT MERGEGeoff Mendal2014-07-3072-1224/+1297
| | |_|/ | |/| | | | | | | | | | | | | | Change-Id: Ie02a99d4e746803f482713fe8a35ef31fdb5fdcb Auto-generated-cl: translation import
* | | | Merge branch 'lmp-dev' of ↵Alan Lau2014-07-302-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into lmp-dev
| * \ \ \ Merge "Import translations. DO NOT MERGE" into lmp-devGeoff Mendal2014-07-302-2/+2
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Import translations. DO NOT MERGEGeoff Mendal2014-07-302-2/+2
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Iec046e9a3d34bef3d8055f3eb00e243baf69c8fa Auto-generated-cl: translation import
* | | | am 231a32a1: (-s ours) am c0062272: Merge "Revert "Revert "DO NOT MERGE ↵Alan Lau2014-07-300-0/+0
|\ \ \ \ | |/ / / |/| | | | | | | | | | | | | | | | | | | Implement line breaking using ICU break iterator""" into klp-modular-dev * commit '231a32a132011abda6dabca31446297a75914dad': Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
| * | | am c0062272: Merge "Revert "Revert "DO NOT MERGE Implement line breaking ↵Alan Lau2014-07-304-106/+130
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | using ICU break iterator""" into klp-modular-dev * commit 'c006227265d7ac705ebeef2f7d87104fdb63f32a': Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""
| | * \ \ Merge "Revert "Revert "DO NOT MERGE Implement line breaking using ICU break ↵Alan Lau2014-07-304-106/+130
| | |\ \ \ | | | | | | | | | | | | | | | | | | iterator""" into klp-modular-dev
| | | * | | Revert "Revert "DO NOT MERGE Implement line breaking using ICU break iterator""Alan Lau2014-07-304-106/+130
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 77d6f36bbc76dbed51bea17d1ffcd3c1d6ffd30f. Change-Id: I10b6d9e3d82b0f2b6dc154465a4b2f1db8eed058
* | | | | | Use RoundRect clipping for circle reveal animationChris Craik2014-07-3018-114/+84
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:16630975 Also, remove inverse clipping feature from reveal animator. Change-Id: I770a4eb48cd123b0ca0f39d16a0f3eefd1be3653
* | | | | | Merge "Clean up Minikin includes" into lmp-devBehdad Esfahbod2014-07-308-14/+11
|\ \ \ \ \ \
| * | | | | | Clean up Minikin includesBehdad Esfahbod2014-07-308-14/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Include headers where they are used. Add header guards to MinikinSkia.h Change-Id: If341231625348290d28a7d625561fffc171a8407
* | | | | | | SMS 8-bit GSM characters decoding supportXia Ying2014-07-302-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support decoding the user data payload as pack GSM 8-bit (a GSM alphabet string that's stored in 8-bit unpacked format) characters. Change-Id: I790dd448a8aaed952d5e24961d9fc509112f7486 Conflicts: core/res/res/values/config.xml core/res/res/values/symbols.xml
* | | | | | | am 9ae4c6f8: am b6bfa9e4: am a7898781: Merge "docs: Added system ↵Ricardo Cervera2014-07-301-1/+53
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | requirements for Studio. Bug: 16566355" into klp-modular-docs * commit '9ae4c6f8744b6767efbb912dbfd64ce3da13e60e': docs: Added system requirements for Studio. Bug: 16566355
| * | | | | | am b6bfa9e4: am a7898781: Merge "docs: Added system requirements for Studio. ↵Ricardo Cervera2014-07-301-1/+53
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16566355" into klp-modular-docs * commit 'b6bfa9e45a953b83289ee57da661746deae7a63f': docs: Added system requirements for Studio. Bug: 16566355
| | * | | | | am a7898781: Merge "docs: Added system requirements for Studio. Bug: ↵Ricardo Cervera2014-07-301-1/+53
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 16566355" into klp-modular-docs * commit 'a7898781d6182b5c73a0a3899b71162f92582f66': docs: Added system requirements for Studio. Bug: 16566355
| | | * \ \ \ \ Merge "docs: Added system requirements for Studio. Bug: 16566355" into ↵Ricardo Cervera2014-07-291-1/+53
| | | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | klp-modular-docs
| | | | * | | | | docs: Added system requirements for Studio. Bug: 16566355Ricardo Cervera2014-07-291-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1d3d80ce718d64e01fd939aa177c950d56065555
* | | | | | | | | API Review: VectorDrawable. Remove clipToPath, add MiterLimitztenghui2014-07-303-5/+3
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:16488254 Change-Id: I693fd46eaf9af016ea9cefe44b559e0aee7c8f03
* | | | | | | | Merge "ContactsContract API changes" into lmp-devYorke Lee2014-07-252-54/+114
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | ContactsContract API changesYorke Lee2014-07-292-54/+114
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make ContactCounts an interface * Improve clarity of ContactCounts documentation * Add PinnedPositions.undemote method, and hide the method name constant that is only used for the internal implementation Bug: 16403306 Change-Id: If8b5cad779293cb9a3b90e698b13481f79b2351f
* | | | | | | | Merge "Add a log and statistics for notification expansion." into lmp-devChris Wren2014-07-248-5/+166
|\ \ \ \ \ \ \ \
| * | | | | | | | Add a log and statistics for notification expansion.Chris Wren2014-07-308-5/+166
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16618854 Change-Id: I501f396fa495e1e55a27d7d0b65aac66495418c1
* | | | | | | | Merge "Don't turn off screen after wiping user profiles" into lmp-devRobin Lee2014-07-241-3/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Don't turn off screen after wiping user profilesRobin Lee2014-07-301-3/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The activity manager should know when to lock the screen. If an admin does want this to happen then they should be able to run both commands in succession. Also rectifies some creative code styling in the same DPM method. @bug 15558805 Change-Id: I8918184a4585aa8b061eb4a68edc2ec6805d8127
* | | | | | | | Fixed a bug where Bluetooth was turned on with the drop-down in quick settings.PauloftheWest2014-07-301-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16547579 Change-Id: I3326aa1f4076d46dc0f8f87f14b44f097e684105
* | | | | | | | Implement nice header transition when opening QSJorim Jaggi2014-07-302-41/+208
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15192264 Change-Id: Id7d67d6067882982e2ca195e257dfa1b73db2cf6
* | | | | | | Removing old tag TAG_FORWARDING_INTENT_FILTERS.Nicolas Prevot2014-07-302-9/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By now, all devices should have updated, so we can remove the old tag name. Change-Id: Id0bc0e08f3979c5a2652c4eb8da9ff938b5d5bc4
* | | | | | | Merge "Fixing a NullPointerException in isProfileOwnerApp." into lmp-devNicolas Prevot2014-07-241-3/+4
|\ \ \ \ \ \ \
| * | | | | | | Fixing a NullPointerException in isProfileOwnerApp.Nicolas Prevot2014-07-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing a NullPointerException in isProfileOwnerApp of DevicePolicyManager if there is no profile owner. BUG: 16673376 Change-Id: I912fcd38343d3c1893313e6335802d26014a2e9d
* | | | | | | | NoListener: Optimize RankingMapChristoph Studer2014-07-301-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cache ranks and interception bits instead of re-calculating them every time they're accessed. Change-Id: I2c6bbeaa01648d03ff8b3690b7f21cef4e2b9d97
* | | | | | | | Merge "Add optional handler to LauncherApps callback" into lmp-devKenny Guy2014-07-242-16/+149
|\ \ \ \ \ \ \ \
| * | | | | | | | Add optional handler to LauncherApps callbackKenny Guy2014-07-302-16/+149
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow caller to pass in handler to LauncherApps when adding a callback. Stop apps adding callbacks twice. Bug: 16401733 Change-Id: I2e192091c1b79acb905d899e96d6dacd45e561da
* | | | | | | | | Notification: Forward setUser() call to publicVersionChristoph Studer2014-07-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I82715d69664fcbf57ca0599994004a8630f8587c
* | | | | | | | | Trust: Make setEnabledFeatures asynchronousAdrian Roos2014-07-305-64/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unsynchronizes the call into app code from setEnabledFeatures, replacing it with a callback mechanism. Also makes this actually work by fixing the check in TrustManagerService to take into account whitelisting. Change-Id: I0831752cd2d3158eda9c8404a5569498f11ac2ac
* | | | | | | | | Add setManagingTrust and expose it on lockscreenAdrian Roos2014-07-3015-22/+264
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a facility for trust agents to indicate if they are ready to manage trust. Also adds an indication to the lock icon on the lockscreen to show whether trust is being managed. Bug: 15518469 Bug: 16123013 Change-Id: Ie17f588aebeafe66c81dea4a69c733b0d2c72fd4
* | | | | | | | | Merge "Parse system properties that are lists correctly." into lmp-devTorne (Richard Coles)2014-07-241-5/+13
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | Parse system properties that are lists correctly.Torne (Richard Coles)2014-07-301-5/+13
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | String.split() returns a one-element array of the empty string if the input is the empty string, not a zero-element array. Introduce a getStringList function to handle this consistently in the cases where system properties are parsed as comma separated lists. The main result is that SUPPORTED_64_BIT_ABIS will now correctly be empty on a 32-bit only device. Change-Id: I6f74b48d0a6ced3cd6d49c05aad6a4b7e0b074d2
* | | | | | | | SysUI: Reset background treatment when re-using EntriesChristoph Studer2014-07-304-5/+32
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 16220667 Change-Id: I8fd2770fa5ea554728eb8cd70ce4a6171e28ece5
* | | | | | | Add warning in the disambig for specific launchers.Sander Alewijnse2014-07-303-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For launcher that do not support managed profiles. Also, ignore the intent after click on those launchers. Change-Id: I3d5691952a9409755b7cde68a3caba98a3772665
* | | | | | | Merge "disable flashlight for monkey tests" into lmp-devGuang Zhu2014-07-281-0/+4
|\ \ \ \ \ \ \
generated by cgit v1.1 at 2025-02-09 20:34:27 +0000