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

42959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Ho
efba660d8e am 97e1dbab: Merge "Adding remaining volume dialog assets" into honeycomb 
* commit '97e1dbab57b6804661afd37747f73c1258133916':
  Adding remaining volume dialog assets
 2011-02-03 13:52:54 -08:00
Justin Ho
97e1dbab57 Merge "Adding remaining volume dialog assets" into honeycomb 2011-02-03 13:50:09 -08:00
Justin Ho
8bdfcaa0c4 am 9b95d352: Updated Talk notification icon Bug: 3362749 
* commit '9b95d3522103671554cca018488b6bd8b7982f38':
  Updated Talk notification icon Bug: 3362749
 2011-02-03 13:45:36 -08:00
Justin Ho
9b95d35221 Updated Talk notification icon 
Bug: 3362749

Change-Id: I4896a283ba4a552ee23cd69c76a397c31cddfb8d
 2011-02-03 13:41:15 -08:00
Justin Ho
f451a46cc2 Adding remaining volume dialog assets 
Change-Id: If3e58507dd0af454a3dbcdb4cb826c60503d72cc
 2011-02-03 13:40:04 -08:00
Sang-Jun Park
b9ef00ea2f Fix the Multi-page SMS sending error to several receipents 
Change-Id: Iefde94b638413e3c1761f17c3065b20a044e5958
Signed-off-by: Sang-Jun Park <sj2202.park@samsung.com>
 2011-02-03 13:39:31 -08:00
Jean-Baptiste Queru
5c97e9d985 am 236afa68: am 375afcd5: am 4b8ad9ef: Merge from gingerbread 
* commit '236afa6806c384a235782cde820a7f01de9e1b82':
 2011-02-03 13:34:41 -08:00
Jean-Baptiste Queru
236afa6806 am 375afcd5: am 4b8ad9ef: Merge from gingerbread 
* commit '375afcd5d69f47c85960270bf51b83a2b768d446':
 2011-02-03 13:32:08 -08:00
Jean-Baptiste Queru
375afcd5d6 am 4b8ad9ef: Merge from gingerbread 
* commit '4b8ad9effd95508e9966b8a3a355f0a948558ae2':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 13:28:51 -08:00
Jean-Baptiste Queru
4b8ad9effd Merge from gingerbread 
Change-Id: Id0509272ef8382fb0004f4d38bbba744e3487a8c
 2011-02-03 13:17:49 -08:00
Jean-Baptiste Queru
5086c45718 am baaaca1c: Merge ee4c17ee from gingerbread 
* commit 'baaaca1c6164eff17488a178859295a1d5be9171':
  Fix delivery report error with PENDING status in SMS
 2011-02-03 13:12:35 -08:00
Jean-Baptiste Queru
baaaca1c61 Merge ee4c17ee from gingerbread 
Change-Id: Ide109e517fb7610d60f31ba6aa99fe665b59d690
 2011-02-03 13:03:53 -08:00
Jean-Baptiste Queru
ee4c17eec3 Merge from open-source gingerbread 
Change-Id: I63e8abc1b8d6db05dfce178ae736d8d0586f6c52
 2011-02-03 12:41:51 -08:00
Justin Ho
b7fa0b65d7 am ef36255f: Merge "Revert "Sounds cleanup"" into honeycomb 
* commit 'ef36255f876aa1a61dcf5e879f4380887dda3854':
  Revert "Sounds cleanup"
 2011-02-03 12:38:26 -08:00
Justin Ho
ef36255f87 Merge "Revert "Sounds cleanup"" into honeycomb 2011-02-03 12:35:51 -08:00
Vasu Nori
9ec496b484 am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
* commit 'e1cbd0a85f09a54f8bf28545ac67455b7dcd2532':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
 2011-02-03 12:24:59 -08:00
Vasu Nori
e1cbd0a85f Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb" 
This reverts commit 6bc710f769618e87b98d51cd02241e6b1a2fb653, reversing
changes made to 7ba35f5ab3c838c7f1b3ab957be685ac1f506b2a.
 2011-02-03 12:20:31 -08:00
Jean-Baptiste Queru
2703b84caa Merge "Fix delivery report error with PENDING status in SMS" into gingerbread 2011-02-03 12:17:47 -08:00
Daniel Sandler
c53867926e Revert "Sounds cleanup" 
This reverts commit b04c57ba980793c43b79c9d889e94e3cd164e8ad.
 2011-02-03 15:06:32 -05:00
Michael Jurka
d51e0820b3 am 8275c608: Merge "adding fast setters for translationx/y" into honeycomb 
* commit '8275c6087897e8fd614681d1cd12db62e6b9fcd5':
  adding fast setters for translationx/y
 2011-02-03 12:02:37 -08:00
Michael Jurka
8275c60878 Merge "adding fast setters for translationx/y" into honeycomb 2011-02-03 12:00:37 -08:00
Romain Guy
cb2c84fd81 am 3b66e43e: Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 
* commit '3b66e43e8c5671c646ccc6d52b0f2dec13898c91':
  Refresh display lists when turning off layers rendering. Bug #3420565
 2011-02-03 11:46:47 -08:00
Romain Guy
3b66e43e8c Merge "Refresh display lists when turning off layers rendering. Bug #3420565" into honeycomb 2011-02-03 11:43:17 -08:00
Romain Guy
9d18f2d189 Refresh display lists when turning off layers rendering. 
Bug #3420565

Change-Id: I2139540e591a97cd487e3d7cce6b70d6b23df9de
 2011-02-03 11:32:38 -08:00
Xavier Ducrohet
1ea9930e74 am 5e76e0ae: Merge "LayoutLib: Fix some rendering issues" into honeycomb 
* commit '5e76e0aea28042287553ffa21826f59f601a3d2b':
  LayoutLib: Fix some rendering issues
 2011-02-03 11:23:39 -08:00
Xavier Ducrohet
5e76e0aea2 Merge "LayoutLib: Fix some rendering issues" into honeycomb 2011-02-03 11:21:37 -08:00
Justin Ho
da75a28304 am 205bdd4f: Merge "Sounds cleanup" into honeycomb 
* commit '205bdd4f8951d4af9cfaeb8fb4ad9d0f1cad1afc':
  Sounds cleanup
 2011-02-03 10:49:43 -08:00
Justin Ho
205bdd4f89 Merge "Sounds cleanup" into honeycomb 2011-02-03 10:47:22 -08:00
Daniel Sandler
63944f6c38 am 2243cca4: Merge "Time to take down the Christmas lights." into honeycomb 
* commit '2243cca40c5f74cf89fe9bccce6e35af1acedb0c':
  Time to take down the Christmas lights.
 2011-02-03 10:36:02 -08:00
Daniel Sandler
2243cca40c Merge "Time to take down the Christmas lights." into honeycomb 2011-02-03 10:33:51 -08:00
Joe Malin
64ee4ed48d am 70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb 
* commit '70ff567a2722789ac5196a92e615dd39c29b5964':
  DOC CHANGE: Fix bugs in Installing SDK topic
 2011-02-03 10:30:38 -08:00
Eric Laurent
6f1bd261b7 am 9c0a1003: Merge "Fix issue 3371080" into honeycomb 
* commit '9c0a1003bd676121cf9b1c942ecebd5b486290d5':
  Fix issue 3371080
 2011-02-03 10:28:24 -08:00
Joe Malin
70ff567a27 Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb 2011-02-03 10:27:22 -08:00
Daniel Sandler
8053b55f5b Time to take down the Christmas lights. 
Bug: 3420764
Change-Id: Ie76341f165f8232efdcc90af66776751117b443a
 2011-02-03 13:26:12 -05:00
