drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
118,171 Commits 1 Branch 0 Tags
Commit Graph

118171 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
b6d5591712 am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'e965be75746d898611ee15d601dc97c8b206a542':
  Import translations. DO NOT MERGE
 2013-12-26 15:34:10 -08:00
quddusc
f16ddd6dd4 am 2a191297: am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs 
* commit '2a1912971849b929dc2e4ec8d6368f477b1fddae':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-26 15:34:03 -08:00
quddusc
cd73f7702f am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit '5d98ddf2f741c2a635b9df90cf896c9faceb1b33':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-26 15:33:58 -08:00
quddusc
317109dfaf am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit 'e94bca2d8491e4b38fc987dbfe1f8fe0a4384c8f':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-26 15:33:52 -08:00
quddusc
b889885e9b am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '34dbf7c32327dc61a106b9a2f50e22cdb6cf6242':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 15:33:47 -08:00
quddusc
5938b9a00e am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '5ad0e6289119dfaaa50a663e88dc0b978447302c':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 15:33:43 -08:00
quddusc
39b799820d am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit '52604aadaafc0921c2f81df715f01bec546021a2':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-26 15:33:37 -08:00
Baligh Uddin
a95f6e3ac4 am bbeb3135: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'bbeb313567064b30ad93cdadd49beb8141c3d47b':
  Import translations. DO NOT MERGE
 2013-12-26 13:00:44 -08:00
Baligh Uddin
bbeb313567 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 20:58:31 +00:00
Baligh Uddin
7aa56efd73 am 7bb3e3b9: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit '7bb3e3b9ee22f2771c9fa71593c71910bbbcafac':
  Import translations. DO NOT MERGE
 2013-12-26 11:11:15 -08:00
Baligh Uddin
5a736a99f8 Import translations. DO NOT MERGE 
Change-Id: Iea7a801a62b52fd1685e7d9904a1e805c0d19827
Auto-generated-cl: translation import
 2013-12-26 11:09:48 -08:00
Baligh Uddin
7bb3e3b9ee Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 19:09:19 +00:00
Baligh Uddin
64ec792948 Import translations. DO NOT MERGE 
Change-Id: I190a7af8c85eb4b59ed14bd55f5ed2ff85e55698
Auto-generated-cl: translation import
 2013-12-26 11:07:34 -08:00
Baligh Uddin
dd6517c9df am ea227306: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-dev 
* commit 'ea227306d68c7097b9cb079b1bfa6157c1ec2d30':
  Import translations. DO NOT MERGE
 2013-12-26 10:43:19 -08:00
Baligh Uddin
ea227306d6 Merge "Import translations. DO NOT MERGE" into klp-dev 2013-12-26 18:41:56 +00:00
Baligh Uddin
8677794bfa Import translations. DO NOT MERGE 
Change-Id: I010c6031e2bb9bfe71261008db8945116088a590
Auto-generated-cl: translation import
 2013-12-26 10:16:09 -08:00
Baligh Uddin
e965be7574 am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'd6e863a19a631fd0003f96d507a21863fe973caa':
  Import translations. DO NOT MERGE
 2013-12-26 09:59:57 -08:00
Baligh Uddin
d6e863a19a Import translations. DO NOT MERGE 
Change-Id: Ia1e9dd788744e22237845d094d414dc4f57713be
Auto-generated-cl: translation import
 2013-12-26 09:53:23 -08:00
quddusc
2a19129718 am cbc5f541: Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs 
* commit 'cbc5f5410ff7c2b91e13f80a930f22944ce2ed88':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-21 00:15:55 +00:00
quddusc
5d98ddf2f7 am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit 'fca563a2d600c2e2a4ca0af2446a72e8bb36206e':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-21 00:15:49 +00:00
quddusc
cbc5f5410f Merge "docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2" into klp-docs 2013-12-21 00:13:56 +00:00
quddusc
fca563a2d6 docs: Fixed code snippet for unbinding from IAB v3 service. 
Bug: 11858905

Change-Id: Id1af4fc50a020ab520b2c836df8182db6c3a35bd
 2013-12-20 15:21:38 -08:00
quddusc
be64abc025 docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. 
Bug: 11926096
Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-20 15:14:42 -08:00
quddusc
e94bca2d84 am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit '70b96ec7303c1b34ff9d63a03359efadeec075c2':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-20 23:10:33 +00:00
quddusc
34dbf7c323 am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'ad7b5993b579994c0b0838783bb8d0a94dffb1ee':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-20 23:10:28 +00:00
quddusc
70b96ec730 Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 2013-12-20 23:08:08 +00:00
quddusc
ad7b5993b5 Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 2013-12-20 23:07:35 +00:00
quddusc
8b03f63a0f docs: Added missing elements under "can contain:" list in manifest-element.html. 
Bug: 5793521

Change-Id: I4340a8d043ebcf80634ad8cc1967b2a476a151d8
 2013-12-20 15:02:24 -08:00
