Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139,757 Commits 3 Branches 0 Tags
3bbd9be166fecc5c333f49e18a2f46c7355472cd
Commit Graph

139757 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jae Seo
3bbd9be166 Merge "TvContract: Change constants of canonical genres to all-caps values" 2014-06-19 00:17:11 +00:00
Jae Seo
0e33c1286d Merge "TvContract: Add columns for video format and resolution" 2014-06-18 18:28:24 +00:00
Roozbeh Pournader
f1a32d7082 Merge "Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts." 2014-06-18 18:22:48 +00:00
Roozbeh Pournader
1a8438a8bb Add Cherokee, Canadian Aboriginal Syllabics, and Yi fonts. 
Bug: 15708701
Change-Id: I1cdd26798ace5eec24d09b9b5b49eb943edacbe9
 2014-06-17 20:21:47 -07:00
Jae Seo
acc1957d78 TvContract: Change constants of canonical genres to all-caps values 
This is just for consistency with other constant values.

Change-Id: If226af08e66532c9110bc88e3c68d3958c67cdb6
 2014-06-17 19:44:10 -07:00
Jae Seo
68e0de81d5 TvContract: Add columns for video format and resolution 
Added COLUMN_VIDEO_FORMAT to the Channels table to indicate typical
video format for programs from a given TV channel, which can later be
used to filter out channels. Also defined common video formats and
resolutions and a utility method to get the video resolution for a given
format.

Added COLUMN_VIDEO_WIDTH and COLUMN_VIDEO_HEIGHT to the Programs table
to indicate the actual video dimension for each individual TV program,
which can be shown as a part of program information by applications.

Bug: 15351111, 15456031
Change-Id: Id72e25de40f06a1b615620365e06cf11e4cd9f81
 2014-06-17 19:41:43 -07:00
Jungshik Jang
bce527139a Merge "Add SystemAudioAutoInitiationAction and SystemAudioStatusAction" 2014-06-17 22:26:08 +00:00
Jungshik Jang
187d01765b Add SystemAudioAutoInitiationAction and SystemAudioStatusAction 
Once all device discovery action is done if there is audio amplifier
on device list, it should trigger system audio initiation action.
On or off of system audio is decided by Tv's last audio setting
(speaker). If system audio was the last audio setting, it will
try to turn on system audio; otherwise will turn it off.

In other hands, SystemAudioStatusAction is added to update
system audio status (mute or volume) after
SystemAudioAutoInitiationAction. In fact, RequestArcAction has
almost same code as it has and will refactore RequesArcAction
in the following changes.

Change-Id: I3d591242e79549cb73e14546f0d057ba08f878ef
 2014-06-18 11:37:11 +09:00
Deepanshu Gupta
128be2a919 am 5ba5ab31: (-s ours) am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit '5ba5ab3111d3738ac33efbeb7c4e87f46d923b37':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-06-18 01:47:15 +00:00
Deepanshu Gupta
5ba5ab3111 am 1595c61d: am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit '1595c61d2f1f081111958b4a22e8fec25402f3cd':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-06-18 00:20:35 +00:00
Deepanshu Gupta
1595c61d2f am 5a49fc33: am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit '5a49fc331ec7d5aa2532d650c32ea68733cbd5c0':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-06-18 00:15:35 +00:00
Deepanshu Gupta
5a49fc331e am c57b410c: Add a script to rename fonts for SDK. [DO NOT MERGE] 
* commit 'c57b410c8ef41e269f82f3b42a8d22a15c08755b':
  Add a script to rename fonts for SDK. [DO NOT MERGE]
 2014-06-18 00:10:34 +00:00
Colin Cross
0ead2a00f4 am 15967d0a: am 88b37eda: Merge "Fix reading memory usage for 64-bit processes" 
* commit '15967d0a8f8f858b0ed6aaf9d5aab5c65b94257f':
  Fix reading memory usage for 64-bit processes
 2014-06-17 22:53:09 +00:00
Colin Cross
15967d0a8f am 88b37eda: Merge "Fix reading memory usage for 64-bit processes" 
* commit '88b37edaeab7b31cab0f5115e5c9f63a49991408':
  Fix reading memory usage for 64-bit processes
 2014-06-17 22:47:50 +00:00
