OSDN Git Service

(root) / android-x86 / packages-apps-Camera2.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
resolved conflicts for merge of c0dd3adf to lmp-mr1-dev-plus-aosp
[android-x86/packages-apps-Camera2.git] / res /
2014-10-17 Neil Fullerresolved conflicts for merge of c0dd3adf to lmp-mr1... tree | commitdiff
2014-10-10 Dianne Hackbornam cc933608: am 2d440350: Update to use real L codename. tree | commitdiff
2014-10-09 Dianne Hackbornam 2d440350: Update to use real L codename. tree | commitdiff
2014-10-07 Alan Newbergeram 49123263: am 7ba23fed: Fix preference copy migration... tree | commitdiff
2014-10-06 Alan Newbergeram 7ba23fed: Fix preference copy migration and incorrec... tree | commitdiff
2014-10-06 Alan Newbergeram 0424d264: am 0ac0b733: Merge "Fix incorrect key... tree | commitdiff
2014-10-06 Alan Newbergeram 0ac0b733: Merge "Fix incorrect key translation in... tree | commitdiff
2014-10-05 Alan Newbergeram c6dfd609: am d30fdee3: Merge "Trap CameraAgentFactor... tree | commitdiff
2014-10-05 Alan Newbergeram 57177a77: am b0be8f53: Merge "Trap camera close... tree | commitdiff
2014-10-05 Alan Newbergeram d30fdee3: Merge "Trap CameraAgentFactory RTEs during... tree | commitdiff
2014-10-05 Alan Newbergeram b0be8f53: Merge "Trap camera close exceptions on... tree | commitdiff
2014-10-05 Alan Newbergeram ce06a319: am 0021c301: Merge "Avoid porting null... tree | commitdiff
2014-10-05 Alan Newbergeram d0590b34: am a9ed2418: Only set preview size before... tree | commitdiff
2014-10-05 Alan Newbergeram 0021c301: Merge "Avoid porting null keys when copyin... tree | commitdiff
2014-10-05 Alan Newbergeram a9ed2418: Only set preview size before starting... tree | commitdiff
2014-10-02 Alan Newbergeram 04b6e4c0: am e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK... tree | commitdiff
2014-10-02 Alan Newbergeram e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting... tree | commitdiff
2014-10-02 Alan Newbergeram 36cb7fb8: am dae542a3: Fix error in settings key... tree | commitdiff
2014-10-02 Alan Newbergeram dae542a3: Fix error in settings key from refactor tree | commitdiff
2014-10-01 Alan Newbergeram 07c463d3: am d822d1cf: Only allow one draw call... tree | commitdiff
2014-10-01 Senpo Huam f0e685d9: am 2499af48: Stability: call stopPreview... tree | commitdiff
2014-10-01 Alan Newbergeram d822d1cf: Only allow one draw call pending at a... tree | commitdiff
2014-10-01 Senpo Huam 2499af48: Stability: call stopPreview() before switc... tree | commitdiff
2014-09-29 Baligh Uddinam d51f2cc7: (-s ours) am 2f727aff: (-s ours) Merge... tree | commitdiff
2014-09-29 Baligh Uddinam 2f727aff: (-s ours) Merge "Import translations.... tree | commitdiff
2014-09-29 Senpo Huam 8838aba5: am ed0fea9b: am 2d3475ae: Fix crash in... tree | commitdiff
2014-09-29 Baligh UddinMerge "Import translations. DO NOT MERGE" into lmp-dev tree | commitdiff
2014-09-29 Baligh UddinImport translations. DO NOT MERGE tree | commitdiff
2014-09-29 Senpo Huam ed0fea9b: am 2d3475ae: Fix crash in VideoModule... tree | commitdiff
2014-09-29 Senpo Huam 2d3475ae: Fix crash in VideoModule - Method called... tree | commitdiff
2014-09-27 Puneet Lallam f9d6b067: am 6014e168: am 022ce61e: Synchronize... tree | commitdiff
2014-09-27 Puneet Lallam 6014e168: am 022ce61e: Synchronize CaptureModule... tree | commitdiff
2014-09-27 Puneet Lallam 022ce61e: Synchronize CaptureModule camera open... tree | commitdiff
2014-09-26 Senpo Huam 900c5aa9: am 93e01102: am feb07ea4: Merge "Stability... tree | commitdiff
2014-09-26 Senpo Huam 93e01102: am feb07ea4: Merge "Stability: add null... tree | commitdiff
2014-09-26 Senpo Huam feb07ea4: Merge "Stability: add null check for all... tree | commitdiff
2014-09-26 Andy Huibersam bbf0e352: am d3a7c5af: am ad12363e: Revert app worka... tree | commitdiff
2014-09-26 Andy Huibersam d3a7c5af: am ad12363e: Revert app workaround for... tree | commitdiff
2014-09-26 Andy Huibersam ad12363e: Revert app workaround for bug 17614203... tree | commitdiff
2014-09-25 Alan Newbergeram e9541583: am f379211c: am 47c4474e: Merge "Force... tree | commitdiff
2014-09-25 Puneet Lallam d0f873b9: am fc0e5d89: am 4d2f3bf4: Merge "Recreate... tree | commitdiff
2014-09-25 Senpo Huam 814310de: am 437fd924: am ee3123ba: Stability: add... tree | commitdiff
2014-09-25 Alan Newbergeram f379211c: am 47c4474e: Merge "Force filmstrip images... tree | commitdiff
2014-09-25 Puneet Lallam fc0e5d89: am 4d2f3bf4: Merge "Recreate a OneCameraMa... tree | commitdiff
2014-09-25 Senpo Huam 437fd924: am ee3123ba: Stability: add null check... tree | commitdiff
2014-09-25 Alan Newbergeram 47c4474e: Merge "Force filmstrip images to generate... tree | commitdiff
2014-09-25 Puneet Lallam 4d2f3bf4: Merge "Recreate a OneCameraManager instanc... tree | commitdiff
2014-09-25 Senpo Huam ee3123ba: Stability: add null check for all CameraPr... tree | commitdiff
2014-09-25 Alan Newbergeram f49e3882: am 3f8c75b2: am da6f3acc: Skip disk cachin... tree | commitdiff
2014-09-25 Alan Newbergeram e25f2203: am 92db2cb4: am 6b2d1e0b: Merge "Revert... tree | commitdiff
2014-09-25 Alan Newbergeram 68a63db4: am af73f898: am 347dccbe: Ensure Camera... tree | commitdiff
2014-09-25 Alan Newbergeram 3f8c75b2: am da6f3acc: Skip disk caching for session... tree | commitdiff
2014-09-25 Alan Newbergeram 92db2cb4: am 6b2d1e0b: Merge "Revert temporary sessi... tree | commitdiff
2014-09-25 Alan Newbergeram af73f898: am 347dccbe: Ensure Camera doesn\'t attemp... tree | commitdiff
2014-09-25 Alan Newbergeram da6f3acc: Skip disk caching for session data tree | commitdiff
2014-09-25 Alan Newbergeram 6b2d1e0b: Merge "Revert temporary session images... tree | commitdiff
2014-09-25 Alan Newbergeram 347dccbe: Ensure Camera doesn\'t attempt access... tree | commitdiff
2014-09-24 Alan Newbergeram 59cfca2f: am 9db50c18: am 2631a15a: Don\'t show... tree | commitdiff
2014-09-24 Alan Newbergeram 9db50c18: am 2631a15a: Don\'t show aspect ratio... tree | commitdiff
2014-09-24 Alan Newbergeram 2631a15a: Don\'t show aspect ratio UI if using API2... tree | commitdiff
2014-09-24 Spike Spragueam c8b10f95: am d93dcf9a: am a02991d9: am d8dbf53c... tree | commitdiff
2014-09-24 Spike Spragueam d93dcf9a: am a02991d9: am d8dbf53c: am eeeed4fa... tree | commitdiff
2014-09-24 Spike Spragueam a02991d9: am d8dbf53c: am eeeed4fa: new sounds for... tree | commitdiff
2014-09-24 Spike Spragueam 668f0efc: am c89420a6: am 7d1fb593: Merge "monkey... tree | commitdiff
2014-09-24 Spike Spragueam d8dbf53c: am eeeed4fa: new sounds for timer ticker... tree | commitdiff
2014-09-24 Spike Spragueam eeeed4fa: new sounds for timer ticker and pano ... tree | commitdiff
2014-09-24 Spike Spragueam c89420a6: am 7d1fb593: Merge "monkey test NPE fix... tree | commitdiff
2014-09-24 Spike Spraguenew sounds for timer ticker and pano / photosphere... tree | commitdiff
2014-09-24 Spike Spragueam 7d1fb593: Merge "monkey test NPE fix, another null... tree | commitdiff
2014-09-23 Alan Newbergeram fe8184af: am 1db7f286: am b60af188: Merge "Fix films... tree | commitdiff
2014-09-23 Alan Newbergeram 1db7f286: am b60af188: Merge "Fix filmstrip item... tree | commitdiff
2014-09-23 Alan Newbergeram b60af188: Merge "Fix filmstrip item bounds to filmst... tree | commitdiff
2014-09-23 Alan Newbergeram 7e08f366: am 9f3628da: am 5f86f7fd: Cleanup gesture... tree | commitdiff
2014-09-23 Alan Newbergeram 34920701: am 8f1ffed7: am b2b0e02c: Clean up unused... tree | commitdiff
2014-09-23 Alan Newbergeram 9f3628da: am 5f86f7fd: Cleanup gesture UI hide code tree | commitdiff
2014-09-23 Alan Newbergeram 8f1ffed7: am b2b0e02c: Clean up unused code tree | commitdiff
2014-09-23 Alan Newbergeram 5f86f7fd: Cleanup gesture UI hide code tree | commitdiff
2014-09-23 Alan Newbergeram b2b0e02c: Clean up unused code tree | commitdiff
2014-09-20 Alan Newbergerresolved conflicts for merge of d0927687 to lmp-mr1... tree | commitdiff
2014-09-19 Baligh Uddinam 67bcd21a: (-s ours) am 82da5e95: (-s ours) am 02758e... tree | commitdiff
2014-09-19 Baligh Uddinam 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge... tree | commitdiff
2014-09-19 Jiawen Chenam 5b88b83a: am 284a9b48: am 30ae8c64: Merge "Changed... tree | commitdiff
2014-09-19 Baligh Uddinam 5628cfde: (-s ours) Merge "Import translations.... tree | commitdiff
2014-09-19 Baligh Uddinam 02758e4c: (-s ours) Merge "Import translations.... tree | commitdiff
2014-09-19 Jiawen Chenam 284a9b48: am 30ae8c64: Merge "Changed tap-to-meter... tree | commitdiff
2014-09-19 Baligh UddinMerge "Import translations. DO NOT MERGE" into lmp... tree | commitdiff
2014-09-19 Baligh UddinMerge "Import translations. DO NOT MERGE" into ub-camer... tree | commitdiff
2014-09-19 Jiawen Chenam 30ae8c64: Merge "Changed tap-to-meter rectangle... tree | commitdiff
2014-09-19 Jiawen ChenMerge "Changed tap-to-meter rectangle and weights.... tree | commitdiff
2014-09-19 Spike Spragueam 10f6e1c7: am a34f0972: am 545c313a: am 94cd6522... tree | commitdiff
2014-09-19 Spike Spragueam a34f0972: am 545c313a: am 94cd6522: am 19942a17... tree | commitdiff
2014-09-19 Alan Newbergeram 14f9d310: am 40b52050: am e684ea54: Merge "Fix Camer... tree | commitdiff
2014-09-19 Spike Spragueam 545c313a: am 94cd6522: am 19942a17: Merge "implement... tree | commitdiff
2014-09-19 Alan Newbergeram 40b52050: am e684ea54: Merge "Fix CameraSettingsActi... tree | commitdiff
2014-09-19 Spike Spragueam 94cd6522: am 19942a17: Merge "implement new trash... tree | commitdiff
2014-09-19 Alan Newbergeram e684ea54: Merge "Fix CameraSettingsActivityHelper... tree | commitdiff
2014-09-19 Spike Spragueam 19942a17: Merge "implement new trash icon, plus... tree | commitdiff
2014-09-19 Alan NewbergerMerge "Fix CameraSettingsActivityHelper" into ub-camera... tree | commitdiff
2014-09-19 Spike SpragueMerge "implement new trash icon, plus some asset cleanu... tree | commitdiff
2014-09-19 Spike Spragueam 7a133b82: am baae9e84: am 8bbb5122: Merge "add null... tree | commitdiff
next
packages/apps/Camera2
About OSDN
Find Software
Develop Software
Help