summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2013-01-10am 0b07956f: am 906cf88e: Import translations. DO NOT MERGEtools_r22jb-mr1.1-dev-plus-aospBaligh Uddin
* commit '0b07956fc12b80db87ed0f9257173ae441cbb6de': Import translations. DO NOT MERGE
2013-01-10am 906cf88e: Import translations. DO NOT MERGEBaligh Uddin
* commit '906cf88e638a24760c8ed09fc83b552f90717e79': Import translations. DO NOT MERGE
2013-01-10Import translations. DO NOT MERGEandroid-cts-4.2_r2android-4.2.2_r1.2android-4.2.2_r1.1android-4.2.2_r1jb-mr1.1-releasejb-mr1.1-devjb-mr1-devBaligh Uddin
Change-Id: I2a76a4f7a7fdc6950dc1737c82c3b4df0c0794c2 Auto-generated-cl: translation import
2012-12-03Merge "Make locale safe paths"jb-mr1-dev-plus-aospElliott Hughes
2012-11-19Make locale safe pathsJohan Redestig
getVideoOutputMediaFileTitle was using SimpleDateFormat with the default locale to create paths. In some locales this resulted in characters that are not safe to use on all file systems. Explicitly use Locale.US to be locale safe. Change-Id: I3727a239396da82146a171d254a9bf5a5f8dcfef
2012-10-15am a727e385: am 19decbf6: Make the height of title template and transition ↵Chih-Chung Chang
selection dialog match_parent. * commit 'a727e3858e17ca929c7071bc2ee643de534eeee9': Make the height of title template and transition selection dialog match_parent.
2012-10-15am 19decbf6: Make the height of title template and transition selection ↵Chih-Chung Chang
dialog match_parent. * commit '19decbf682ddeb807e2cb2729e153a90a36a81a7': Make the height of title template and transition selection dialog match_parent.
2012-10-16Make the height of title template and transition selection dialog match_parent.android-sdk-support_r11android-cts-4.2_r1android-4.2_r1android-4.2.1_r1.2android-4.2.1_r1.1android-4.2.1_r1jb-mr1-releaseChih-Chung Chang
Bug: 7350017 Change-Id: Ide9bafedbb4e6c141a9f9878d585a37a441c5794
2012-10-14am ba617c35: am 0314b4c5: Let\'s enhanceJason Chen
* commit 'ba617c35baa5e0ae5f3bea3ac4dea54719a428dd': Let's enhance
2012-10-14am 0314b4c5: Let\'s enhanceJason Chen
* commit '0314b4c54b91a68426777888e33f9292a34799b2': Let's enhance
2012-10-12Let's enhanceJason Chen
Add mipmap-xhdpi and mipmap-xxhdpi launcher icon assets. Remove unused drawable launcher icon assets while we're at it. Bug: 6718166 Change-Id: Ia8658cc7dc5d8efe59647b94745dbd7bdb6dc4b4
2012-10-03am 807f297a: (-s ours) Reconcile with jb-dev - do not mergeJean-Baptiste Queru
* commit '807f297a7ef4572c89bb89dc07a26ae8e23b2466':
2012-10-03Reconcile with jb-dev - do not mergetools_r21Jean-Baptiste Queru
Change-Id: Ib87793fb3dc051968e2e1683476b217f7118712a
2012-10-01am 81b84148: am 371b4192: VideoEditor: Center the buttons instead of using ↵Teng-Hui Zhu
fixed numbers * commit '81b84148bc45b59ea9c1eea7aaa1f64af67b07da': VideoEditor: Center the buttons instead of using fixed numbers
2012-09-30am 371b4192: VideoEditor: Center the buttons instead of using fixed numbersTeng-Hui Zhu
* commit '371b41923763a36948bcb5cacd705ce66cf5b415': VideoEditor: Center the buttons instead of using fixed numbers
2012-09-30VideoEditor: Center the buttons instead of using fixed numbersTeng-Hui Zhu
Beyond using center, I also tweaked some numbers to fit the manta. In the future, we should have a better design to avoid this kind of tweaking. bug:7241800 Change-Id: Icfd51fb64a7b730a5ef1663937246b3058026a73
2012-09-28Merge from jb-mr1-aah-devJean-Baptiste Queru
Change-Id: I6a61b2bf73759cecf94d379e2a5e7ce102593c04
2012-09-12am 07ebe49d: (-s ours) am e7889d23: (-s ours) Reconcile with jb-mr0-release ↵The Android Open Source Project
- do not merge * commit '07ebe49da17282f86caa0ca2bad10beea6f96bca': Use focal point for scrolling. Use a local copy of HorizontalScrolllView.
2012-09-12am e7889d23: (-s ours) Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project
* commit 'e7889d237cbcf59d7b50aa1511e06a4de04b351e': Use focal point for scrolling. Use a local copy of HorizontalScrolllView.
2012-09-12Reconcile with jb-mr0-release - do not mergeThe Android Open Source Project
Change-Id: Ia4a12308b845a8c8403e86132c284a876e0f0676
2012-09-10Use focal point for scrolling.android-4.1.2_r2.1android-4.1.2_r2android-4.1.2_r1jb-mr0-releaseChih-Chung Chang
Change-Id: I025a9d1ad68f6abe86c287552cf0aa17c0ea7cab
2012-09-10Use a local copy of HorizontalScrolllView.Chih-Chung Chang
Change-Id: I2ad22c0d95a7b371c7e2b6155e0035b65d7a2060
2012-09-06am 98515c8b: am 608edccd: Use focal point for scrolling.Chih-Chung Chang
* commit '98515c8bee11bc79c588e4467d11c32ba472a6fe': Use focal point for scrolling.
2012-09-06am 86320deb: am 667f5956: Use a local copy of HorizontalScrolllView.Chih-Chung Chang
* commit '86320deba090bb511d0f5bcb35c2e75b584548d6': Use a local copy of HorizontalScrolllView.
2012-09-06am 608edccd: Use focal point for scrolling.Chih-Chung Chang
* commit '608edccd03455a803c352f77dd3bfb4bd61a3478': Use focal point for scrolling.
2012-09-06am 667f5956: Use a local copy of HorizontalScrolllView.Chih-Chung Chang
* commit '667f59561705ac6b01d0bd6eb5a53a51e2ee59a7': Use a local copy of HorizontalScrolllView.
2012-09-06Use focal point for scrolling.android-cts-4.1_r4android-cts-4.1_r2jb-devChih-Chung Chang
Change-Id: I025a9d1ad68f6abe86c287552cf0aa17c0ea7cab
2012-09-06Use a local copy of HorizontalScrolllView.Chih-Chung Chang
Change-Id: I2ad22c0d95a7b371c7e2b6155e0035b65d7a2060
2012-07-25Import translations. DO NOT MERGEYing Wang
Change-Id: Ic202051cc2097daf75d37131a2ebd1e02a69a7f8 Auto-generated-cl: translation import
2012-07-19Import translations. DO NOT MERGEYing Wang
Change-Id: I6767173564e0ed2a247dc7bde369b8b27d1b15ca Auto-generated-cl: translation import
2012-07-18Import translations. DO NOT MERGEYing Wang
Change-Id: Ie527578a9b07bc6ee9e3ac44453e59433d115f0f Auto-generated-cl: translation import
2012-07-13Import translations. DO NOT MERGEYing Wang
Change-Id: I5dd99aeeab6a99777d27cd63e23ff11cb17e4990 Auto-generated-cl: translation import
2012-06-07am a2b8ef5d: Reconcile with jb-releaseThe Android Open Source Project
* commit 'a2b8ef5ddac73f638660dd3b03413095c59776db':
2012-06-07Reconcile with jb-releaseThe Android Open Source Project
Change-Id: Ib7a7dccc7f666c8c94c6e98c353b20fe18e73d38
2012-06-03merge in jb-release history after reset to jb-devandroid-4.1.1_r6.1android-4.1.1_r6android-4.1.1_r5android-4.1.1_r4android-4.1.1_r3android-4.1.1_r2android-4.1.1_r1.1android-4.1.1_r1jb-releaseThe Android Automerger
2012-06-01am f8cf9def: am 5cda2ced: Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson
* commit 'f8cf9defaa944528d266ea8d7ef8e584edef1f4c': Updating launcher icon to fix alignment. Bug: 6511716
2012-06-01am 5cda2ced: Updating launcher icon to fix alignment. Bug: 6511716Christian Robertson
* commit '5cda2ced11731cef8a2f0609b837aa319bbb4d81': Updating launcher icon to fix alignment. Bug: 6511716
2012-05-25Import translations. DO NOT MERGEEric Fischer
Change-Id: I523acefd62d31d220e774e4730a16ce46866222f
2012-05-23Updating launcher icon to fix alignment. Bug: 6511716android-cts-4.1_r1Christian Robertson
Change-Id: Id5bf23dd6ebc4264fd71773f023daaebc1713986
2012-05-22Reconcile with jb-releaseThe Android Open Source Project
Change-Id: I13d87741db3984d51ba9b2ec52b305e8d2c0a665
2012-05-21am a84c5e31: Merge "Changing of volume control intents scheme."Jean-Baptiste Queru
* commit 'a84c5e31d63cb0ae015c61ff311875e3d247e9f1': Changing of volume control intents scheme.
2012-05-21Merge "Changing of volume control intents scheme."android-sdk-adt_r20tools_r20ics-plus-aospJean-Baptiste Queru
2012-05-20merge in jb-release history after reset to jb-devThe Android Automerger
2012-05-18am 10f453d9: Don\'t recycle the bitmap even if we are paused.Chih-Chung Chang
* commit '10f453d986f969a4da2ca839108e3ce201743d42': Don't recycle the bitmap even if we are paused.
2012-05-18Don't recycle the bitmap even if we are paused.Chih-Chung Chang
Because the bitmap may be reused through onRetainNonConfigurationInstance(). Bug: 6507989 Change-Id: Ie8cc1afc70864805671828fa2e71b72997e04989
2012-05-16Reconcile with jb-release nakasi-factoryrom-releaseThe Android Open Source Project
Change-Id: I3dd535fc13cea78a9703d5bdbbb0838448b316e5
2012-04-10merge in jb-release history after reset to masterThe Android Automerger
2012-04-10Changing of volume control intents scheme.Sergii Iegorov
The new intent was sent inside onProgressChanged() method - after every volume seek bar moving. Intents processing is slower then sending of new ones, so some of them could be still not processed while playback has already started. So, sometimes user will hear other volume level than he has actually set. This patch replaces all intents sent in onProgressChanged() method during seeking by only one sent after user has finished volume seek bar tracking. Change-Id: I383c9fea6bc50b068b04e45adb6ef033bf7c36ff Signed-off-by: Sergii Iegorov <x0155539@ti.com>
2012-04-09Import translations. DO NOT MERGEEric Fischer
Change-Id: I13ef8d760481c153ccd4bf7348b90eac4430d911
2012-04-03Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood