333 Commits

Author SHA1 Message Date
Justin Ho
d95862ca61 am 50039e39: am 9397f580: Merge "Add louder keypress sounds for different device configurations" into ics-mr0
* commit '50039e395e298a98329b68c3ea7243ef300f0edc':
  Add louder keypress sounds for different device configurations
2011-10-20 07:32:36 -07:00
Justin Ho
50039e395e am 9397f580: Merge "Add louder keypress sounds for different device configurations" into ics-mr0
* commit '9397f5807b5377c5edef99820614694cc7e05160':
  Add louder keypress sounds for different device configurations
2011-10-20 07:29:31 -07:00
Justin Ho
63b47728a4 Add louder keypress sounds for different device configurations
Change-Id: Ib5fe70e7b9d31efd8383e9d3351e33d08a3f7ae6
2011-10-20 07:23:25 -07:00
Justin Ho
01facfc424 am 8af45445: am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0
* commit '8af45445deea2ec59afd22d12855b85d015f1769':
  Removing Testudo and adding Themos ringtone Bug: 5416299
2011-10-18 09:34:39 -07:00
Justin Ho
8af45445de am a548b5cb: Merge "Removing Testudo and adding Themos ringtone Bug: 5416299" into ics-mr0
* commit 'a548b5cb82008d2d6629ab78ba775a24bff55040':
  Removing Testudo and adding Themos ringtone Bug: 5416299
2011-10-18 09:33:10 -07:00
Justin Ho
7f64527d8d Removing Testudo and adding Themos ringtone
Bug: 5416299

Change-Id: Ic3ab5d6fbfddf82f7a19f1579d96bd59ebf4d8d9
2011-10-17 10:36:33 -07:00
Ying Wang
70e7e6283b am 384bf04a: Merge "Remove non-module names from PRODUCT_PACKAGES"
* commit '384bf04a38b79877be7cc03c2e67f706d84598e7':
  Remove non-module names from PRODUCT_PACKAGES
2011-10-11 10:04:38 -07:00
Ying Wang
384bf04a38 Merge "Remove non-module names from PRODUCT_PACKAGES" 2011-10-11 10:01:39 -07:00
Justin Ho
954e51d16d am 882ed374: Resolved conflicts for merge of 83cf0313 to master
* commit '882ed3747145ca68b3acb26636be7a39755b5548':
  Ensuring previous sounds are named correctly Bug: 5416299
2011-10-10 16:49:28 -07:00
Justin Ho
882ed37471 Resolved conflicts for merge of 83cf0313 to master
Change-Id: Ib66ee7e34d0c4d845004bce635ee1ef300d3b344
2011-10-10 16:46:35 -07:00
Hiroshi Lockheimer
83cf031307 Merge "Ensuring previous sounds are named correctly Bug: 5416299" into ics-factoryrom 2011-10-10 16:34:23 -07:00
Justin Ho
62dce9b574 Ensuring previous sounds are named correctly
Bug: 5416299

Change-Id: I0f2cd229be02908553368d6ff19977a0ebd3e613
2011-10-10 15:57:41 -07:00
Justin Ho
cc5db44c75 am 8c3e7079: am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom
* commit '8c3e707999359ed77bf1e2ac8465edae8dffc37c':
  Update screen lock/unlock sound Bug: 5416299
2011-10-10 14:46:37 -07:00
Justin Ho
225a5e36ea am 17b8bd12: am 17249d64: Adding Pollux notification tone Bug: 5416299
* commit '17b8bd12f423ef7eec67c70c926175157bd8e7f3':
  Adding Pollux notification tone Bug: 5416299
2011-10-10 14:46:35 -07:00
Justin Ho
8c3e707999 am 832c5485: Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom
* commit '832c54857519c405d7aa0d3bccfe74078f1a1abf':
  Update screen lock/unlock sound Bug: 5416299
2011-10-10 14:43:35 -07:00
Justin Ho
17b8bd12f4 am 17249d64: Adding Pollux notification tone Bug: 5416299
* commit '17249d6472b85e669c1b854fc413888e78af6def':
  Adding Pollux notification tone Bug: 5416299
2011-10-10 14:43:33 -07:00
Ying Wang
4f3aa58490 Remove non-module names from PRODUCT_PACKAGES
Bug: 5430740
Those files are in PRODUCT_COPY_FILES but not modules that can be put in
PRODUCT_PACKAGES.

