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

119780 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczyński
cad876957d am fad83743: Merge "NumberPicker style for wearable devices." into klp-modular-dev 
* commit 'fad8374373dcf8d1bb6f3e919a5da14282eb2cd8':
  NumberPicker style for wearable devices.
 2014-03-04 01:58:52 +00:00
Filip Gruszczyński
fad8374373 Merge "NumberPicker style for wearable devices." into klp-modular-dev 2014-03-04 01:56:38 +00:00
Ricardo Cervera
07993d1d80 am 13a14ac4: am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit '13a14ac43b8184b082d5107d1e746fe4e16ce563':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:22:55 +00:00
Ricardo Cervera
13a14ac43b am a61e74e1: am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit 'a61e74e1646ad1fb702d26be482d613bf991afd8':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:17:02 +00:00
Ricardo Cervera
a61e74e164 am 7e4db882: am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit '7e4db882c55b5f5d46a3b6da1c66f5dd31b601ca':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:13:47 +00:00
Ricardo Cervera
7e4db882c5 am 240b38aa: Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 
* commit '240b38aafb05407a147fceefed13df33c19aa2b2':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:10:51 +00:00
Ricardo Cervera
240b38aafb Merge "docs: Changes to release notes for the Android SDK 22.6.0 release." into klp-docs 2014-03-04 01:07:52 +00:00
Filip Gruszczyński
66425bd855 NumberPicker style for wearable devices. 
Change-Id: Ib9194fdd951f4486aa833c080d8f7ab661d34a48
 2014-03-03 16:53:08 -08:00
Ricardo Cervera
ea40a2642b docs: Changes to release notes for the Android SDK 22.6.0 release. 
Updated relese notes for 22.6.0:

Stage:
http://quixote.mtv.corp.google.com:8001/sdk/index.html
http://quixote.mtv.corp.google.com:8001/sdk/installing/installing-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/eclipse-adt.html
http://quixote.mtv.corp.google.com:8001/tools/sdk/tools-notes.html
http://quixote.mtv.corp.google.com:8001/tools/revisions/build-tools.html

(Patch: Cleared md5 and ZIP entries. To be updated with values for
 the final build when available.)
(Patch: Added emulator bugfixes from Xav.)
(Patch: Addressed Joe's comments. Added filenames and checksums for the
 rc7 build)
(Patch: Replaced sizes and hashes with values for rc8)
(Patch: Added lint categories, addressed Joe's comments)
(Patch: Added note on the lint issue)
(Patch: Addressed Joe's comments, reverted adt-bundle-* to 20131030 files.)

Change-Id: I508d47959c4f478a3ed6b927fd460139cd5cfe36
 2014-03-03 16:41:10 -08:00
Victoria Lease
268088eed6 am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families." 
* commit '3ce2b57d15d4afe330b728c3175b8bfb89c6890a':
  Add casual/cursive/sans-serif-smallcaps font families.
 2014-03-03 23:46:21 +00:00
Victoria Lease
3ce2b57d15 am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families." 
* commit '9404752d50a60319f0d2f53c212fad7c7cd8fb8e':
  Add casual/cursive/sans-serif-smallcaps font families.
 2014-03-03 15:44:13 -08:00
Victoria Lease
9404752d50 Merge "Add casual/cursive/sans-serif-smallcaps font families." 2014-03-03 23:38:54 +00:00
Dirk Dougherty
0054ed815a am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs 
* commit '8bb3b8f805658ecf9106778992dceea9a05dcc4c':
  Update permission description string.
 2014-03-03 22:24:14 +00:00
Dirk Dougherty
8bb3b8f805 am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs 
* commit '95cf532fe389713ff1fb33810012586fd460e223':
  Update permission description string.
 2014-03-03 22:21:00 +00:00
Dirk Dougherty
95cf532fe3 am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs 
* commit '26de0b7118e188bac5a30d9562418fa09be3826a':
  Update permission description string.
 2014-03-03 22:18:04 +00:00
Jay Shrauner
1fdcab956d am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '81f74c7d427f2942cdccae30329694e9825f5d8f':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:16:50 +00:00
Dirk Dougherty
26de0b7118 am cce121fb: Merge "Update permission description string." into klp-docs 
* commit 'cce121fb7504fbc460b85564735ff5d8a1ed4d55':
  Update permission description string.
 2014-03-03 22:13:31 +00:00
Dirk Dougherty
cce121fb75 Merge "Update permission description string." into klp-docs 2014-03-03 22:10:26 +00:00
Dirk Dougherty
08d7c2861f Update permission description string. 
Change-Id: I6cd5895d78bff4f6f3fc8090e13a9ddbd83a1978
 2014-03-03 14:05:21 -08:00
Jay Shrauner
81f74c7d42 am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '7e3efa82ecbb9e3cf50f8f455e573aed3b88d183':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:05:02 +00:00
Jay Shrauner
7e3efa82ec am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '1f168fd43895e2a84c037df9f3ea54e36f5d0d16':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:02:14 +00:00
Jay Shrauner
1f168fd438 am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '4ef0aabe93877b7f30645b873fbc003651151f2f':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 21:58:47 +00:00
Jay Shrauner
4ef0aabe93 Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 2014-03-03 21:56:18 +00:00
Jonathan Dixon
6ab920fb61 am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '5b741144a6feadb5c51fecb0235c605f0b9fb803':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 21:16:47 +00:00
Bart Sears
5a0a37e23d am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '73eefce3085a0fbe3ab65e69af319b21b92c7252':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 21:16:43 +00:00
Jonathan Dixon
5b741144a6 am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '3c88a685021a5acd099dc7625a11e8d98f0e8fbe':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 20:33:20 +00:00
Bart Sears
73eefce308 am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '7f9503267c7ad49f6364bd132bc6259e346b7b51':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 20:33:16 +00:00
Jonathan Dixon
3c88a68502 am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '7c01f9f7abd9eb1aefdf712be98d57e4075422bb':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 20:29:46 +00:00
Bart Sears
7f9503267c am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit 'e31c05296d8cde8f6d99f18ef039fd6823ec54a9':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 20:29:43 +00:00
Tim Murray
9f141fbb78 am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit 'fb51a4301c8dc4d8ba1b6f84b55a76ec88d683dc':
  Fix null check for BaseObj.equals.
 2014-03-03 20:21:27 +00:00
Tim Murray
fb51a4301c am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '8377a4fd03d4fc367e0cb07af748ae941d9960a9':
  Fix null check for BaseObj.equals.
 2014-03-03 11:12:01 -08:00
Tim Murray
8377a4fd03 Merge "Fix null check for BaseObj.equals." 2014-03-03 19:09:08 +00:00
Jonathan Dixon
7c01f9f7ab am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit 'efe1b2402abd6f26f6483533b68983475f6e6144':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 18:54:35 +00:00
Bart Sears
e31c05296d am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '4e1bf7320222b481ed483dd78e5dd5d22d4eb644':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 18:50:25 +00:00
Jonathan Dixon
efe1b2402a DO NOT MERGE: Fix build after checkThread fix merge to master 
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.

Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba709273b3d46a1ef3b091eb2292c917)

Cherry pick to klp-dev as part of Bug: 13246014
 2014-03-03 18:48:00 +00:00
Bart Sears
4e1bf73202 Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 2014-03-03 18:42:28 +00:00
Primiano Tucci
f4e2723244 DO NOT MERGE: Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 244267500254daff8745f8c0fae3edcac735873f)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
 2014-03-03 18:01:53 +00:00
