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

119419 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Friedman
663d7753ea am 6aa6219a: Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev 
* commit '6aa6219aebc2a73c63e2f0e5f82d3dc55f0a6f9f':
  NDK r9d: Incorporates all review comments, final file sizes.
 2014-03-04 08:13:06 +00:00
Yorke Lee
d53f7a712d am 6c758e86: am 468e973f: am 81479358: Reword the "Quick contacts not available" string 
* commit '6c758e8650a010b2ad4650df77f91fad5fcf51e2':
  Reword the "Quick contacts not available" string
 2014-03-04 08:09:42 +00:00
David Friedman
c702fa9716 am 9182e5f8: DO NOT MERGE 
* commit '9182e5f848a2865a233ed143d56ad8dae599d875':
  DO NOT MERGE
 2014-03-04 07:47:46 +00:00
David Friedman
9182e5f848 DO NOT MERGE 
Moving change to release branch

NDK r9d: Incorporates all review comments, final file sizes.

Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
(cherry picked from commit 0cdefe09695651e4a56dd980219710af8e1039a3)
 2014-03-04 04:38:06 +00:00
David Friedman
6aa6219aeb Merge "NDK r9d: Incorporates all review comments, final file sizes." into klp-ub-dev 2014-03-04 04:25:39 +00:00
Yorke Lee
6c758e8650 am 468e973f: am 81479358: Reword the "Quick contacts not available" string 
* commit '468e973f52d09a5e724c9ccb545ec08c49991506':
  Reword the "Quick contacts not available" string
 2014-03-04 04:12:06 +00:00
Yorke Lee
468e973f52 am 81479358: Reword the "Quick contacts not available" string 
* commit '81479358decb0a2cefbb8245e0f56ed0e966d697':
  Reword the "Quick contacts not available" string
 2014-03-04 04:09:04 +00:00
Scott Main
b8881542c4 am 1f8bd433: am 2970654a: am 0109047d: update google play badge AI files, v2. 
* commit '1f8bd43378c98c2cc7dd34b14e2028145f9c3bff':
  update google play badge AI files, v2.
 2014-03-04 03:14:43 +00:00
Scott Main
1f8bd43378 am 2970654a: am 0109047d: update google play badge AI files, v2. 
* commit '2970654a6ad2ebcfaabcb58d120b28987111602a':
  update google play badge AI files, v2.
 2014-03-04 03:11:40 +00:00
Scott Main
2970654a6a am 0109047d: update google play badge AI files, v2. 
* commit '0109047de1d68f7e911ae8d39f70330f5dbcd642':
  update google play badge AI files, v2.
 2014-03-04 03:08:18 +00:00
Scott Main
0109047de1 update google play badge AI files, v2. 
Change-Id: If74ae8cace0e82e81deede459b7bbf862a266ce7
 2014-03-03 19:04:20 -08:00
Scott Main
290fec2e2e am b436b93d: am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit 'b436b93d98c6e7926746a6d641cc3ffa55bab6b6':
  dashboard update for march '14
 2014-03-04 02:54:54 +00:00
Scott Main
b436b93d98 am 318c73a0: am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit '318c73a0df694bb82821bfc4e2cd874bb09b2fab':
  dashboard update for march '14
 2014-03-04 02:50:53 +00:00
Yorke Lee
81479358de Reword the "Quick contacts not available" string 
Bug: 12077052
Change-Id: I6006692ae13d79d3697242d0b9015b30b1826eab
(cherry picked from commit 89b366fa95f625275f1b94d800d22998f942ab8c)
 2014-03-04 02:50:21 +00:00
Scott Main
318c73a0df am 4a5a2392: Merge "dashboard update for march \'14" into klp-docs 
* commit '4a5a23920e1a3414f1c87e3cf4c9bce08fddac4f':
  dashboard update for march '14
 2014-03-04 02:47:51 +00:00
Scott Main
4a5a23920e Merge "dashboard update for march '14" into klp-docs 2014-03-04 02:45:26 +00:00
David Friedman
0cdefe0969 NDK r9d: Incorporates all review comments, final file sizes. 
Staged at: http://boku.mtv:8195/tools/sdk/ndk/index.html

Change-Id: Ie33eed770c029af8a20385b5bd6c05fdc9bea750
 2014-03-03 18:31:13 -08:00
Filip Gruszczyński
fad8374373 Merge "NumberPicker style for wearable devices." into klp-modular-dev 2014-03-04 01:56:38 +00:00
Christopher Tate
28c8cfd762 Adapt to underlying changes in the PBKDF2 implementation 
We need to specify "PBKDF2WithHmacSHA1And8bit" now in order to get precisely
the same output as was previously generated with "PBKDF2WithHmacSHA1".  We
also now try both when it's ambiguous which was used to generate the archive
checksums.

Bug 12494407

Cherry-pick from master.

Change-Id: I2d6081dd62f50f7d493045150b327ed120de7abd
 2014-03-03 17:49:30 -08:00
Christopher Tate
88c908323a Update PackageMonitor to recognize new 'replacing' semantics 
The ACTION_EXTERNAL_APPLICATIONS_UNAVAILABLE broadcast now uses the
EXTRA_REPLACING intent extra when it is sent as part of an upgrade operation
on a forward-locked application.  Update PackageMonitor to recognize this
new information and express it appropriately to the observer.

Bug 11988313

Cherry-pick from master.

Change-Id: Iecea1876ffc918f23f9fa5845f1f89ed8d740dd5
 2014-03-03 17:40:41 -08: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
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
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
Scott Main
22a9fb31a4 dashboard update for march '14 
Change-Id: I60d96bba527c7fcbfe05c069ad1abf226e38f50c
 2014-03-03 14:00:59 -08: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
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
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
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
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