summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Expand)AuthorAgeFilesLines
* DO NOT MERGE - Remove Material from Fishlake. But not glacier.Sascha Haeberling2014-06-231-40/+0
* Import translations. DO NOT MERGEBaligh Uddin2014-06-1821-47/+28
* Import translations. DO NOT MERGEBaligh Uddin2014-06-1655-1/+75
* Merge "Import translations. DO NOT MERGE" into ub-camera-fishlakeBaligh Uddin2014-06-121-1/+1
|\
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-131-1/+1
* | Merge "GoogleHelp affordance in CameraSettingsActivity" into ub-camera-fishlakeErin Dahlgren2014-06-122-0/+9
|\ \ | |/ |/|
| * GoogleHelp affordance in CameraSettingsActivityErin Dahlgren2014-06-132-0/+9
* | Merge "intent captrue review gets its own ImageView! instead of relying on a ...Spike Sprague2014-06-104-48/+147
|\ \
| * | intent captrue review gets its own ImageView!Spike Sprague2014-06-094-48/+147
| |/
* | Merge "Import translations. DO NOT MERGE" into ub-camera-fishlakeBaligh Uddin2014-06-101-8/+8
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-091-8/+8
* | Merge "CL in preparation of the s/Theme.Quantum/Theme.Material/ change" into ...Spike Sprague2014-06-091-3/+3
|\ \ | |/ |/|
| * CL in preparation of the s/Theme.Quantum/Theme.Material/ changeSpike Sprague2014-06-091-3/+3
* | Merge "Import translations. DO NOT MERGE" into ub-camera-fishlakeBaligh Uddin2014-06-071-8/+8
|\ \ | |/ |/|
| * Import translations. DO NOT MERGEBaligh Uddin2014-06-041-8/+8
* | Merge "add Quantum theme to styles that were Holo (shows on android L, backwa...Spike Sprague2014-06-051-0/+40
|\ \ | |/ |/|
| * add Quantum theme to styles that were HoloSpike Sprague2014-06-051-0/+40
* | Import translations. DO NOT MERGEBaligh Uddin2014-06-022-9/+9
|/
* Import translations. DO NOT MERGEGeoff Mendal2014-05-283-11/+11
* am d58c9ccb: Fix build by removing references to removed strings.Sascha Haeberling2014-05-271-2/+2
|\
| * Fix build by removing references to removed strings.Sascha Haeberling2014-05-271-2/+2
| * Import translations. DO NOT MERGEBaligh Uddin2014-05-2655-444/+431
* | Import translations. DO NOT MERGEBaligh Uddin2014-05-2655-444/+596
* | am c02d0773: Merge "Don\'t use translated strings for video sized until they\...Sascha Haeberling2014-05-232-6/+14
|\|
| * Merge "Don't use translated strings for video sized until they're sane." into...Sascha Haeberling2014-05-232-6/+14
| |\
| | * Don't use translated strings for video sized until they're sane.Sascha Haeberling2014-05-232-6/+14
* | | resolved conflicts for merge of 26aa92bf to ub-camera-fishlakeDoris Liu2014-05-233-0/+36
|\| |
| * | Add cling for settings buttonDoris Liu2014-05-233-0/+36
| |/
* | am 3538157f: Merge "Add back contentDescription for the aspect ratio image bu...Sascha Haeberling2014-05-222-2/+6
|\|
| * Add back contentDescription for the aspect ratio image buttons.Sascha Haeberling2014-05-222-2/+6
* | am e177717d: Merge "Make video options translatable." into ub-camera-evergladesSascha Haeberling2014-05-211-8/+8
|\|
| * Make video options translatable.Sascha Haeberling2014-05-211-8/+8
* | am 6809eb84: Freeze the screen during camera switch to hide visual distractionDoris Liu2014-05-211-1/+1
|\|
| * Freeze the screen during camera switch to hide visual distractionDoris Liu2014-05-211-1/+1
* | am 6fe6beb5: Merge "Fix the build" into ub-camera-evergladesSeth Raphael2014-05-211-2/+2
|\|
| * Merge "Fix the build" into ub-camera-evergladesSeth Raphael2014-05-211-2/+2
| |\
| | * Fix the buildSeth Raphael2014-05-211-2/+2
* | | Merge commit '3cfd962f' into manualmergeSeth Raphael2014-05-211-0/+16
|\| |
| * | Merge "Add Letterboxing for HDR+" into ub-camera-evergladesSeth Raphael2014-05-211-0/+16
| |\|
| | * Add Letterboxing for HDR+Seth Raphael2014-05-211-0/+16
| * | Merge "Import translations. DO NOT MERGE" into ub-camera-evergladesBaligh Uddin2014-05-2155-343/+250
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2014-05-2055-343/+250
| | |/
* | | am 0b283b41: Merge "Maximize space for Large Text in aspect ratio dialog." in...Erin Dahlgren2014-05-212-46/+46
|\| |
| * | Merge "Maximize space for Large Text in aspect ratio dialog." into ub-camera-...Erin Dahlgren2014-05-212-46/+46
| |\ \
| | * | Maximize space for Large Text in aspect ratio dialog.Erin Dahlgren2014-05-202-46/+46
* | | | am b514cdea: Merge "Show timer option in HDR+ mode and as disabled." into ub-...Sascha Haeberling2014-05-2116-3/+120
|\| | |
| * | | Merge "Show timer option in HDR+ mode and as disabled." into ub-camera-evergl...Sascha Haeberling2014-05-2116-3/+120
| |\ \ \
| | * | | Show timer option in HDR+ mode and as disabled.Sascha Haeberling2014-05-2016-3/+120
* | | | | Rename HDR+ torch to flashSam Hasinoff2014-05-211-3/+3
* | | | | Merge "Import translations. DO NOT MERGE" into ub-camera-fishlakeBaligh Uddin2014-05-2155-343/+250
|\ \ \ \ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 12:31:49 +0000