Change-Id: I9e2f60de7ac2e12e6880e1365a36615835ca747c
2011-10-10 12:44:12 -07:00
Justin Ho
832c548575 Merge "Update screen lock/unlock sound Bug: 5416299" into ics-factoryrom 2011-10-10 10:08:55 -07:00
Justin Ho
17249d6472 Adding Pollux notification tone
Bug: 5416299

Change-Id: I471977f1119c1afe314fa7539d8452fab5a4961e
2011-10-10 07:55:30 -07:00
Justin Ho
3c902ecdae Update screen lock/unlock sound
Bug: 5416299

Change-Id: Icdb1d45ce2afd742cc89cfb8e53245a158d4c241
2011-10-10 07:50:07 -07:00
Ying Wang
dabf42621b am 45f96632: Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf"
* commit '45f966324ce501597b6ebc05814b6e424168fc56':
  Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf
2011-10-06 18:27:05 -07:00
Ying Wang
45f966324c Merge "Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf" 2011-10-06 18:25:22 -07:00
Ying Wang
8e359817da Make symlinks for DroidSans.ttf and DroidSans-Bold.ttf
Bug: 5420351

Make the following symlinks:
/system/fonts/DroidSans.ttf -> Roboto-Regular.ttf
/system/fonts/DroidSans-Bold.ttf -> Roboto-Bold.ttf

Change-Id: If9a74ef4ac2386cdb46d125fed8ce5771e872310
2011-10-06 16:00:58 -07:00
Justin Ho
d213a4e4a9 am 4b5bd847: am 65162b1e: Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
* commit '4b5bd847a26c4fde51a3c96a5fbd90886bc9adf4':
  Adding 3 additional notification sounds Bug: 5416299
2011-10-06 16:00:17 -07:00
Justin Ho
4b5bd847a2 am 65162b1e: Merge "Adding 3 additional notification sounds Bug: 5416299" into ics-factoryrom
* commit '65162b1ee430cb8050109327a7fd958fa72d64ac':
  Adding 3 additional notification sounds Bug: 5416299
2011-10-06 15:57:38 -07:00
Justin Ho
fe993cf132 Adding 3 additional notification sounds
Bug: 5416299

Change-Id: I69c6ddd1c4202f640ce14a2a7e4a233e1d93e53d
2011-10-06 15:23:23 -07:00
Xavier Ducrohet
fea27fd150 am 0bb83a28: Merge "Layoutlib now parses system_fonts.xml instead of its own."
* commit '0bb83a28395cddd22e1fa1e806def6498dedd709':
  Layoutlib now parses system_fonts.xml instead of its own.
2011-10-05 06:37:07 -07:00
Xavier Ducrohet
178006a0e0 Layoutlib now parses system_fonts.xml instead of its own.
Also parse fallback_fonts.
This lets layoutlib automatically use the same fonts as the base
platforms, for instance it now uses the new ICS fonts.

Change-Id: Id6e778dc0e3f2a9112601e0eaf8499a9713ec433
2011-10-04 18:02:10 -07:00
Justin Ho
2d02019697 am d5b9b260: Resolve conflicts for merge 121e805a to master
* commit 'd5b9b26081b09ecd1a9701e3320bf969ae481f66':
  Adding additional variety to sound set 7
2011-10-03 17:09:28 -07:00
Justin Ho
d5b9b26081 Resolve conflicts for merge 121e805a to master
Conflicts:
	CleanSpec.mk

Change-Id: I750218dbd78e15c1ae3324b3bcfbcd28a4da2676
2011-10-03 17:06:26 -07:00
Justin Ho
18f3656eb5 Adding additional variety to sound set 7
Change-Id: I3f8c806258e47dc3b78ce81fd582722753573b54
2011-10-03 16:06:09 -07:00
Ying Wang
3f99974cfa am f260103f: Merge "Correction the use of SMALLER_FONT_FOOTPRINT"
* commit 'f260103fbf5118b41e569b2bf0a450d9db09c2ac':
  Correction the use of SMALLER_FONT_FOOTPRINT
2011-09-30 13:06:09 -07:00
Ying Wang
46b20e7f41 Correction the use of SMALLER_FONT_FOOTPRINT
SMALLER_FONT_FOOTPRINT is a BoardConfig variable that's only available
in Android.mks but not product config makefiles.

Change-Id: I1784b6e8c744ffcca1538e76d338f5800f150e72
2011-09-29 20:02:05 -07:00
Justin Ho
c13d4e9552 am 3eb34a9c: am 48704d49: Updated key and effect sounds
* commit '3eb34a9cd779a0a2dd1a402e606a45da016352bf':
  Updated key and effect sounds
