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

502 Commits

Author SHA1 Message Date
Justin Koh
9a8afb1c3a am d89929db: am c635ef99: am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'd89929db3e010eaa68d8f7c8227f95cdd4fb5179':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:36:39 +00:00
Justin Koh
c635ef999b am ec5b6e87: Merge "Add RobotoCondensed-Light to build." into klp-modular-dev 
* commit 'ec5b6e8726a215ff912bbbf872b8bdf600a74e1e':
  Add RobotoCondensed-Light to build.
 2014-03-25 21:13:53 +00:00
Justin Koh
f1596064d3 Add RobotoCondensed-Light to build. 
Add RobotoCondensed-Light to build so that apps don't all need to include their
own copy.
Bug: 13087110

Change-Id: I55973a4ba2a68858b79271519a0ecc9c54f6b31e
 2014-03-25 13:19:02 -07:00
Michael Wright
a54f852d3d am ed28fc89: Utilize new Android LED constants. DO NOT MERGE 
* commit 'ed28fc89e3085a88c6bd8b4269988150f3eceb56':
  Utilize new Android LED constants. DO NOT MERGE
 2014-03-11 23:16:25 +00:00
Michael Wright
ed28fc89e3 Utilize new Android LED constants. DO NOT MERGE 
Also, have EventHub manage game controllers' player LEDs

Change-Id: Ic7dba19ad236a3c7d1aff5d3f938bd239b98d51d
 2014-03-11 14:52:18 -07:00
Zhihai Xu
cb714ae68e am 74f36d31: am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 
* commit '74f36d31892d8fdfddbecc7bf3018aa3a190e5fb':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
 2014-03-11 19:19:05 +00:00
Zhihai Xu
74f36d3189 am c48c9626: am 82ec1442: Merge "DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" into klp-dev 
* commit 'c48c9626bd2eb91aab33a034baf139aa2b92671d':
  DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""
 2014-03-11 17:43:56 +00:00
Zhihai Xu
7434fa31d8 DO NOT MERGE Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."" 
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

bug:12099469
Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
 2014-03-10 10:58:14 -07:00
Jeff Brown
2901e0442a am 9e3de5f7: am 6f9f8e7a: am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '9e3de5f70d77f7152b25fec6c27b73d037c1376d':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-08 05:43:12 +00:00
Jeff Brown
6f9f8e7aad am 01b5e765: Merge "Declare KEYCODE_SLEEP and KEYCODE_WAKEUP." into klp-modular-dev 
* commit '01b5e765e59c14cdfb62f1a8684e9116a46874d2':
  Declare KEYCODE_SLEEP and KEYCODE_WAKEUP.
 2014-03-07 23:39:12 +00:00
Jeff Brown
6212a49a94 Declare KEYCODE_SLEEP and KEYCODE_WAKEUP. 
These new keys behave in similarly to KEYCODE_POWER but do not
simply toggle between awake and asleep states.

Sleep puts the device to sleep if it is awake.
Wakeup wakes up the device if it is asleep.

Bug: 12938999
Change-Id: I260fb918cc858882fe06fa880910df5763a76c5d
 2014-03-07 14:02:55 -08:00
Michael Wright
a6434b5e80 am 78e208ac: am 6b661fdc: am dd9f7cb2: Add Odie KL file. 
* commit '78e208accebd68fd1dc634a57323cafa1143d6ed':
  Add Odie KL file.
 2014-03-06 02:57:18 +00:00
Michael Wright
6b661fdcb6 am dd9f7cb2: Add Odie KL file. 
* commit 'dd9f7cb2948af46047ab16d44c28a8f91948bdf5':
  Add Odie KL file.
 2014-03-06 02:19:35 +00:00
Michael Wright
dd9f7cb294 Add Odie KL file. 
Change-Id: I74cc90a3c66e876db51da8f9fd8ced3bac373032
 2014-03-05 17:47:54 -08:00
