Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
113,016 Commits 3 Branches 0 Tags
9542acab2f70956465322db76b11df464aab4d5d
Commit Graph

31608 Commits

Author SHA1 Message Date
Dianne Hackborn
9542acab2f am d8c06fab: am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 
* commit 'd8c06fab80d4fa6c2eeef697bdfdbaff88b3d934':
  Fix issue #10671878: Proc stats needs to remove old data structures
 2013-09-09 14:14:36 -07:00
Alan Viverette
4e17981cdc am b198dbaf: am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev 
* commit 'b198dbaf19fcad86f81226aa06644db41d6028e4':
  Add WebVTT caption renderer
 2013-09-09 14:14:33 -07:00
Dianne Hackborn
d8c06fab80 am 80213add: Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 
* commit '80213adddaec79981aff47c81bdaac38725f2644':
  Fix issue #10671878: Proc stats needs to remove old data structures
 2013-09-09 14:08:19 -07:00
Alan Viverette
b198dbaf19 am 013634cc: Merge "Add WebVTT caption renderer" into klp-dev 
* commit '013634cc44d62fe90cd3e80a7530cffdc79f9715':
  Add WebVTT caption renderer
 2013-09-09 14:08:14 -07:00
Dianne Hackborn
80213addda Merge "Fix issue #10671878: Proc stats needs to remove old data structures" into klp-dev 2013-09-09 20:37:02 +00:00
Alan Viverette
013634cc44 Merge "Add WebVTT caption renderer" into klp-dev 2013-09-09 20:31:14 +00:00
Tom O'Neill
6446e4595c am a849dd62: am fb75487f: Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev 
* commit 'a849dd621432c7c3d369e5cedb722d6aa00eaa06':
  Explain what warnIfCallingFromSystemProcess() is about
 2013-09-09 12:47:56 -07:00
Tom O'Neill
a849dd6214 am fb75487f: Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev 
* commit 'fb75487f8af748feb83ce3116c4d6dcc4e819027':
  Explain what warnIfCallingFromSystemProcess() is about
 2013-09-09 12:44:00 -07:00
Tom O'Neill
fb75487f8a Merge "Explain what warnIfCallingFromSystemProcess() is about" into klp-dev 2013-09-09 19:41:25 +00:00
Chet Haase
43f839c695 am f58ad4ef: am bbddd49d: Merge "Propagate pivot values of 0 to native layer" into klp-dev 
* commit 'f58ad4ef2037317bedbd21dcd429ca050976da60':
  Propagate pivot values of 0 to native layer
 2013-09-09 10:41:28 -07:00
Chet Haase
82a8f3b73d am 4f38f7a9: am b44ab987: Merge "TextChange transition now uses CharSequence instead of String" into klp-dev 
* commit '4f38f7a93722fe8f3b4b3c8a9d06c6b77e030960':
  TextChange transition now uses CharSequence instead of String
 2013-09-09 10:41:25 -07:00
Chet Haase
f58ad4ef20 am bbddd49d: Merge "Propagate pivot values of 0 to native layer" into klp-dev 
* commit 'bbddd49d6dc1b72dc81d4bb0033dea578066853e':
  Propagate pivot values of 0 to native layer
 2013-09-09 10:37:56 -07:00
Chet Haase
4f38f7a937 am b44ab987: Merge "TextChange transition now uses CharSequence instead of String" into klp-dev 
* commit 'b44ab9872a0b6d325a38c79dfcae81ff5fc8622e':
  TextChange transition now uses CharSequence instead of String
 2013-09-09 10:37:53 -07:00
Chet Haase
bbddd49d6d Merge "Propagate pivot values of 0 to native layer" into klp-dev 2013-09-09 17:36:48 +00:00
Chet Haase
b44ab9872a Merge "TextChange transition now uses CharSequence instead of String" into klp-dev 2013-09-09 17:36:13 +00:00
Alan Viverette
2bd9dccc13 am 1519a158: am 23f31a1c: Merge "Only activate FastScroller when it\'s needed" into klp-dev 
* commit '1519a1588a053eec3a3d0c8eb077e0cc12567d0b':
  Only activate FastScroller when it's needed
 2013-09-09 10:31:10 -07:00
Alan Viverette
1519a1588a am 23f31a1c: Merge "Only activate FastScroller when it\'s needed" into klp-dev 
* commit '23f31a1c4ed313790921427df82f36960d9e9706':
  Only activate FastScroller when it's needed
 2013-09-09 10:27:42 -07:00
Alan Viverette
23f31a1c4e Merge "Only activate FastScroller when it's needed" into klp-dev 2013-09-09 17:24:32 +00:00
Jeff Sharkey
184c4a096a am 7c4f1492: am 30590646: Merge "Remember mode and sort on per-directory basis." into klp-dev 
* commit '7c4f14924e465b3cbbea7a79192343c97142d9a1':
  Remember mode and sort on per-directory basis.
 2013-09-09 10:09:50 -07:00