2011-09-26 09:52:09 -07:00
Justin Ho
48704d4962 Updated key and effect sounds
Change-Id: Ia7c771ed59bf1803ed7ff25d338a412906cf59c0
2011-09-26 09:47:18 -07:00
Russell Brenner
03ec08e331 am db8d330c: am a6ccaa73: Merge "Replaced Lohit_Hindi with Lohit-Devanagari" into ics-factoryrom
* commit 'db8d330c65110bf567eb7cbac48451ea4bfd099c':
  Replaced Lohit_Hindi with Lohit-Devanagari
2011-09-23 17:42:33 -07:00
Russell Brenner
9d8c7e8242 Replaced Lohit_Hindi with Lohit-Devanagari
Lohit-Devanagari is now provided by external/lohit-fonts, replacing
Lohit_Hindi from here. Removed font from fonts.mk and renamed in
fallback_fonts.xml.

Bug: 5364436
Change-Id: I0b8f65dbfdbec1802fba526209d7f88d2cf64fc4
2011-09-23 15:09:52 -07:00
Justin Ho
0bd4e97881 am 092c339a: am a780fb8e: Merge "Updating ellipsis in Roboto Bug: 5344295" into ics-factoryrom
* commit '092c339ae704a4be9ff14b88b2ae31e06166374f':
  Updating ellipsis in Roboto Bug: 5344295
2011-09-23 07:32:42 -07:00
Justin Ho
16faafb493 Updating ellipsis in Roboto
Bug: 5344295

Change-Id: Ia885ff39da0609f51863665125bae3a1024e161c
2011-09-23 07:27:35 -07:00
Justin Ho
d5502adb4b am 67ceaf3e: am 22aa7805: Merge "Thinner clock font" into ics-factoryrom
* commit '67ceaf3e83d29ca69708a3ae94f5e7797bef4ca6':
  Thinner clock font
2011-09-21 19:10:56 -07:00
Justin Ho
6665333d65 Thinner clock font
Change-Id: I37fd911ea9ae90dba34c1ec285cb4c804678b5ac
2011-09-21 15:37:42 -07:00
Justin Ho
ba09c07360 am eb15bb31: am a2520fc1: Merge "Ensure all clock fonts match Bug: 5340112" into ics-factoryrom
* commit 'eb15bb31c7131c643c169d4e9d0372314dc63918':
  Ensure all clock fonts match Bug: 5340112
2011-09-20 18:56:03 -07:00
Justin Ho
a2520fc136 Merge "Ensure all clock fonts match Bug: 5340112" into ics-factoryrom 2011-09-20 18:52:38 -07:00
Justin Ho
61f69cec3c Ensure all clock fonts match
Bug: 5340112

Change-Id: I5cac2b57d80a59c2e137d1df228f88ee4f11840e
2011-09-20 18:51:03 -07:00
Justin Ho
d1913f6e49 am 9e3de085: am b8b10834: Merge "Updated Prime sounds" into ics-factoryrom
* commit '9e3de085dfe502cf7f643685b851180fcc7117ef':
  Updated Prime sounds
2011-09-20 17:49:04 -07:00
Justin Ho
2d042a3bd0 Updated Prime sounds
Change-Id: I6ec87d6fcd12d0175924161dce1f24bb702bffd3
2011-09-20 15:41:23 -07:00
Eino-Ville Talvala
d07acd5e5a am 44895fe8: am ebdcae73: Merge "Add third video to default system videos." into ics-factoryrom
* commit '44895fe865a597963a6a4a1fa0af9c3b2ff164d1':
  Add third video to default system videos.
2011-09-16 10:55:41 -07:00
Eino-Ville Talvala
ebdcae732f Merge "Add third video to default system videos." into ics-factoryrom 2011-09-16 10:52:15 -07:00
Justin Ho
2f6e357864 am 5c84527f: am 6a7ea58e: Merge "Updated Clock and Roboto fonts Bug: 5243711" into ics-factoryrom
* commit '5c84527fcb66d81398588dd93dd01cf90ec1ec74':
  Updated Clock and Roboto fonts Bug: 5243711
2011-09-16 07:37:58 -07:00
Justin Ho
81db33af1e Updated Clock and Roboto fonts
Bug: 5243711

Change-Id: I1c54bab0107edc56fbdf75269a70881031384833
2011-09-16 07:29:24 -07:00