summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Import translations. DO NOT MERGEEric Fischer2012-04-2449-49/+195
| | | | Change-Id: Ibdcd41844e4c0e170db6dfc3fdd40f6bbc9e09e3
* Fix 6046544 Deleting a photo takes multiple steps and the flow is ↵Ray Chen2012-04-234-25/+5
| | | | | | | | | inconsistent with other deleting flows on other core apps This CL adds a confirm dialog to delete command and removes all confirm/cancel menu items from the actionbar. b:6046544 Change-Id: I3afe7b59b4f6d1216e192a621621f7bf544e1919
* Merge "Fix 6046987 The header on the contextual action bar when multiple ↵Ray Chen2012-04-226-7/+17
|\ | | | | | | photos are selected is very janky b:6046987"
| * Fix 6046987 The header on the contextual action bar when multiple photos are ↵Ray Chen2012-04-196-7/+17
| | | | | | | | | | | | | | | | selected is very janky b:6046987 Change-Id: I86c79cf4d8995bfa0faab95ecd61e89879847630
* | Import translations. DO NOT MERGEEric Fischer2012-04-204-8/+4
| | | | | | | | Change-Id: Id5aa8ee935dca1e7d44d6b59b43c52d3241ed9b0
* | Import translations. DO NOT MERGEEric Fischer2012-04-1929-59/+30
| | | | | | | | Change-Id: I00bdda6e887bda0b9248d1366a52350786fa7cbb
* | Import translations. DO NOT MERGEEric Fischer2012-04-1815-30/+15
| | | | | | | | Change-Id: Ib1909c28cbf36dd37530f4b2442f87ab9b2964f1
* | Import translations. DO NOT MERGEEric Fischer2012-04-1749-1/+99
|/ | | | Change-Id: Ie4ec34a3ec88133e80fe9da1e800ab5c74c89b14
* Fix b/6213053 Add Help entry point to Gallery (targeted for J release)Ray Chen2012-04-172-0/+8
| | | | | | b:6213053 Change-Id: Ib9d9c5e69f09d6c2fffb4e6ecb09b2c3ae700365
* Import translations. DO NOT MERGEEric Fischer2012-04-131-1/+1
| | | | Change-Id: Ic4925614c94fbbb2a4d57b5666bf8847aabf2ed6
* Draw less to improve performance.Owen Lin2012-04-091-0/+0
| | | | | | Also adjust the upload order to upload nearby textures first. Change-Id: I2d6a8807a14b4602882dd2e5c03030c356f49e47
* Import translations. DO NOT MERGEEric Fischer2012-04-051-1/+1
| | | | Change-Id: I25af65661cea80a20a4dc95da3acc2c8f528e0a1
* Merge remote-tracking branch 'goog/ics-aah'Mike Lockwood2012-04-030-0/+0
|\
| * am a64072a4: Merge "Import translations. DO NOT MERGE" into ics-mr1Justin Ho2012-02-103-3/+3
| |\ | | | | | | | | | | | | * commit 'a64072a481580cbe3f3166f0c6d4424b20f1275c': Import translations. DO NOT MERGE
| * \ am dfeefe6a: Import translations. DO NOT MERGEEric Fischer2012-02-108-40/+48
| |\ \ | | | | | | | | | | | | | | | | * commit 'dfeefe6a7a3ede9735c9f90dae99d5e354b621b7': Import translations. DO NOT MERGE
| * \ \ am 4e94e885: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-293-15/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '4e94e8858fc3187ec0eae83c70698c85115a630e': Import revised translations. DO NOT MERGE
| * \ \ \ am f36d8f29: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-213-5/+5
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f36d8f299d57849a1afb1b0c271bb4be0d336e43': Import revised translations. DO NOT MERGE
| * \ \ \ \ am 612e9d69: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-1651-194/+194
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '612e9d697269cff5437366ae386dea7d6af6656c': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ am 8ab8a64c: am 756f9bc7: Import revised translations. DO NOT MERGEEric Fischer2011-11-151-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8ab8a64cc40a683d364829aad404fea4548cbd48': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ am c5d42ff7: Merge "Fix b/5517002 by dismissing running progress dialog in ↵Yuli Huang2011-11-151-26/+33
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | onPause()." into ics-mr1 * commit 'c5d42ff75d53d8e1321da7c901d7b0e5e2bbaa1b': Fix b/5517002 by dismissing running progress dialog in onPause().
| * \ \ \ \ \ \ \ am c9af80a1: Merge "Fix 5213252 [UI] Updated action bar layouts and action ↵Ray Chen2011-11-113-2/+71
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | orders" into ics-mr1 * commit 'c9af80a1e46106b93271903753d36682b480479c': Fix 5213252 [UI] Updated action bar layouts and action orders
| * \ \ \ \ \ \ \ \ am e193bc40: Merge "Fix b/5518211 by disabling effects when photo cannot be ↵Yuli Huang2011-11-111-18/+24
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | loaded." into ics-mr1 * commit 'e193bc40110b0606806c864234e95141be6bd312': Fix b/5518211 by disabling effects when photo cannot be loaded.
| * \ \ \ \ \ \ \ \ \ am 13105e73: Merge "Add face tanning effect to gallery" into ics-mr1Yuli Huang2011-11-082-0/+10
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '13105e73298f7ed0031232d48a7cf43ac4c0d21f': Add face tanning effect to gallery
| * \ \ \ \ \ \ \ \ \ \ am 826c44f2: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-0749-245/+245
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '826c44f23e8f3a5b9b5ed0227816f0a6441b5ed8': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ am e9560e6c: Merge "Change OK to CROP fro CropImage." into ics-mr1Wei Huang2011-11-071-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e9560e6c7bc55718c46264ac03eb7b44bfc857f2': Change OK to CROP fro CropImage.
| * \ \ \ \ \ \ \ \ \ \ \ \ am cc2f8c4e: Merge "Fix 5543077: Gallery UI tweaks." into ics-mr1Chih-Chung Chang2011-11-033-4/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'cc2f8c4e24a9cd8fcf99e960f0148a57128b6133': Fix 5543077: Gallery UI tweaks.
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am da9f0c77: Merge "Fix 5420843 [UI] Text strings for selecting images/album ↵Ray Chen2011-11-032-9/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for Gallery widget are confusing" into ics-mr1 * commit 'da9f0c773aa6c9ba228f30811df35d2c601dfdb6': Fix 5420843 [UI] Text strings for selecting images/album for Gallery widget are confusing
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e617b945: am 82635d92: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-11-030-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e617b945b25f0034ff3136457b32bfe39b6d3e08': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d1e3e976: Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-015-2/+454
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'd1e3e97606b850022cced61bafb50a1989b76d15': Import revised translations. DO NOT MERGE
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote branch 'goog/ics-mr1' into ics-aahEd Heyl2011-10-312-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ keep previous history after reset to mr1 plus aah changes (ics-aah-wip)Ed Heyl2011-10-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | undo reset to ics-mr1 until we have a better methodEd Heyl2011-10-2627-32/+46
| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | reset to ics-mr1, but keep historyEd Heyl2011-10-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge "Fix b/6046544 Deleting a photo takes multiple steps and the flow is ↵Ray Chen2012-04-032-6/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inconsistent with other deleting flows on other core apps"
| * | | | | | | | | | | | | | | | | | | | | Fix b/6046544 Deleting a photo takes multiple steps and the flow is ↵Ray Chen2012-04-022-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | inconsistent with other deleting flows on other core apps This CL removes the cancel options, the next one will address the undo feature. Change-Id: I99bb24fee0add0ffe6b4fcc9d32528abdd0ed418
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix b/5974240: Sliders may not be responsive to touches."Yuli Huang2012-04-037-26/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix b/5974240: Sliders may not be responsive to touches.Yuli Huang2012-04-027-26/+37
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add padding around sliders to increase its touchable areas. Change-Id: I034e25804811b14ce6137c72472191dabd7bdef8
* / / / / / / / / / / / / / / / / / / / / / Remove FilmStripView.Chih-Chung Chang2012-04-026-10/+0
|/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I45cee8c32863cc65eba4c5e83e667e104cf24e42
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie08a098ada3db0dd6b6791a117997c6c5cb043e9
* | | | | | | | | | | | | | | | | | | | | Create a ScreenNail interface so we can add other types of screenails.Chih-Chung Chang2012-03-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new MediaItem type to contain a ScreenNail. Change-Id: Ia303949f3013dd48ded204eaf9ec69a102b8503e
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I49d04d1c50230fbd0af5046d7df4a2a86a3b4b05
* | | | | | | | | | | | | | | | | | | | | Merge "Fix 5406844 Category switcher does not highlight current selection"Ray Chen2012-03-141-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Fix 5406844 Category switcher does not highlight current selectionRay Chen2012-03-121-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I7f6295d452764220bd3faa49526be25872a42e6d
* | | | | | | | | | | | | | | | | | | | | | Reorganize import for all files.Owen Lin2012-03-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia9188bcde727e317e6a476caccaea562f0758b19
* | | | | | | | | | | | | | | | | | | | | | Simplify PhotoEditor code.Yuli Huang2012-03-131-29/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Encapsulate spinner usages inside Toolbar. 2. Remove unnecessary static variable usages. Change-Id: Iaec614c5322a50c1e2c0cfa9cec1971b85e32f8a
* | | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-121-1/+1
|/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibd6567a362824e6ca459de53191c32c31813aa9d
* | | | | | | | | | | | | | | | | | | | | Change id "root" to "movie_view_root" to avoid confusion.Chih-Chung Chang2012-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is also one id "root" in Camera. Change-Id: Id6ebc5362f5ddceabe6dab6218de9b091454bde7
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-03-071-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I675ae2b5e04df6941251c8f561033fefffca3c93
* | | | | | | | | | | | | | | | | | | | | Fix b/5885342: Multiple PhotoEditor activities cause exceptions.Yuli Huang2012-03-071-22/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid using a static variable to keep tracking views across activities. Change-Id: Ia53444502d476d37b64344e5aea5f58a06ee3b03
* | | | | | | | | | | | | | | | | | | | | Import translations. DO NOT MERGEEric Fischer2012-02-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If2542a34f7e9e4b999252e8cf98cd2a5a8b9f3d9
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-02 06:34:27 +0000