Jeff Sharkey
7c4f14924e am 30590646: Merge "Remember mode and sort on per-directory basis." into klp-dev 
* commit '30590646d6846a4db76d416c70ee68a3f9f359b5':
  Remember mode and sort on per-directory basis.
 2013-09-09 10:06:37 -07:00
Jeff Sharkey
30590646d6 Merge "Remember mode and sort on per-directory basis." into klp-dev 2013-09-09 17:04:47 +00:00
Dianne Hackborn
be4c1d74a7 Fix issue #10671878: Proc stats needs to remove old data structures 
We now keep track of which process and service states are actively
in use, and remove any that are not in use during a commit.  The
activity manager needed to be tweaked to report this data, and ensure
it does not try to operate on one of these structures when not in
use.

Also some other fixes:

- We now keep track of process names associated with services, for
display in the UI.
- Keep track of total run time for each service, also for UI.
- The parceled format is more efficient, not storing duplicates of
process/package names, and writing times as ints when possible.
- Reduced commit period from 1 day to 12 hours, so that our UI can
be a little closer at its attempt to display the stats over 1 day.

Change-Id: Ifeda0ffe963a7b49d8eb2a3f6923f3a5e71a4e43
 2013-09-09 09:49:52 -07:00
Narayan Kamath
057cba6cc9 Merge "Revert "Allow SSL caches to be installed directly on SSLContexts."" 2013-09-09 16:48:30 +00:00
Amith Yamasani
25a333a762 am f0f79131: am 910adb11: Merge "Throw an exception if isValidFragment is not overridden for KK targets" into klp-dev 
* commit 'f0f79131521eefdbae5c5da9f3c45c83960540d0':
  Throw an exception if isValidFragment is not overridden for KK targets
 2013-09-09 09:47:12 -07:00
Narayan Kamath
fdf4bbf2d0 Revert "Allow SSL caches to be installed directly on SSLContexts." 
This reverts commit 25bef03cbf.

Breaks build with
 cannot access com.android.org.conscrypt.SSLClientSessionCache
class file for com.android.org.conscrypt.SSLClientSessionCache not found

Change-Id: I6a89b45d5e8c7547778d7485ed02006cd4679989
 2013-09-09 16:47:08 +00:00
Amith Yamasani
f0f7913152 am 910adb11: Merge "Throw an exception if isValidFragment is not overridden for KK targets" into klp-dev 
* commit '910adb11abc84bf4a113ac130c3998082cc84294':
  Throw an exception if isValidFragment is not overridden for KK targets
 2013-09-09 09:45:10 -07:00
Amith Yamasani
910adb11ab Merge "Throw an exception if isValidFragment is not overridden for KK targets" into klp-dev 2013-09-09 16:43:16 +00:00
Tom O'Neill
365632e8ee Explain what warnIfCallingFromSystemProcess() is about 
- Helps the next person to hit a bug like b/10621831

Change-Id: Id44dc57472516ec5f574d22d4c131ab9870648db
 2013-09-09 09:34:58 -07:00
Jeff Sharkey
d182bb641f Remember mode and sort on per-directory basis. 
Persist the last user-selected list/grid mode and sort order for
each directory.  Remembered user choice always overrides provider
hinting.

Filter out recent documents that don't match requested MIME type, and
show recents in grid mode when picking images.  Hide mode and sort
order in recents.

Add hinting flag for backend to indicate a directory would like to be
sorted by last modified.  Include explicit root in DocumentStack and
clearly mark derived fields.

Bug: 10392047, 10608506
Change-Id: I2dd3a0e4112852ebf87e7dbb08b3781c86587dcf
 2013-09-09 09:16:09 -07:00
Narayan Kamath
25bef03cbf Allow SSL caches to be installed directly on SSLContexts. 
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.

Change-Id: Ibfb4b99fa86bc0704674437d9b860531317d2bde
 2013-09-09 16:07:07 +00:00
Chet Haase
183e2a351d Propagate pivot values of 0 to native layer 
Logic in pivotXY setters noops when the new value equals
the previous value. However, the initial value is "0" even
though we actually use a value of the view's midpoint by
default. If an app sets a new value of 0, we don't send it
down to the native layer because it's the same as the initial
value, even though we're actually using a midpoint value instead.
This causes a conflict between the matrix used for invalidations
(which use the actual values the app set) and the matrix used
for rendering (which uses the default midpoint values).

The fix is to make sure we send down the initial value, even when it
equals the default value, by checking to see whether this is the
first time we're setting the pivot.

Issue #9337635 Clipping and bad rendering of view corners when y pivot is set