Sungsoo Lim
f76ba856f3 Merge "Print a warning message instead of throwing IllegalStateException" 2014-06-17 22:28:18 +00:00
Colin Cross
88b37edaea Merge "Fix reading memory usage for 64-bit processes" 2014-06-17 21:47:03 +00:00
Colin Cross
0c6bc73c5e Fix reading memory usage for 64-bit processes 
64-bit process will have virtual addresses that don't fit in an
unsigned long if ActivityManagerService is in a 32-bit process,
and the locations of the '-' and ' ' characters in the maps
are not predictable.  Fix the sscanf for finding the start of the
mapping, and use it again to find the end of the mapping.  Also
fix a few 64-bit warnings.

Change-Id: I8855c76085142768be1d45346f1032fd37cbe4eb
 2014-06-17 15:25:45 -07:00
Christopher Tate
42892f8aa5 Merge "Don't end lock task mode when not in lock task mode" 2014-06-17 21:43:29 +00:00
Christopher Tate
3bd90617ec Don't end lock task mode when not in lock task mode 
Change-Id: I3724d68ed7116d47024638d56c5bf43c4866f82e
 2014-06-18 16:37:52 -07:00
Brian Attwell
0d8acb2ceb Merge "setSelectedHeader() when switching to fragment" 2014-06-18 19:24:54 +00:00
George Mount
1798208443 Merge "Fix blinking animation during Visibility transitions." 2014-06-18 19:24:54 +00:00
Winson Chung
c4de2caaaf Merge "Adding start delay to the task view transforms." 2014-06-18 18:28:24 +00:00
Jason Sams
864b75be51 am 3aa4de11: am 802aaf3b: am 47de3060: Merge "Fix element size on 64b" 
* commit '3aa4de11b05599d75af92a15820731144941c38f':
  Fix element size on 64b
 2014-06-18 23:14:14 +00:00
Jason Sams
3aa4de11b0 am 802aaf3b: am 47de3060: Merge "Fix element size on 64b" 
* commit '802aaf3b9d029e8f6fdb1bf0a81758484801d330':
  Fix element size on 64b
 2014-06-18 23:08:35 +00:00
Jason Sams
802aaf3b9d am 47de3060: Merge "Fix element size on 64b" 
* commit '47de306050576535014ff2b0c08006f951eea2ee':
  Fix element size on 64b
 2014-06-18 22:54:08 +00:00
Winson Chung
7ab650cb43 Adding start delay to the task view transforms. 
- Adding slight delay to task bar buttons to allow touch feedback to show

Change-Id: I9f31ca378541fc34c7b741840c7f038340684b13
 2014-06-18 14:30:32 -07:00
Mark Renouf
7deaf7c530 am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev 
* commit 'f2dcb390444ffb42cf8637c99f53d821917554e6':
  Limit swipe dismiss progress to positive values
 2014-06-18 19:37:02 +00:00
Robert Ly
8312bfd618 am 5cfea842: Merge "docs: add allowembedded" into klp-modular-dev 
* commit '5cfea84264911b93057a667cbcaf90e10740d658':
  docs: add allowembedded
 2014-06-18 18:33:31 +00:00
Jeff Sharkey
7a2d46f39b Merge "Stronger PackageParser contract, more split work." 2014-06-18 18:28:24 +00:00
Jeff Sharkey
275e085d5a Stronger PackageParser contract, more split work. 
Require that method callers always provide relevant paths, instead of
relying on constructor.  Move DisplayMetrics to be an overall parser
parameter, and move PARSE_TRUSTED_OVERLAY to flags.

Parse split APKs and apply deterministic ordering based on split
names.  Assert consistent package name and version code across all
split APKs in a package, and enforce unique split names and required
base APK.

Collect certificates for split APKs, enforcing they're all signed
consistently.  Better flow control and resource cleanup when
collecting certs.  Refactor validation code so it's easier to reason
about.  Cleaner maintenance of read buffer when draining stream
contents.

Change-Id: I8bc8c62095fbb933227b9e76ad8771f4b1246fe8
 2014-06-18 16:04:13 -07:00
George Mount
52cd83e6cf Merge "Don't make translucent window opaque during activity transition." 2014-06-18 22:47:18 +00:00
Jason Monk
b593539faf Fix docs breakage from refactor 
Change-Id: I567249542ee02e4bde3e0e03cdfae8969104c1b8
 2014-06-18 18:28:46 -04:00
George Mount
3cc716c445 Don't make translucent window opaque during activity transition. 
Bug 15535332

Returning transitions will continue to not work until
Bug 14869070 is fixed.

