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

121516 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f38d305bfa am 1bc72efd: (-s ours) am 6afb554c: (-s ours) am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit '1bc72efdef558f05164202df07a025983819d4ea':
  Import translations. DO NOT MERGE
 2013-12-26 23:54:39 +00:00
quddusc
22c082b00b am ae9702bb: am ac4ebda9: am f16ddd6d: 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 'ae9702bb41ba9f96ce26ff6e25ed9497632e087f':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-26 23:54:33 +00:00
quddusc
5b100c15d2 am 9e39c952: am 9dd65b93: am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit '9e39c9526d89f875a0884629d020e2253e9179dd':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-26 23:54:27 +00:00
quddusc
9bd62d7a61 am aea9c66b: am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit 'aea9c66b4c39b1f5af132b7de800c383aa0df068':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-26 23:54:20 +00:00
quddusc
7999170276 am 6208ef25: am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit '6208ef25fd9b570770065edbfa71bbb2de8aa511':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:54:15 +00:00
quddusc
cafb29a315 am 7c0da7ec: am bb6316db: am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '7c0da7ec5f26179d31b1f3b3211389765baeecc2':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 23:54:10 +00:00
quddusc
0c0474fd87 am 75b3c99e: am c2a3227a: am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit '75b3c99ef542f91a690f62c46970bc9e3795ad30':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-26 23:54:01 +00:00
Baligh Uddin
1bc72efdef am 6afb554c: (-s ours) am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit '6afb554cf07d2a4a2bffed34b696690d8ed0450a':
  Import translations. DO NOT MERGE
 2013-12-26 23:50:13 +00:00
quddusc
ae9702bb41 am ac4ebda9: am f16ddd6d: 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 'ac4ebda9f64f7ff54270f9448f597bac4dea71fc':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-26 23:50:08 +00:00
quddusc
9e39c9526d am 9dd65b93: am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit '9dd65b9397c97726bdd55ee7e91905f9ee34597c':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-26 23:50:02 +00:00
quddusc
aea9c66b4c am 4e5a9b72: am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit '4e5a9b72afbd902227d8dcef6426d3a3be41daef':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-26 23:49:57 +00:00
quddusc
6208ef25fd am c609cb0d: am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'c609cb0d62b25b2526b8401e576df4dce5aa5a92':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:49:51 +00:00
quddusc
7c0da7ec5f am bb6316db: am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit 'bb6316db12418c3f010f8c730f6d4644920bbe8a':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 23:49:45 +00:00
quddusc
75b3c99ef5 am c2a3227a: am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit 'c2a3227a3d4bc055f311b50693b671c9667cfa67':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-26 23:49:39 +00:00
Baligh Uddin
6afb554cf0 am b6d55917: (-s ours) am e965be75: (-s ours) am d6e863a1: (-s ours) Import translations. DO NOT MERGE 
* commit 'b6d55917122b314c4ec547263e774934d67f2973':
  Import translations. DO NOT MERGE
 2013-12-26 23:43:59 +00:00
quddusc
ac4ebda9f6 am f16ddd6d: 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 'f16ddd6dd4fae500b7b512568db2c55b8919d920':
  docs: Added a statement for "android:name" attribute indicating that the descriptor strings are case-sensitive. Bug: 11926096 Change-Id: I533dcbb13ba54bc7ff35311406b7acdfc38fc1b2
 2013-12-26 23:43:54 +00:00
quddusc
9dd65b9397 am cd73f770: am 5d98ddf2: am fca563a2: docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905 
* commit 'cd73f7702fca082bf46d64b5c011f9dbe1b5fe65':
  docs: Fixed code snippet for unbinding from IAB v3 service. Bug: 11858905
 2013-12-26 23:43:49 +00:00
quddusc
4e5a9b72af am 317109df: am e94bca2d: am 70b96ec7: Merge "docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521" into klp-docs 
* commit '317109dfaf0682f6ffbf11d71f3da84dfa295df6':
  docs: Added missing elements under "can contain:" list in manifest-element.html. Bug: 5793521
 2013-12-26 23:43:45 +00:00
