OSDN Git Service

resolved conflicts for merge of c0dd3adf to lmp-dev-plus-aosp
[android-x86/packages-apps-Camera2.git] / res / values-ta-rIN /
2014-10-17 Neil Fullerresolved conflicts for merge of c0dd3adf to lmp-dev...
2014-10-09 Dianne Hackbornam 2d440350: Update to use real L codename.
2014-10-06 Alan Newbergeram 7ba23fed: Fix preference copy migration and incorrec...
2014-10-06 Alan Newbergeram 0ac0b733: Merge "Fix incorrect key translation in...
2014-10-05 Alan Newbergeram d30fdee3: Merge "Trap CameraAgentFactory RTEs during...
2014-10-05 Alan Newbergeram b0be8f53: Merge "Trap camera close exceptions on...
2014-10-05 Alan Newbergeram 0021c301: Merge "Avoid porting null keys when copyin...
2014-10-05 Alan Newbergeram a9ed2418: Only set preview size before starting...
2014-10-02 Alan Newbergeram e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting...
2014-10-02 Alan Newbergeram dae542a3: Fix error in settings key from refactor
2014-10-01 Alan Newbergeram d822d1cf: Only allow one draw call pending at a...
2014-09-30 Senpo Huam 2499af48: Stability: call stopPreview() before switc...
2014-09-29 Baligh Uddinam 2f727aff: (-s ours) Merge "Import translations....
2014-09-29 Baligh UddinMerge "Import translations. DO NOT MERGE" into lmp-dev
2014-09-29 Baligh UddinImport translations. DO NOT MERGE
2014-09-29 Senpo Huam 2d3475ae: Fix crash in VideoModule - Method called...
2014-09-27 Puneet Lallam 022ce61e: Synchronize CaptureModule camera open...
2014-09-26 Senpo Huam feb07ea4: Merge "Stability: add null check for all...
2014-09-26 Andy Huibersam ad12363e: Revert app workaround for bug 17614203...
2014-09-25 Alan Newbergeram 47c4474e: Merge "Force filmstrip images to generate...
2014-09-25 Puneet Lallam 4d2f3bf4: Merge "Recreate a OneCameraManager instanc...
2014-09-25 Senpo Huam ee3123ba: Stability: add null check for all CameraPr...
2014-09-25 Alan Newbergeram da6f3acc: Skip disk caching for session data
2014-09-25 Alan Newbergeram 6b2d1e0b: Merge "Revert temporary session images...
2014-09-25 Alan Newbergeram 347dccbe: Ensure Camera doesn\'t attempt access...
2014-09-24 Alan Newbergeram 2631a15a: Don\'t show aspect ratio UI if using API2...
2014-09-24 Spike Spragueam eeeed4fa: new sounds for timer ticker and pano ...
2014-09-24 Spike Spragueam 7d1fb593: Merge "monkey test NPE fix, another null...
2014-09-23 Alan Newbergeram b60af188: Merge "Fix filmstrip item bounds to filmst...
2014-09-23 Alan Newbergeram 5f86f7fd: Cleanup gesture UI hide code
2014-09-23 Alan Newbergeram b2b0e02c: Clean up unused code
2014-09-20 Alan Newbergeram d0927687: (-s ours) Merge "Add scrolling support...
2014-09-19 Baligh Uddinam 02758e4c: (-s ours) Merge "Import translations....
2014-09-19 Jiawen Chenam 30ae8c64: Merge "Changed tap-to-meter rectangle...
2014-09-19 Alan Newbergeram e684ea54: Merge "Fix CameraSettingsActivityHelper...
2014-09-19 Spike Spragueam 19942a17: Merge "implement new trash icon, plus...
2014-09-19 Spike Spragueam 8bbb5122: Merge "add null check to updateCameraParam...
2014-09-19 Spike Spragueam 963775c3: portability layer doesn\'t work well with...
2014-09-18 Spike Spragueam 3c3b31df: mode switch jank fixes
2014-09-16 Puneet Lallam 6f1dfe69: Merge "Don\'t set mCameraAppUI to null...
2014-09-15 Spike Spragueam a16219d5: set proper alpha on shutter button on...
2014-09-12 Puneet Lallam 70a96525: Don\'t send redundant requests to start...
2014-09-12 Alan Newbergeram 486ba1da: Revert layout change for Camera
2014-09-12 Alan Newbergeram ca5173d8: Move launcher icons to mipmap
2014-09-11 Alan Newbergeram 45f316bc: Establish synchronous camera closing when...
2014-09-11 Baligh Uddinam 0c5fc1d3: (-s ours) Merge "Import translations....
2014-09-11 Andy Huibersam e6ebf3d7: If we are using CaptureModule for Gcam...
2014-09-11 Alan Newbergeram 0c9af933: Merge "Revert "Delay PhotoModule preview...
2014-09-11 Alan Newbergeram 7351415d: Reset aspect ratio on pause
2014-09-10 Spike Spragueam 87a2300f: Merge "workaround fix" into ub-camera...
2014-09-10 Alan Newbergeram 3096e672: Merge "Delay PhotoModule preview cover...
2014-09-10 Senpo Huam d3ee86b7: Merge "Return to filmstrip when video...
2014-09-10 Senpo Huam 5675b8af: Fix the upside-down orienation bug in...
2014-09-10 Alan Newbergeram d79b38d6: Merge "Remove jank on camera options switc...
2014-09-10 Jiawen Chenam 9cefdd49: Changed double to float. viewFinder -...
2014-09-10 Alan Newbergeram ffc395d6: Reinitialize shutter button in Camera...
2014-09-10 Alan Newbergeram 5c4bd6b5: Reduce logging for unknown camera scope
2014-09-10 Andy Huibersam a710f371: Merge "This fixes Bitmap.createBitmap...
2014-09-10 Qiwen Zhaoam fd97c6da: (-s ours) Merge "DO NOT MERGE: Adjust...
2014-09-10 Nicolas Prevotam 42a5ad5a: Merge "Granting read permission in the...
2014-09-10 Andy Huibersam 5e3bf4cc: Remove toast. This reverts commit 779414e8...
2014-09-10 Senpo Huam b954b3e8: Merge "Always match camera orientation...
2014-09-10 Senpo Huam 65c00136: Set video quality pref default values...
2014-09-09 Spike Spragueam 767a1186: Merge "back to bigger HDR+ icons" into...
2014-09-09 Baligh Uddinkeep history after reset to lmp-dev
2014-09-09 Baligh Uddinkeep history after reset to lmp-dev
2014-09-08 Alan Newbergeram 3da669a0: am f974ba71: Additional logging for CAPTUR...
2014-09-08 Alan Newbergeram f974ba71: Additional logging for CAPTURE intent...
2014-09-08 Andy Huibersam 28785c93: am 6281a794: Merge "In debug_ui mode,...
2014-09-08 Andy Huibersam 6281a794: Merge "In debug_ui mode, show CAF result...
2014-09-08 Alan Newbergeram 96892115: Merge "DO NOT MERGE Pipe context through...
2014-09-08 Alan Newbergeram 03812d8c: am 76215c98: (-s ours) DO NOT MERGE Update...
2014-09-08 Alan Newbergeram 76215c98: (-s ours) DO NOT MERGE Update Camera2...
2014-09-08 Spike Spragueam 994d9136: am 954b9b1c: Merge "wait for filmstrip...
2014-09-08 Spike Spragueam 954b9b1c: Merge "wait for filmstrip bottom panel...
2014-09-06 Sascha Häberlingam dc563a37: am 13d07d0e: (-s ours) DO NOT MERGE Pipe...
2014-09-06 Sascha Häberlingam 4a9de272: am bcc384ea: Revert "Pipe context through...
2014-09-06 Sascha Haeberlingam 8b239e7d: am f6bf65e9: Pipe context through to camera
2014-09-06 Sascha Häberlingam 13d07d0e: (-s ours) DO NOT MERGE Pipe context throug...
2014-09-06 Sascha Häberlingam bcc384ea: Revert "Pipe context through to camera"
2014-09-06 Sascha Haeberlingam f6bf65e9: Pipe context through to camera
2014-09-05 Alan Newbergeram 02965e8c: am 9eb0eb55: (-s ours) Merge "DO NOT MERGE...
2014-09-05 Alan Newbergeram 626a1450: am 200d5f83: Merge "Close the camera when...
2014-09-05 Alan Newbergeram 9eb0eb55: (-s ours) Merge "DO NOT MERGE Revert ...
2014-09-05 Alan Newbergeram 200d5f83: Merge "Close the camera when the async...
2014-09-05 Eino-Ville Talvalaam fb69fffc: am 82465c1c: Merge "Update camera2 API...
2014-09-05 Eino-Ville Talvalaam 82465c1c: Merge "Update camera2 API usage" into...
2014-09-05 Alan Newbergeram 252394a7: am 29a009c9: Add additional lifecycle...
2014-09-05 Alan Newbergeram 29a009c9: Add additional lifecycle logging to Camera
2014-09-04 Sascha Haeberlingam 9bb10857: am dc0369f3: Merge "Load Gcam OneCamera...
2014-09-04 Sascha Haeberlingam dc0369f3: Merge "Load Gcam OneCamera in CaptureModul...
2014-09-04 Spike Spragueam 844827b9: am eacf9460: Merge "remove stray bool...
2014-09-04 Spike Spragueam eacf9460: Merge "remove stray bool resource for...
2014-09-04 Andy Huibersam dc3d3e52: am 17d9084e: Add short flash animation...
2014-09-04 Andy Huibersam 17d9084e: Add short flash animation and shutter...
2014-09-04 Baligh Uddinam b43f973a: (-s ours) am f096e898: (-s ours) Merge...
2014-09-04 Baligh Uddinam 9351f22c: (-s ours) Merge "Import translations....
2014-09-04 Baligh Uddinam f096e898: (-s ours) Merge "Import translations....
2014-09-04 Puneet Lallam 6fa0451d: am f1e3dc86: Merge "Added log for first...
2014-09-04 Puneet Lallam f1e3dc86: Merge "Added log for first preview frame...
next