Change-Id: If0128b58eb852b037924ae6dea8e975fedbe5be7
 2014-06-18 20:21:47 +00:00
Chris Craik
e48df00575 Merge "Clean up tessellation cache in prep for other tesselation types" 2014-06-18 19:24:54 +00:00
Chris Craik
6ac174b972 Clean up tessellation cache in prep for other tesselation types 
bug:15536396

Also fixes compilation warning, avoids SkPaint deep copy

Change-Id: I74334f08b1d34c6789aabf968ff62db5bacbed1b
 2014-06-18 15:31:55 -07:00
George Mount
4c20ea2972 Fix blinking animation during Visibility transitions. 
Bug 15618501

Change-Id: I9dff9eb386a4bfb51caec24f3f7cc0fad06ae04c
 2014-06-18 11:13:06 -07:00
Quddus Chong
82ea0eb213 am ef655f26: docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471 
* commit 'ef655f26fceba274b75e41f0b085434aa12914c8':
  docs: Added "games" metadata tag for Play Games landing page in d.a.c. Bug: 15709471
 2014-06-18 16:07:41 +00:00
Quddus Chong
ef655f26fc docs: Added "games" metadata tag for Play Games landing page in d.a.c. 
Bug: 15709471

Change-Id: Ibac4bd844245e71a8cb975bd86d07f9df0c25be5
 2014-06-18 08:57:24 -07:00
Griff Hazen
a2d30107c4 am f546eeb1: Merge "DO NOT MERGE Reduce chance of notification listener dropped messages." into klp-modular-dev 
* commit 'f546eeb1ede3c33ca3ec7fff6b8deb9d4e5cbc3e':
  DO NOT MERGE Reduce chance of notification listener dropped messages.
 2014-06-18 03:18:24 +00:00
Robert Ly
d664830ce4 am 95df0762: Merge "docs: Edits to the L Preview API overview." into klp-modular-dev 
* commit '95df0762c40bb79418d5fc8d59bc997a419e6250':
  docs: Edits to the L Preview API overview.
 2014-06-18 03:13:23 +00:00
Robert Ly
04095773be am b5d79bd2: Merge "Android TV Landing Page" into klp-modular-dev 
* commit 'b5d79bd2ab8b0382e05f38653ce0fbb56290ea58':
  Android TV Landing Page
 2014-06-18 03:13:19 +00:00
Joe Fernandez
003ff78a84 am 8e18e016: Wear Landing page fixes 
* commit '8e18e0169d3488e9a9ca02d1ff7aee06932a54a3':
  Wear Landing page fixes
 2014-06-18 03:13:15 +00:00
Joe Fernandez
8e18e0169d Wear Landing page fixes 
- fixed scroll animation
- un-hardcoded G+ widget

Change-Id: I679d6d5baf65516a163bb01ec3bf90c1b53e647b
 2014-06-17 20:00:33 -07:00
Kenny Guy
c6543afd6b Merge "Update API for launcher apps to use abstract class." 2014-06-17 22:01:53 +00:00
Svetoslav
6170cca05e Not touchable windows should not hide windows behind 
When computing which windows to report for accessibility we were not
reporting windows behind non touchable ones. However, if a window is
not-touchable the touch events go to the window behind it. Hence, a
not-touchable window should not affect the reproted windows for
accessibility.

Change-Id: I213a32b33b0986a73d8bbdf0a3e40e6ca6e4261b
 2014-06-17 14:54:39 -07:00
Robert Ly
5cfea84264 Merge "docs: add allowembedded" into klp-modular-dev 2014-06-17 21:43:29 +00:00
Robert Ly
fa9ea9fd3c docs: add allowembedded 
Change-Id: I748db66a62c85ad37f900b5bde83be178a1c6902
 2014-06-18 00:42:27 -07:00
John Reck
ca48160138 Merge "Throw ISE on too-big-views-with-layers" 2014-06-17 21:43:29 +00:00
John Reck
c25e506f7f Throw ISE on too-big-views-with-layers 
Bug: 12971954

Change-Id: I3ef995e91f236014b0a72a90846ef19ce6dc42b1
 2014-06-18 14:31:52 -07:00
Mark Renouf
d1e01b7631 am 7deaf7c5: am f2dcb390: Merge "Limit swipe dismiss progress to positive values" into klp-modular-dev 
* commit '7deaf7c5304aed9ca2ed6dc0e6c5e853127e6020':
  Limit swipe dismiss progress to positive values
 2014-06-18 21:09:39 +00:00