Michael Wright
1f762b3490 am 9aa7c6e5: am e4a71792: am 4448f9d7: am c5dea68e: Merge "Revert Japanese special case fallback keys." into klp-dev 
* commit '9aa7c6e583ac18d6c338af8d478512c4ab5293b4':
  Revert Japanese special case fallback keys.
 2014-03-06 01:03:52 +00:00
Victoria Lease
4fa72e3574 am 533d300f: am 268088ee: am 3ce2b57d: am 9404752d: Merge "Add casual/cursive/sans-serif-smallcaps font families." 
* commit '533d300f9a4ac98661affe1deb9dca72306ada2b':
  Add casual/cursive/sans-serif-smallcaps font families.
 2014-03-04 00:04: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
Michael Wright
bdffc3ad05 Revert Japanese special case fallback keys. 
Reverts commits 4567e40eb04589d211af82f2dcb16cb3955c605e and
a977707d6e7006d11cfde045f187e777b31b9e04, which added special case fallbacks
for game controllers in the Japanese locale.

Bug: 12923922
Change-Id: I229126e589e11fb5de86772ef9c59d09723af941
 2014-02-26 15:43:48 -08:00
Michael Wright
8a5dbac349 Remove Japanese button swap 
Bug: 12923922
Change-Id: I4960d8189e751514a595823d7ed9b273e3ff8eb8
 2014-02-14 13:20:58 -08:00
Zhihai Xu
c9eff80eca Merge "Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode.""" 2014-01-10 17:44:22 +00:00
Michael Wright
fbefb93f26 Fix Rhodi KL file axes 
Change-Id: Ifb779c7730ed4b69325bf57aa7629c663ee4cb5c
 2014-01-08 15:40:14 -08:00
Zhihai Xu
5416022506 Revert "Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."" 
This reverts commit 371427b53c70d1a71012de404c29187fe303a22a.

Change-Id: I497832b54856a9909fc8651ee67555e02e0e763e
 2014-01-07 11:37:24 -08:00
Michael Wright
88d7a06508 Add Rhodi kl file 
Change-Id: I950fd2df88b6100dce29e97fd1d9b292ed51fffe
 2013-12-18 18:20:43 -08:00
Glenn Kasten
2a4768c735 KeypressInvalid_48k.ogg was 44.1 kHz previously 
Command:
oggenc --resample 48000 -o ogg/KeypressInvalid_48k.ogg KeypressInvalid.wav

Change-Id: I862ba47f41eee8b6668cd45b9322f164fd652a7f
 2013-11-19 16:40:06 -08:00
Glenn Kasten
62ca3a891d am c5f317e4: am 1b21665b: am c32d89f6: Merge "Replace keyboard sounds with latest (softer) design" into klp-dev 
* commit 'c5f317e48e0406a0303eb1303cee4c5da2c6272d':
  Replace keyboard sounds with latest (softer) design
 2013-11-13 18:48:20 -08:00
Glenn Kasten
34262cdfc5 Replace keyboard sounds with latest (softer) design 
Make AudioPackage8 (N7 v1) and AudioPackage9 (N10) more like
AudioPackage12_48 (N5).

Bug: 11158758
Change-Id: I55052218f62159fd90efb21be19e19509eb11afe
 2013-11-13 09:17:46 -08:00
Glenn Kasten
9cd7c61ffc am d3616c07: am adfbc5b2: am 8a0d133c: Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev 
* commit 'd3616c07f7a39efbf6a1e4c85ede57fe0214430f':
  Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)
 2013-11-12 10:55:12 -08:00
Glenn Kasten
8a0d133cd7 Merge "Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5)" into klp-dev 2013-11-12 18:40:42 +00:00
Jean-Michel Trivi
51cf5c7310 am cb623a8d: am f99e8650: am fed822cb: Merge "Fix Tethys asset" into klp-dev 
* commit 'cb623a8d44cfef63133c3c8d1d8a31aa48ba57d2':
  Fix Tethys asset
 2013-11-11 20:51:54 -08:00