rich cannings
3cff34742a am 341e6b73: am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '341e6b73e6362f8757717a2518b370724c3a3913':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:31:35 +00:00
rich cannings
341e6b73e6 am fd6d8a8b: am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit 'fd6d8a8b736568ccb61af10dec04a99a8c36f29a':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:28:21 +00:00
rich cannings
fd6d8a8b73 am bc4d34dd: am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit 'bc4d34dd8e5cfdccede6aefb163fe2283785c5b0':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:24:59 +00:00
rich cannings
bc4d34dd8e am 8ebfbffc: Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 
* commit '8ebfbffcbb86123a54dd7979b26525eec30d77b9':
  Make FORCE_STOP_PACKAGES "signature|system"
 2014-03-03 17:21:58 +00:00
rich cannings
8ebfbffcbb Merge "Make FORCE_STOP_PACKAGES "signature|system"" into klp-dev 2014-03-03 17:19:02 +00:00
John Spurlock
d708b2f12b am e3a6a7b4: am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit 'e3a6a7b4693e6efd29f973c8cfe91f5778f847f4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:07:22 +00:00
John Spurlock
e3a6a7b469 am 841aa8db: am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '841aa8db20d09d80cd71ef2ed8eaebd4ebccfcc5':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:04:01 +00:00
John Spurlock
841aa8db20 am 5237a792: am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '5237a792aabaa49063b15cefa26f0341ea9cd311':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 17:00:49 +00:00
John Spurlock
5237a792aa am 8c44c394: Doc fixups to ContentResolver, MediaRouter. 
* commit '8c44c394bf82a9a8b30bef32ddf46aeed31d8ae4':
  Doc fixups to ContentResolver, MediaRouter.
 2014-03-03 16:57:22 +00:00
Victoria Lease
2b96157f92 Add casual/cursive/sans-serif-smallcaps font families. 
Bug: 12384866
Change-Id: I7482d228279a63ea92cb605de314b2f7d0ad483f
 2014-03-03 08:50:46 -08:00
John Spurlock
8c44c394bf Doc fixups to ContentResolver, MediaRouter. 
Change-Id: Ie821f971adf8fbbbbb6347713ae658e421d81cb8
 2014-03-03 10:14:41 -05:00
Yorke Lee
535c9e74d3 Catch ActivityNotFoundException in quick contacts badge 
Bug: 12015287
Change-Id: I2fa5daaa54cc7cc0cad9dee0828d751302cb5be7
(cherry picked from commit 4fc601a650405bfba99bcd40429376113bd9492a)
 2014-03-01 18:07:22 +00:00
Ying Wang
160c39d8a5 am 26026c62: am dd72b6e7: Merge "Fix indirect misuse of ." 
* commit '26026c62788f508f9de0df608dd7043e7d1399f6':
  Fix indirect misuse of $(my-dir).
 2014-03-01 17:30:34 +00:00