Jeff Sharkey
5dfd06f7d0
am c2fa99ed: am 792a9cc3: am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
...
* commit 'c2fa99edf1591eca47ad678889cfd4924f2470a8':
Relax auto-launch checks for GET_CONTENT.
2015-09-30 20:27:36 +00:00
Jeff Sharkey
4296209de5
am 3d65dcbc: am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
...
* commit '3d65dcbcec75bd53bb9da6ecebcb9dccc8eb42c7':
Clean stale entries when deleting files.
2015-09-30 20:27:30 +00:00
Geoff Mendal
bac11fdbfc
am e69c0e42: (-s ours) am a4a75803: (-s ours) am a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'e69c0e4236557a1a2f6af2afcf0884878cfc390a':
Import translations. DO NOT MERGE
2015-09-30 20:27:24 +00:00
Jeff Sharkey
c2fa99edf1
am 792a9cc3: am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
...
* commit '792a9cc3a5a8aee7ccf79ba5fb2570263505b23f':
Relax auto-launch checks for GET_CONTENT.
2015-09-30 20:21:17 +00:00
Jeff Sharkey
3d65dcbcec
am 58843059: am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
...
* commit '588430591b7bb5340ff02f05f1c02eaf924326ad':
Clean stale entries when deleting files.
2015-09-30 20:21:11 +00:00
Geoff Mendal
e69c0e4236
am a4a75803: (-s ours) am a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a4a758032537cceb47a0924b5082cb2197c5e446':
Import translations. DO NOT MERGE
2015-09-30 20:21:04 +00:00
Jeff Sharkey
792a9cc3a5
am 30fd0628: Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
...
* commit '30fd0628970b418dea382b388120f52504ff2243':
Relax auto-launch checks for GET_CONTENT.
2015-09-30 20:11:22 +00:00
Jeff Sharkey
588430591b
am e69ff2a8: Merge "Clean stale entries when deleting files." into mnc-dr-dev
...
* commit 'e69ff2a878ee7635a467259995e2924fb96a3a72':
Clean stale entries when deleting files.
2015-09-30 20:11:17 +00:00
Geoff Mendal
a4a7580325
am a6bf0ebd: (-s ours) Import translations. DO NOT MERGE
...
* commit 'a6bf0ebd6e7decda9ee02811cc5b73b96b9b9de5':
Import translations. DO NOT MERGE
2015-09-30 20:11:13 +00:00
Deepanshu Gupta
1bd276f6f7
Don't break error string (easier grepping)
...
Change-Id: If52097ba90481644707dd0323ec63ca3ddf0986b
2015-09-30 12:49:42 -07:00
Sene Gales
1673035f05
frameworks/base: delete TinyHashMap
...
In DeferredDisplayList use std::unordered_map instead of TinyHashMap
Towards deprecation of BasicHashTable
Change-Id: I91b8d5dc80444c88fecff9c362fa610cca253973
2015-09-30 20:37:01 +01:00
Jeff Sharkey
30fd062897
Merge "Relax auto-launch checks for GET_CONTENT." into mnc-dr-dev
2015-09-30 16:22:17 +00:00
Jeff Sharkey
e69ff2a878
Merge "Clean stale entries when deleting files." into mnc-dr-dev
2015-09-30 16:20:40 +00:00
Geoff Mendal
a6bf0ebd6e
Import translations. DO NOT MERGE
...
Change-Id: I22e6ce4ec3dd122bef49b23a26c9bc2d76980068
Auto-generated-cl: translation import
2015-09-30 07:01:01 -07:00
Neil Fuller
29a631e147
am 08aa3309: am ead371de: Merge "Remove use of \'_\' variable name"
...
* commit '08aa3309790672ccc4c9b899fdf4e6162cfbc37a':
Remove use of '_' variable name
2015-09-30 14:00:17 +00:00
Neil Fuller
08aa330979
am ead371de: Merge "Remove use of \'_\' variable name"
...
* commit 'ead371ded06fcf14b7af86a92100b0c3c92fd320':
Remove use of '_' variable name
2015-09-30 13:54:53 +00:00
Neil Fuller
ead371ded0
Merge "Remove use of '_' variable name"
2015-09-30 13:48:16 +00:00
Diego Perez
6aeedbc761
am b9c4cccf: Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-dev
...
* commit 'b9c4cccf672d725e75d393c492c917ba726c365c':
Reduce the amount of allocations on Paint_Delegate
2015-09-30 09:34:45 +00:00
Diego Perez
b9c4cccf67
Merge "Reduce the amount of allocations on Paint_Delegate" into mnc-ub-dev
2015-09-30 09:29:40 +00:00
Diego Perez
6dac0d4b7c
Reduce the amount of allocations on Paint_Delegate
...
When the text properties of the Paint object are updated, or when .set()
is called, updateFontObject will be called. This method is currently at the
top of the methods for number of allocations.
This CL reduces the number of calls to updateFontObject by a 90%,
reducing the number of Font allocations.
Change-Id: I3e232f9e6e230da8ecdd19921faadf2d3f4ff763
2015-09-30 09:10:37 +01:00
Deepanshu Gupta
3dde44935d
am 4e27221d: Merge "Support databinding in listitem layouts." into mnc-ub-dev
...
* commit '4e27221d49151ba91af59029659e666fa756b645':
Support databinding in listitem layouts.
2015-09-30 00:51:02 +00:00
Deepanshu Gupta
4e27221d49
Merge "Support databinding in listitem layouts." into mnc-ub-dev
2015-09-30 00:45:52 +00:00
Deepanshu Gupta
e91096c03d
Support databinding in listitem layouts.
...
Add a wrapper around the PullParser to support stripping out databinding
parts.
Bug: http://b.android.com/187428
Change-Id: I88080d8f4108cb5ae27a137ad20c5dd7d516f3ea
2015-09-29 17:07:53 -07:00
Adam Lesinski
67ee88e8ad
am 8b7beaec: am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
...
* commit '8b7beaecffde9a98b50cd33be893b7944f2ab271':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
2015-09-29 23:45:28 +00:00
Adam Lesinski
8b7beaecff
am 8197e2de: am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
...
* commit '8197e2de06bb96b0076469528a44b36a080ec9e1':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
2015-09-29 23:39:08 +00:00
Adam Lesinski
8197e2de06
am ffc6ce00: Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
...
* commit 'ffc6ce000568c08a50f7b538bd4cd7729e64c229':
Fix asymmetry in parceling/unparceling code for BatteryStats summary
2015-09-29 23:30:27 +00:00
Adam Lesinski
ffc6ce0005
Merge "Fix asymmetry in parceling/unparceling code for BatteryStats summary" into mnc-dr-dev
2015-09-29 23:22:59 +00:00
Jianing Wei
2813b0fae9
Camera2: Update video stabilization API doc.
...
Bug: 23353979
Change-Id: I781006d1b6ebbdf522ebbf6acc35b2062aff76b6
2015-09-29 16:04:14 -07:00
Jeff Sharkey
cc2ae6b421
Relax auto-launch checks for GET_CONTENT.
...
When a developer wraps an intent with Intent.createChooser(), they're
indicating that the user should always be prompted, instead of using
any "always use" defaults. A recent CL changed the chooser behavior
to ensure that UI is always shown in the case where there is only one
match.
However, this caused us to start prompting for the GET_CONTENT intent,
for which there is only ever one DocumentsUI system app. Since that
app delivers on the createChooser() contract described above, we're
okay automatically launching it.
Bug: 24464358
Change-Id: I0279d3343479c134a35f41ddf3cb4204d0ae6a90
2015-09-29 13:04:48 -07:00
Selim Cinek
01db67d9f7
Ambient display now comes up immediately when a notification comes in
...
Previously there was always a 1s delay which could even become a 5-8s
delay if the Alarm was not delivered in time.
Bug: 24355754
Change-Id: I1625c69719eee81403a1fcce1358d4d6c9fcf3e9
2015-09-29 11:59:29 -07:00
Baligh Uddin
8c30514c0e
am d412cc05: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit 'd412cc0584143fa72e044b57c7ea377626a169ee':
Import translations. DO NOT MERGE
2015-09-29 14:57:48 +00:00
Baligh Uddin
981d81180e
am 756bd429: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '756bd429bd6cf2d23e7132de09e61953cb7abc47':
Import translations. DO NOT MERGE
2015-09-29 14:57:42 +00:00
Baligh Uddin
9dd38f3f12
am 6f2bb3a3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '6f2bb3a3c0697cbff6cf3b3ffde0c06cd911b9a9':
Import translations. DO NOT MERGE
2015-09-29 14:50:06 +00:00
Baligh Uddin
40359e0322
am ae442baf: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit 'ae442bafad49c8fa889b41771b0a8a505a427988':
Import translations. DO NOT MERGE
2015-09-29 14:49:59 +00:00
Baligh Uddin
e3e11d6dac
am e2c9b91f: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit 'e2c9b91f53dc17ea62f5fa5ac9be1f4fff91203b':
Import translations. DO NOT MERGE
2015-09-29 14:49:53 +00:00
Baligh Uddin
d412cc0584
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:47:24 +00:00
Baligh Uddin
756bd429bd
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:47:22 +00:00
Baligh Uddin
5ca3191a30
am 755e95a4: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '755e95a463559475a60c6360768175ec844104ec':
Import translations. DO NOT MERGE
2015-09-29 14:43:06 +00:00
Baligh Uddin
22a0c0e3dc
am 0fb5f9f3: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '0fb5f9f337292bd7ac4e380be72ffbaf9dccf51b':
Import translations. DO NOT MERGE
2015-09-29 14:42:58 +00:00
Baligh Uddin
9b552e3400
am 0d8e091e: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '0d8e091ee615fd8580d52e238070e26c3b41c594':
Import translations. DO NOT MERGE
2015-09-29 14:42:52 +00:00
Baligh Uddin
dbb9f370b2
am 0010f09a: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '0010f09a52532244939221392e8bf649cf0794ed':
Import translations. DO NOT MERGE
2015-09-29 14:42:45 +00:00
Baligh Uddin
514650d8a6
am 67162a22: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '67162a220cd4b7272b8b65f42f633b8a8065d185':
Import translations. DO NOT MERGE
2015-09-29 14:42:40 +00:00
Baligh Uddin
89176d5d00
am 19efc9e5: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '19efc9e50fd398a06493f841cdae469c0a93bc6d':
Import translations. DO NOT MERGE
2015-09-29 14:42:33 +00:00
Baligh Uddin
ab38b8e5ea
am 42e73a82: (-s ours) Merge "Import translations. DO NOT MERGE" into stage-aosp-master
...
* commit '42e73a82361e8161660e2af9e683edd496c18eeb':
Import translations. DO NOT MERGE
2015-09-29 14:42:26 +00:00
Baligh Uddin
6f2bb3a3c0
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:40:57 +00:00
Baligh Uddin
ae442bafad
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:40:41 +00:00
Baligh Uddin
e2c9b91f53
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:40:29 +00:00
Baligh Uddin
755e95a463
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:39:29 +00:00
Baligh Uddin
0fb5f9f337
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:39:25 +00:00
Baligh Uddin
0d8e091ee6
Merge "Import translations. DO NOT MERGE" into stage-aosp-master
2015-09-29 14:39:23 +00:00