Eric Laurent
9c0a1003bd Merge "Fix issue 3371080" into honeycomb 2011-02-03 10:26:05 -08:00
Justin Ho
7fbdc7f6ec am 8138fc1f: Merge "Adding Iridium as a ringtone" into honeycomb 
* commit '8138fc1ff3c541ee040b55f07d06b2e2974247bf':
  Adding Iridium as a ringtone
 2011-02-03 10:23:51 -08:00
Justin Ho
8138fc1ff3 Merge "Adding Iridium as a ringtone" into honeycomb 2011-02-03 10:21:17 -08:00
Daniel Sandler
62362af8f9 am 81034187: Merge "Move the low battery sound to the notification stream." into honeycomb 
* commit '81034187a34c7c6432e62d2dc2332e987ce4f5db':
  Move the low battery sound to the notification stream.
 2011-02-03 09:50:27 -08:00
Daniel Sandler
81034187a3 Merge "Move the low battery sound to the notification stream." into honeycomb 2011-02-03 09:47:45 -08:00
Dheeraj Sharma
d13f987f73 am 36b685ff: Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb 
* commit '36b685ffb0e3c1848bc8085757da3e673d19028a':
  Fix for issue :  3419353 Crash during transition generation
 2011-02-03 09:38:43 -08:00
Dheeraj Sharma
36b685ffb0 Merge "Fix for issue : 3419353 Crash during transition generation" into honeycomb 2011-02-03 09:36:02 -08:00
Eric Laurent
25101b0b9a Fix issue 3371080 
Modified default volume control logic in AudioService:
1 IN_CALL volume if in video/audio chat
2 NOTIFICATION if notification is playing or was playing less than 5s ago.
3 MUSIC

Modified silent mode:
- now also affect MUSIC stream type
- entering silent mode when VOL- hard key is pressed once while selected
stream volume is already at 0 (except for VOICE_CALL stream).
- exiting silent mode when pressing VOL+ hard key while in silent mode

Play sound FX (audible selections, keyboard clicks) at a fixed volume.

Modified audio framework:
- isStreamActive() method now implemented in AudioPolicyManagerBase (previously AudioFlinger)
- iStreamActive() now specifies a time window during which the stream is considered
active after it actually stopped.

Change-Id: I7e5a0724099450b9fc90825224180ac97322785f
 2011-02-03 09:26:24 -08:00
Daniel Sandler
d57c8d93c0 Move the low battery sound to the notification stream. 
This will allow its volume to be governed by the user's chosen
notification volume.

Bug: 3409396
Change-Id: I1bc59fd76f4b5250beac530b2711dd59d79b5384
 2011-02-03 12:14:34 -05:00
Cary Clark
859563ebf7 am aa7dc928: Merge "stop GL drawing thread before killing WebCore" into honeycomb 
* commit 'aa7dc92838f4e3d423b2a738f54de9b83f83794b':
  stop GL drawing thread before killing WebCore
 2011-02-03 08:52:21 -08:00
Cary Clark
aa7dc92838 Merge "stop GL drawing thread before killing WebCore" into honeycomb 2011-02-03 08:48:24 -08:00
Justin Ho
b04c57ba98 Sounds cleanup 
Change-Id: Ia669ea1f2efbae46290e4ea5f860cdd3671277b4
 2011-02-03 08:34:33 -08:00
Justin Ho
a15157498a Adding Iridium as a ringtone 
Change-Id: I2e5024b26acaa9eb4f1ea778265744983cb8914c
 2011-02-03 08:02:43 -08:00
Justin Ho
7d75cd65fa am b732e6d2: Merge "Changing Honeycomb default wallpaper" into honeycomb 
* commit 'b732e6d20571e9098b02f4d49f0e4359c232eaa0':
  Changing Honeycomb default wallpaper
 2011-02-03 07:31:28 -08:00
Justin Ho
b732e6d205 Merge "Changing Honeycomb default wallpaper" into honeycomb 2011-02-03 07:25:18 -08:00
Justin Ho
6baf391cac Changing Honeycomb default wallpaper 
Change-Id: I5f3b0d8608d1712c3c96d1f9882706fd08c12588
 2011-02-03 07:23:43 -08:00