Jean-Michel Trivi
0623a1bc76 Fix Tethys asset 
When played on a device with MBDRC or on headphones, flaws in this
 asset become apparent: hiss throughout the sound, and positive
 true-peak on the first attack on the right channel.
This new version has reduced noise through substraction of the
 noise print at the end, and fadeout to silence. The asset is
 encoded with a 3dB headroom and a slight EQ.

Bug 11077919

Change-Id: I73ab91ca7118afd382e15a4673c332353294470e
 2013-11-08 17:41:35 -08:00
Glenn Kasten
24cea2b836 am 2e47a2c8: am 744cdf57: am b6d3c1ce: Merge "Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)" into klp-dev 
* commit '2e47a2c871e99eb89b3ffe6062cdd8740a954fdc':
  Make AudioPackage10 (N4) more like AudioPackage12_48 (N5)
 2013-11-08 11:57:37 -08:00
Glenn Kasten
2f6965c2a4 Make AudioPackage11 (N7 v2) more like AudioPackage12_48 (N5) 
Replace keyboard and lock sounds with latest (softer) design.
Bug: 11158758

Change-Id: Ib02a0cbdecaaf7618f8806f84bc896912821b5f4
 2013-11-08 09:34:16 -08:00
Glenn Kasten
14aa1ed0f4 Make AudioPackage10 (N4) more like AudioPackage12_48 (N5) 
Replace keyboard and lock sounds with latest (softer) design.

Bug: 11158758
Change-Id: Ic40d53207be8b23fdafb3ac0c0852744950c79ec
 2013-11-08 00:36:20 +00:00
Matthew Xie
ff0b79fc53 am 86271499: am f2194693: am 371427b5: Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode." 
* commit '86271499bbac0537630297a670ed67b869cd54d5':
  Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode."
 2013-11-04 21:59:19 -08:00
Matthew Xie
371427b53c Revert "Add PLAY and PAUSE keycodes and remove PLAY_PAUSE keycode." 
This reverts commit 7a863b4bdae1d01d4ac972fe8ff8968bbfed6709.

bug 11325212
Change-Id: I8b50aec4ae39894a854583a74bda4db3445d3d67
 2013-11-01 13:49:20 -07:00
Raph Levien
dd0321aff2 am bea31576: am bcd8ad2e: am ec646dc9: Merge "Change yMax of Roboto fonts from 2146 to 2163" into klp-dev 
* commit 'bea315763f25a2bd8282004e3ef29056980671be':
  Change yMax of Roboto fonts from 2146 to 2163
 2013-10-25 11:13:57 -07:00
Roozbeh Pournader
6a0ef07e1f Change yMax of Roboto fonts from 2146 to 2163 
This is needed so that other UI fonts don't clip, since
they have been designed assuming that a yMax of at least
2163 is available to them.

The change is achieved by modifying an invisible tiny
square that already existed at the extrema of the the glyph
for U+FFFD REPLACEMENT CHARACTER that was already the
tallest glyph in the fonts.

Bug: 10699356
Change-Id: Ib03ea071b7a82066cacf2b3ae9769db0c449a479
 2013-10-24 18:50:25 -07:00
Michael Wright
58f5a6134e Utilize new Android LED constants 
Also, have EventHub manage game controllers' player LEDs

Change-Id: Ic0a1515979d72a30d182d51d89ca6753c5bd7bf8
 2013-10-18 17:54:48 -07:00
Victoria Lease
60a641d2e4 remove U+261d from MTLmr3m.ttf 
This codepoint is covered by NotoColorEmoji.ttf, and MTLmr3m is
shadowing it.

Bug: 11177194
Change-Id: I827f58bcae4c9b4849034fa85608087b1e786f25
 2013-10-14 09:29:11 -07:00
Marco Nelissen
d983ba5cac Add PowerManager method to assign blame to a single uid 
Currently used by audioflinger to account for recording wakelocks.
b/10985160

Change-Id: I18fc8487f2a197bf02b5269a4bcae9e75b6c2207
 2013-10-03 08:49:36 -07:00
