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-dev-plus-aosp
[android-x86/packages-apps-Camera2.git] / res / values-am /
2014-10-17 Neil Fullerresolved conflicts for merge of c0dd3adf to lmp-dev... tree | commitdiff
2014-10-09 Dianne Hackbornam 2d440350: Update to use real L codename. tree | commitdiff
2014-10-06 Alan Newbergeram 7ba23fed: Fix preference copy migration and incorrec... tree | commitdiff
2014-10-06 Alan Newbergeram 0ac0b733: Merge "Fix incorrect key translation in... 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 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 e1eb82bc: Use NEW_DOCUMENT vs NEW_TASK when starting... tree | commitdiff
2014-10-02 Alan Newbergeram dae542a3: Fix error in settings key from refactor tree | commitdiff
2014-10-01 Alan Newbergeram d822d1cf: Only allow one draw call pending at a... tree | commitdiff
2014-09-30 Senpo Huam 2499af48: Stability: call stopPreview() before switc... tree | commitdiff
2014-09-29 Baligh Uddinam 2f727aff: (-s ours) Merge "Import translations.... tree | commitdiff
2014-09-29 Senpo Huam ed0fea9b: am 2d3475ae: Fix crash in VideoModule... tree | commitdiff
2014-09-27 Puneet Lallam 6014e168: am 022ce61e: Synchronize CaptureModule... tree | commitdiff
2014-09-26 Senpo Huam 93e01102: am feb07ea4: Merge "Stability: add null... tree | commitdiff
2014-09-26 Andy Huibersam d3a7c5af: am ad12363e: Revert app workaround for... 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 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-24 Alan Newbergeram 9db50c18: am 2631a15a: Don\'t show aspect ratio... tree | commitdiff
2014-09-24 Spike Spragueam d8dbf53c: am eeeed4fa: new sounds for timer ticker... tree | commitdiff
2014-09-24 Spike Spragueam c89420a6: am 7d1fb593: Merge "monkey test NPE fix... tree | commitdiff
2014-09-23 Alan Newbergeram 1db7f286: am b60af188: Merge "Fix filmstrip item... 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-20 Alan Newbergeram d0927687: (-s ours) Merge "Add scrolling support... tree | commitdiff
2014-09-19 Baligh Uddinam 82da5e95: (-s ours) am 02758e4c: (-s ours) Merge... 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 ub-camer... tree | commitdiff
2014-09-19 Jiawen Chenam 30ae8c64: Merge "Changed tap-to-meter rectangle... 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 Spike Spragueam baae9e84: am 8bbb5122: Merge "add null check to... tree | commitdiff
2014-09-19 Spike Spragueam 8bbb5122: Merge "add null check to updateCameraParam... tree | commitdiff
2014-09-19 Spike Spragueam 476a9e24: am 963775c3: portability layer doesn\... tree | commitdiff
2014-09-19 Spike Spragueam 963775c3: portability layer doesn\'t work well with... tree | commitdiff
2014-09-18 Spike Spragueam af25fb04: am 3c3b31df: mode switch jank fixes tree | commitdiff
2014-09-18 Spike Spragueam 3c3b31df: mode switch jank fixes tree | commitdiff
2014-09-17 Baligh UddinImport translations. DO NOT MERGE tree | commitdiff
2014-09-16 Baligh Uddinam 9a275f5e: (-s ours) Merge "Import translations.... tree | commitdiff
2014-09-16 Baligh UddinMerge "Import translations. DO NOT MERGE" into lmp-dev tree | commitdiff
2014-09-15 Baligh UddinImport translations. DO NOT MERGE tree | commitdiff
2014-09-09 Baligh Uddinkeep history after reset to lmp-dev tree | commitdiff
2014-09-09 Baligh Uddinkeep history after reset to lmp-dev tree | commitdiff
2014-09-08 Alan Newbergeram 3da669a0: am f974ba71: Additional logging for CAPTUR... tree | commitdiff
2014-09-08 Andy Huibersam 28785c93: am 6281a794: Merge "In debug_ui mode,... tree | commitdiff
2014-09-08 Alan Newbergeram 96892115: Merge "DO NOT MERGE Pipe context through... tree | commitdiff
2014-09-08 Alan Newbergeram 03812d8c: am 76215c98: (-s ours) DO NOT MERGE Update... tree | commitdiff
2014-09-08 Spike Spragueam 994d9136: am 954b9b1c: Merge "wait for filmstrip... tree | commitdiff
2014-09-06 Sascha Häberlingam dc563a37: am 13d07d0e: (-s ours) DO NOT MERGE Pipe... tree | commitdiff
2014-09-06 Sascha Häberlingam 4a9de272: am bcc384ea: Revert "Pipe context through... tree | commitdiff
2014-09-06 Sascha Haeberlingam 8b239e7d: am f6bf65e9: Pipe context through to camera tree | commitdiff
2014-09-05 Alan Newbergeram 02965e8c: am 9eb0eb55: (-s ours) Merge "DO NOT MERGE... tree | commitdiff
2014-09-05 Alan Newbergeram 626a1450: am 200d5f83: Merge "Close the camera when... tree | commitdiff
2014-09-05 Eino-Ville Talvalaam fb69fffc: am 82465c1c: Merge "Update camera2 API... tree | commitdiff
2014-09-05 Alan Newbergeram 252394a7: am 29a009c9: Add additional lifecycle... tree | commitdiff
2014-09-04 Sascha Haeberlingam 9bb10857: am dc0369f3: Merge "Load Gcam OneCamera... tree | commitdiff
2014-09-04 Spike Spragueam 844827b9: am eacf9460: Merge "remove stray bool... tree | commitdiff
2014-09-04 Andy Huibersam dc3d3e52: am 17d9084e: Add short flash animation... tree | commitdiff
2014-09-04 Baligh Uddinam b43f973a: (-s ours) am f096e898: (-s ours) Merge... tree | commitdiff
2014-09-04 Baligh Uddinam 9351f22c: (-s ours) Merge "Import translations.... tree | commitdiff
2014-09-04 Puneet Lallam 6fa0451d: am f1e3dc86: Merge "Added log for first... tree | commitdiff
2014-09-04 Puneet Lallam f8ae4fb6: am ae6e94f5: Merge "Re-enable shutter... tree | commitdiff
2014-09-04 Alan Newbergeram a4258d82: am 2ef0f9dc: Fix unnecessary string cast tree | commitdiff
2014-09-04 Alan Newbergeram 64e4bc9f: am 2b084ec5: Merge "Fixing settings upgrad... tree | commitdiff
2014-09-03 Puneet Lallam fb730076: am 4d6d676c: Refactor default picture... tree | commitdiff
2014-09-03 Puneet Lallam d8934fdf: am 686c7b55: Merge "[ZSL Cam] Use largest... tree | commitdiff
2014-09-03 Andy Huibersam 648c05aa: am 4d7f3be8: CaptureModule countdown timer... tree | commitdiff
2014-09-03 Andy Huibersam a00adf62: am d568e524: Merge "Add countdown timer... tree | commitdiff
2014-09-02 Sascha Haeberlingam 13a221a2: am 7718b87b: Merge "A few Size clean-ups... tree | commitdiff
2014-09-02 Spike Spragueam 39b7e060: am b9f4b931: Merge "actionbar opactiy... tree | commitdiff
2014-09-02 Spike Spragueam 12a615c8: am 9bfd6bdd: shutter button color fix... tree | commitdiff
2014-09-02 Andy Huibersam 4cd2a6ab: am 5ca2e0b9: Merge "Remove android.hardwar... tree | commitdiff
2014-09-02 Senpo Huam 76061e1f: am 10fcde55: Merge "Starting share/edit... tree | commitdiff
2014-08-30 Alan Newbergeram 2c25a7cb: am ef481910: Merge "Ensure ZoomView appear... tree | commitdiff
2014-08-30 Andy Huibersam a394ea69: am b868274c: Simplify AF in CaptureModule... tree | commitdiff
2014-08-29 Puneet Lallam 0767876e: am 68c25ac5: ZSL refactoring tree | commitdiff
2014-08-29 Puneet Lallam 42b0b25e: am d308d001: Add missing copyright header... tree | commitdiff
2014-08-29 Puneet Lallam 53c98a3e: am 82d70ea0: Merge "[ZSL Cam] Fixed shutte... tree | commitdiff
2014-08-29 Spike Spragueam 70e387a7: am b8c3e31c: Merge "fix for a regression... tree | commitdiff
2014-08-29 Alan Newbergeram 4deea574: am 475a1935: Merge "Increasing JPEG compre... tree | commitdiff
2014-08-28 Puneet Lallam 97421aec: am 3724805a: Merge "Zsl flash, auto focus... tree | commitdiff
2014-08-28 Alan Newbergeram 1c390f77: am 965db3e8: Merge "Actually remove settin... tree | commitdiff
2014-08-28 Andy Huibersam 640a8648: am 076efc03: Do not show AF UI prior to... tree | commitdiff
2014-08-28 Sascha Haeberlingam 10438ec0: am 2d4be257: Add simple sound player to... tree | commitdiff
2014-08-27 Alan Newbergeram 21bd2937: am 352de757: Merge "Remove FeedbackHelper... tree | commitdiff
2014-08-27 Sam Hasinoffam 0cfde67e: am 4f0d6384: gcam: Restore naming of Gcam... tree | commitdiff
2014-08-27 Puneet Lallam 30a17805: am 2b3cf868: Merge "Add setprop to enable... tree | commitdiff
2014-08-27 Sascha Haeberlingam ba12c58f: am 969d606a: Merge "Make sure CaptureModul... tree | commitdiff
2014-08-27 Spike Spragueam e77ca66d: am 480e58b1: Merge "fix for a doublebounce... tree | commitdiff
2014-08-27 Puneet Lallam ae182077: am c5b75258: Merge "Initial ZSL implementa... tree | commitdiff
2014-08-27 Puneet LallMerge "Initial ZSL implementation" into ub-camera-glacier tree | commitdiff
2014-08-27 Spike Spragueam 18422419: am a98b4b10: Merge "boatload of new assets... tree | commitdiff
2014-08-27 Spike SpragueMerge "boatload of new assets" into ub-camera-glacier tree | commitdiff
next
packages/apps/Camera2
About OSDN
Find Software
Develop Software
Help