Change-Id: I4aa20c4a3c9a866ca17df3e067232b832d0ef504
 2013-09-09 08:39:35 -07:00
Narayan Kamath
0033539a43 resolved conflicts for merge of ab98aec6 to master 
Change-Id: I773bce338ebc42f7428d9942d22ed140bcfbf3d9
 2013-09-09 09:59:31 +01:00
Dianne Hackborn
ab98aec612 am 4b989781: Merge "Work on issue #10130785: Restore silence and vibrate settings..." into klp-dev 
* commit '4b98978157295c6e7ea21b70ffcf9edffc41f0e1':
  Work on issue #10130785: Restore silence and vibrate settings...
 2013-09-08 12:33:48 -07:00
Dianne Hackborn
4b98978157 Merge "Work on issue #10130785: Restore silence and vibrate settings..." into klp-dev 2013-09-08 19:31:06 +00:00
Svetoslav Ganov
d0ff896789 am d8adcd21: am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev 
* commit 'd8adcd219dab97682a808b1ba12cd6528e33505e':
  Printers for a disappearing print serivce incorrectly removed.
 2013-09-07 15:09:24 -07:00
Svetoslav Ganov
d8adcd219d am c7222124: Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev 
* commit 'c72221242e560b4176e6fb9e3eec1c32cc1b96c3':
  Printers for a disappearing print serivce incorrectly removed.
 2013-09-07 15:07:09 -07:00
Svetoslav Ganov
c72221242e Merge "Printers for a disappearing print serivce incorrectly removed." into klp-dev 2013-09-07 22:05:14 +00:00
Ying Wang
cc7754ee36 am 4700175a: am d57de6af: Fix docs build. 
* commit '4700175a2617b456c2b820d519750e80cda465fc':
  Fix docs build.
 2013-09-06 23:02:11 -07:00
Ying Wang
4700175a26 am d57de6af: Fix docs build. 
* commit 'd57de6afb8981dc1663d41a842ab7cdae93427a1':
  Fix docs build.
 2013-09-06 22:59:40 -07:00
Ying Wang
d57de6afb8 Fix docs build. 
Change-Id: I6fd0d711b2cc7726fdaa9119ee467ed6fab82de1
 2013-09-06 22:53:16 -07:00
Alan Viverette
b9f2722f6f Only activate FastScroller when it's needed 
Removes code that was incorrectly handling ACTION_DOWN when the
host ListView started intercepting events for its own use. Fixes
handling of short lists and changes resulting from toggling the
FastScroller enabled state.

BUG: 10651874
Change-Id: I7b088b46d00a372a0a55291db892cc059f1aed20
 2013-09-06 19:39:47 -07:00
Michael Wright
65ae4c6f79 am 8091f226: am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev 
* commit '8091f2262fe0774723694cea95a6f8b8785087e4':
  Remove tap to click from touch nav devices
 2013-09-06 19:07:29 -07:00
Michael Wright
aa1c5e4deb am d13fa001: am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev 
* commit 'd13fa0018b273f0db13154d520f7f0d11a2cb375':
  Special case game controller fallback keys for Japan
 2013-09-06 19:07:25 -07:00
Michael Wright
8091f2262f am edaf6af1: Merge "Remove tap to click from touch nav devices" into klp-dev 
* commit 'edaf6af16a5c33557a9c4ed00f9bebdac0dd83aa':
  Remove tap to click from touch nav devices
 2013-09-06 19:05:47 -07:00
Michael Wright
d13fa0018b am 7b4f60de: Merge "Special case game controller fallback keys for Japan" into klp-dev 
* commit '7b4f60deb2819496733c0c85c57c6236900fe0c2':
  Special case game controller fallback keys for Japan
 2013-09-06 19:05:44 -07:00
Michael Wright
edaf6af16a Merge "Remove tap to click from touch nav devices" into klp-dev 2013-09-07 02:04:46 +00:00
Michael Wright
7b4f60deb2 Merge "Special case game controller fallback keys for Japan" into klp-dev 2013-09-07 02:04:20 +00:00
Jeff Brown
c677ff8c3b am cbf2b02d: am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev 
* commit 'cbf2b02d6c288c49f5bdbcb70d87c44d26086ba4':
  Fix native crash when message queue quits.
 2013-09-06 18:41:43 -07:00
Jeff Brown
cbf2b02d6c am 23a5f44c: Merge "Fix native crash when message queue quits." into klp-dev 
* commit '23a5f44c5a306b4a70821722a697da55cc3c5db8':
  Fix native crash when message queue quits.
 2013-09-06 18:39:09 -07:00
Jeff Brown
23a5f44c5a Merge "Fix native crash when message queue quits." into klp-dev 2013-09-07 01:34:52 +00:00