quddusc
c609cb0d62 am b889885e: am 34dbf7c3: am ad7b5993: Merge "docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017" into klp-docs 
* commit 'b889885e9b5a605329ff8d7a35c373c88abf8c35':
  docs: Fixed duplicate text in onScrollStateChanged() scrollState parameter description. Bug: 6804017
 2013-12-26 23:43:40 +00:00
quddusc
bb6316db12 am 5938b9a0: am 5ad0e628: am 12182bc2: Merge "docs: Fixed deprecated constructor. Bug: 10581815" into klp-docs 
* commit '5938b9a00e0133ca093755568c9a8a2e202f7daf':
  docs: Fixed deprecated constructor. Bug: 10581815
 2013-12-26 23:43:36 +00:00
quddusc
c2a3227a3d am 39b79982: am 52604aad: am 240aca33: docs: Changed the title of the class to "Making Your App Content Searchable by Google." 
* commit '39b799820db4fa258dadb45b030830656168f95b':
  docs: Changed the title of the class to "Making Your App Content Searchable by Google."
 2013-12-26 23:43:31 +00:00
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
Zhijun He
aeb18a8eda Merge "Camera2: Update availableThumbnailSizes java doc" 2013-12-26 22:32:00 +00:00
Baligh Uddin
a0b866d12d Merge "Import translations. DO NOT MERGE" 2013-12-26 20:58:36 +00:00
Zhijun He
5a9ff37923 Camera2: Update availableThumbnailSizes java doc 
Bug: 12135317
Change-Id: I4012ed3e7cd6394c5e964aaeb3381b4932c44b11
 2013-12-26 11:49:09 -08:00
Baligh Uddin
bbd861c23a Import translations. DO NOT MERGE 
Change-Id: I27cfb0c604a4ab3deef7c4a55701e74cb1905172
Auto-generated-cl: translation import
 2013-12-26 11:15:59 -08:00
Baligh Uddin
799cff63c7 Merge "Import translations. DO NOT MERGE" 2013-12-26 19:09:24 +00:00
Baligh Uddin
869de0d1d0 Import translations. DO NOT MERGE 
Change-Id: I90b992fe5850b901f15b4c9ae778a316d574edb2
Auto-generated-cl: translation import
 2013-12-26 11:08:12 -08:00
Baligh Uddin
9cfe3a13b1 Merge "Import translations. DO NOT MERGE" 2013-12-26 18:42:01 +00:00
Baligh Uddin
773cb5e728 Import translations. DO NOT MERGE 
Change-Id: I2ca69fa39fbc71249e47fc90b569a7de69b8a7c3
Auto-generated-cl: translation import
 2013-12-26 10:37:08 -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
5afdc7d7c5 Import translations. DO NOT MERGE 
Change-Id: I20a01148e49e1ca8c3be44150987c0846f9671ee
Auto-generated-cl: translation import
 2013-12-26 09:55:09 -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
Chris Craik
1139d87b3e Merge "Add initial APIs for 3d view manipulation." 2013-12-21 01:26:44 +00:00
Svetoslav
f9ceb82954 Merge "Sometimes write may be called twice in a row for the same content." 2013-12-21 01:17:16 +00:00
Svetoslav
2c1b177dcf Sometimes write may be called twice in a row for the same content. 
In a rare case it is possible that on write of a print document
adapter is called twice for the same pages with nothing being
changed. This happens if while doing a write we get an update
request which correctly avoids calling layout on the adapter
but does call on write as we ignore that we are waining for the
requested pages to be written. Fun.

Change-Id: I33d7d26c7c4b083dc7b66bf762697b6dafd1ccc4
 2013-12-20 17:10:49 -08:00
Amith Yamasani
e58a49e411 Merge commit '817ec49e' into manualmerge 
Conflicts:
	services/print/java/com/android/server/print/PrintManagerService.java

Change-Id: I1b9bf364ca50ee3c48f53d87ae0ce23e7f3c2bc2
 2013-12-20 16:36:48 -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
Chris Craik
d863a10b28 Add initial APIs for 3d view manipulation. 
Change-Id: I6de00bc577d5b3a1fbc9ca3a3b3668fcfa32b867
 2013-12-20 15:15:01 -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