Daniel Sandler
4e6f752f23 Put soundpooled sounds in the right place. 
Bug: 10846839
Change-Id: I5318c2d54ea0e25fa74bbafc35fb4f7a2883b351
 2013-09-20 00:27:01 -04:00
Daniel Sandler
1816375ff7 Merge "New sounds for K." into klp-dev 2013-09-19 14:52:07 +00:00
Daniel Sandler
dcbdd3b420 New sounds for K. 
AudioPackage12 uses the new sounds (specifically the default
versions at 44.1kHz); device-specific makefiles can elect to
use the 48k versions instead by including
AudioPackage12_48.mk.

Bug: 9454760
Change-Id: If714fc4b98f6700163f08c92a6376f28f9616382
 2013-09-18 23:09:58 -04:00
Victoria Lease
4ce0931ffd restore coverage lost in NotoColorEmoji transition 
The following codepoints were previously provided by AndroidEmoji,
but are no longer present in our fallback chain. This commit restores
them by resurrecting a subset version of AndroidEmoji.ttf:

 U+25AB WHITE SMALL SQUARE
 U+25FB WHITE MEDIUM SQUARE
 U+25FC BLACK MEDIUM SQUARE
 U+25FD WHITE MEDIUM SMALL SQUARE
 U+25FE BLACK MEDIUM SMALL SQUARE
 U+2600 BLACK SUN WITH RAYS
 U+26AA MEDIUM WHITE CIRCLE
 U+26AB MEDIUM BLACK CIRCLE
 U+2757 HEAVY EXCLAMATION MARK SYMBOL
 U+2934 ARROW POINTING RIGHTWARDS THEN CURVING UPWARDS
 U+2935 ARROW POINTING RIGHTWARDS THEN CURVING DOWNWARDS
 U+2B05 LEFTWARDS BLACK ARROW
 U+2B06 UPWARDS BLACK ARROW
 U+2B07 DOWNWARDS BLACK ARROW
 U+2B1B BLACK LARGE SQUARE
 U+2B1C WHITE LARGE SQUARE
 U+2B50 WHITE MEDIUM STAR
 U+2B55 HEAVY LARGE CIRCLE
 U+303D PART ALTERNATION MARK

These characters see regular use in kaomoji constructions (and
elsewhere), and it really wouldn't do to lose them.

Bug: 10144988
Change-Id: I72b541aad01bc5ccac829be44ed259c461724142
 2013-09-18 15:30:32 -07:00
Glenn Kasten
0f3e1487b2 Merge "Remove obsolete assets from target /system/media/video/" into klp-dev 2013-09-14 00:07:44 +00:00
Victoria Lease
54769862ff NotoColorEmoji.ttf is the new AndroidEmoji.ttf 
Bug: 10144988
Change-Id: I04ebb86e283b752c43597b5f908f5c28f7806ee1
 2013-09-13 14:11:58 -07:00
Glenn Kasten
db8c1655ea Remove obsolete assets from target /system/media/video/ 
These were previously used for background replacement effect, but it seems
like they aren't needed any more and just take up space in filesystem.

Change-Id: I0782ac0c8f109e4f28e9f43c20d30dc6ccd82ef7
 2013-09-13 10:27:40 -07:00
Victoria Lease
36d4cc8d2b include Padauk in fallback chain 
Bug: 10625246
Change-Id: I32530a992beeafe2ee16da36f0dc0a752c647cc6
(cherry picked from commit 5d34e4d679e6237b0d075177d1e365161c684445)

Conflicts:
	data/fonts/fallback_fonts.xml
 2013-09-11 09:52:29 -07:00
Michael Wright
7b4f60deb2 Merge "Special case game controller fallback keys for Japan" into klp-dev 2013-09-07 02:04:20 +00:00
Victoria Lease
a680b17fb4 Merge "add NotoSansSymbols to fallback chain" into klp-dev 2013-09-06 19:40:00 +00:00