quddusc
5ad0e62891 am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '12182bc236dd8e120a1f25d1a1862db744425558':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-20 23:01:28 +00:00
quddusc
12182bc236 Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 2013-12-20 22:59:05 +00:00
quddusc
9072110b82 docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. 
Bug: 6804017

Change-Id: I1e08fc7a9a5db85341c57f6ec04c434a94183cd0
 2013-12-20 14:55:09 -08:00
quddusc
8f5434183e docs: Fixed deprecated constructor. 
Bug: 10581815

Change-Id: I057acf1ad3037418c7247f865b6cb0847a9eb7b6
 2013-12-20 14:07:45 -08:00
quddusc
52604aadaa am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit '240aca333e340445f977d2a0e268a7c8d3a591e0':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-20 20:37:30 +00:00
quddusc
240aca333e docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
Change-Id: Icc640ffffc553c5e8825178453515cedcdc8a63f
 2013-12-20 12:05:01 -08:00
David Friedman
cdfed85aa4 am 51834f74: am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit '51834f74e627dda63f3868fc51fd29a26cda5492':
  NDK release notes for r9c for review
 2013-12-19 21:56:58 +00:00
David Friedman
51834f74e6 am c18061d5: am 7cd6cd31: NDK release notes for r9c for review 
* commit 'c18061d5351fa4170b0b446fbea6300283789403':
  NDK release notes for r9c for review
 2013-12-19 13:53:58 -08:00
David Friedman
c18061d535 am 7cd6cd31: NDK release notes for r9c for review 
* commit '7cd6cd3178b8fb3b25a2c2ddeaff2733bfab9f43':
  NDK release notes for r9c for review
 2013-12-19 21:51:22 +00:00
David Friedman
7cd6cd3178 NDK release notes for r9c for review 
Staged at http://boku.mtv.corp.google.co:9196/tools/sdk/ndk/index.html

Change-Id: Id058d39e10ce64fff2def3dea746ac5e11eff2b4
(cherry picked from commit 51501634c7d530d691f4345990a2434a00603ba2)
 2013-12-19 21:47:46 +00:00
Craig Mautner
46f618a7d9 am a8dfd5d8: am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'a8dfd5d896b71faf87b03d27df6050284765fb21':
  Keydispatching timeout while finish Activity
 2013-12-19 17:58:08 +00:00
Craig Mautner
a8dfd5d896 am 4dcf1af3: am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit '4dcf1af3ed8dfa546e6cbf5ecfa66914a3fda883':
  Keydispatching timeout while finish Activity
 2013-12-19 09:55:33 -08:00
Craig Mautner
4dcf1af3ed am cccf2a33: Merge "Keydispatching timeout while finish Activity" 
* commit 'cccf2a333793badbcea9b04fe3f29447496a56d9':
  Keydispatching timeout while finish Activity
 2013-12-19 09:52:32 -08:00
Craig Mautner
cccf2a3337 Merge "Keydispatching timeout while finish Activity" 2013-12-19 17:48:58 +00:00
Narayan Kamath
7bbc79fd68 am 91f6aaaf: am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '91f6aaaf2cb1c1a0cec129cec8038332de0271a8':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 13:04:19 +00:00
Narayan Kamath
91f6aaaf2c am 2d2d5943: am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit '2d2d594308693af79bf5c44f0dcc30f29d2dc31a':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 05:01:34 -08:00
Narayan Kamath
2d2d594308 am f3172c62: Merge "MediaDrm#mNativeContext is a long, not int." 
* commit 'f3172c623e4bb77a047262c6e7eedc4a2c2ea95a':
  MediaDrm#mNativeContext is a long, not int.
 2013-12-19 04:37:52 -08:00
Narayan Kamath
f3172c623e Merge "MediaDrm#mNativeContext is a long, not int." 2013-12-19 12:35:24 +00:00
Martin Wallgren
c8733b818d Keydispatching timeout while finish Activity 
If there is input to be handled during finish activity we can get a
keydispatching timeout ANR. The reason is that finish activity is some
times not possible, and the activity is instead put on a finish queue.
The activity will then be finished sometime in the future. When we add
the activity to the finish queue, key dispatching is paused, and there
is an ANR timer waiting for it to be resumed again. Since it can take a
long time before the activity is actually finished, we need to resume
the key dispatching to avoid the ANR.

Change-Id: Icea4ab3b5ad05c8bfbadf8f5cece1a59ec621469
 2013-12-19 13:24:00 +01:00
Brian Carlstrom
ee767548ba am d9386812: am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'd9386812169dd84a7f2bdd3a38a57b9c860525db':
  Track Looper decoupling from ALooper
 2013-12-19 07:25:23 +00:00
Brian Carlstrom
d938681216 am f64a30f8: am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'f64a30f8a68fbd6ee4f7ae2f66267e23f04c5839':
  Track Looper decoupling from ALooper
 2013-12-18 23:21:50 -08:00
Brian Carlstrom
f64a30f8a6 am a11371f4: Merge "Track Looper decoupling from ALooper" 
* commit 'a11371f42b4dd793a48faa3323be34bca0f6d2e6':
  Track Looper decoupling from ALooper
 2013-12-18 23:16:17 -08:00