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

120150 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
177d6bf586 am cad87695: am fad83743: Merge "NumberPicker style for wearable devices." into klp-modular-dev 
* commit 'cad876957d38f78daa0878a36b04ee4bce858d10':
  NumberPicker style for wearable devices.
 2014-03-04 02:04:26 +00:00
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
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
bd443abc0d am 07993d1d: 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 '07993d1d80692b80c263c3a7b743ce58ce7dd9b5':
  docs: Changes to release notes for the Android SDK 22.6.0 release.
 2014-03-04 01:27:37 +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
533d300f9a am 268088ee: am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families." 
* commit '268088eed6b1dd3153b89de1b4c97c518018e879':
  Add casual/cursive/sans-serif-smallcaps font families.
 2014-03-03 23:58:39 +00: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
bc8301dfa3 am 0054ed81: am 8bb3b8f8: am 95cf532f: am 26de0b71: am cce121fb: Merge "Update permission description string." into klp-docs 
* commit '0054ed815a3db340a27d8a179d3b748bf3eeaaf0':
  Update permission description string.
 2014-03-03 22:30:27 +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
Jay Shrauner
75b26ccc7d am 1fdcab95: am 81f74c7d: am 7e3efa82: am 1f168fd4: am 4ef0aabe: Merge "Catch ActivityNotFoundException in quick contacts badge" into klp-dev 
* commit '1fdcab956d55418febbbc0f5928242c3420bd16a':
  Catch ActivityNotFoundException in quick contacts badge
 2014-03-03 22:19:37 +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
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
Craig Mautner
ab55e524b8 Show the keyguard if unsecure window on top 
When traversing windows save the fact that windows above the topmost
fullscreen window do not hide the lockscreen. If there is such a
window don't show it.

Fixes bug 13225149.

Change-Id: Ib6f33cbcfb2f60d8957a9184729ecdec80c6a236
 2014-03-03 13:26:03 -08:00
Jonathan Dixon
8553be9b67 am 6ab920fb: am 5b741144: am 3c88a685: am 7c01f9f7: am efe1b240: DO NOT MERGE: Fix build after checkThread fix merge to master 
* commit '6ab920fb614cb7d33498ec75254df5a7fd271ed3':
  DO NOT MERGE: Fix build after checkThread fix merge to master
 2014-03-03 21:22:22 +00:00
Bart Sears
5acee80689 am 5a0a37e2: am 73eefce3: am 7f950326: am e31c0529: am 4e1bf732: Merge "DO NOT MERGE: Adding freeMemoryForTests static method to WebView." into klp-dev 
* commit '5a0a37e23d73befbd7ebf0e8a252a40b0102b72f':
  DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
 2014-03-03 21:22:19 +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
Tim Murray
4db08b044d am 9f141fbb: am fb51a430: am 8377a4fd: Merge "Fix null check for BaseObj.equals." 
* commit '9f141fbb786c07ff56324717e1e0747a3cabf23b':
  Fix null check for BaseObj.equals.
 2014-03-03 20:41:01 +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