summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Remove translated filtershow_strings.xml files.Baligh Uddin2013-10-0450-4672/+0
|
* Merge "Build broken." into klp-devBaligh Uddin2013-10-0555-253/+179
|\
| * Build broken.Baligh Uddin2013-10-0555-253/+179
| | | | | | | | | | | | | | | | Revert "Import translations. DO NOT MERGE" This reverts commit 0028336423130a5a0227cd932d3295581f83dd22. Change-Id: Id3638d0d093d03c037d30a3b1f49e242ff67af85
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0555-179/+253
|\|
| * Import translations. DO NOT MERGEBaligh Uddin2013-10-0455-179/+253
| | | | | | | | | | Change-Id: Ie6c099841e72853be3243fffc8d6c266c8c802da Auto-generated-cl: translation import
* | am 18709218: Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
|\ \ | |/ |/| | | | | * commit '187092180b3af64b5d7c2197d1054a860f7cbf45': Update the HDR+ assets.
| * Update the HDR+ assets.Sascha Haeberling2013-10-0420-0/+0
| | | | | | | | | | | | Bug: 11047147 Change-Id: I680d9a822876655d3c30715a9315a17b8db87763
* | am 77dd1493: Merge "Make space for photosphere rendering text" into ↵Erin Dahlgren2013-10-031-1/+0
|\| | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '77dd14930b24816369560a73cfb0610c1f745d05': Make space for photosphere rendering text
| * Merge "Make space for photosphere rendering text" into gb-ub-photos-carlsbadErin Dahlgren2013-10-031-1/+0
| |\
| | * Make space for photosphere rendering textErin Dahlgren2013-10-031-1/+0
| | | | | | | | | | | | | | | Bug: 11005014 Change-Id: I1f92322ff5a53b8bf6752841efd3a59e366d78fb
* | | am 238799e9: Merge "Change icons and code from HQ to HDR+ mode." into ↵Sascha Haeberling2013-10-0328-15/+15
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '238799e97077ee72a53a5a04d9d3068aebb82bf7': Change icons and code from HQ to HDR+ mode.
| * | Change icons and code from HQ to HDR+ mode.Sascha Haeberling2013-10-0328-15/+15
| | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Ib0ab1675788f6584d2b06b63a113468d2e775f23
* | | am 68fc363b: Merge "Camera2 icon update for all resolutions." into ↵Kevin Gabayan2013-10-035-0/+0
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '68fc363bd33a9e506ccfd1ffa330c4525a2734ce': Camera2 icon update for all resolutions.
| * | Merge "Camera2 icon update for all resolutions." into gb-ub-photos-carlsbadKevin Gabayan2013-10-035-0/+0
| |\ \
| | * | Camera2 icon update for all resolutions.Kevin Gabayan2013-10-025-0/+0
| | | | | | | | | | | | | | | | | | | | Bug: 11048341 Change-Id: I71bf09eed24aa23e30eaf8c9bf4add8c0d1835b1
* | | | am 623b74b6: Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
|\| | | | | | | | | | | | | | | | | | | * commit '623b74b608fae83034bab58331fc705b8cfecaa6': Add HDR+ mode strings (to replace HQ mode)
| * | | Add HDR+ mode strings (to replace HQ mode)Sascha Haeberling2013-10-033-7/+5
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 11047147 Change-Id: Iadf72105d526467a1d8f63db839237a4cfba24e1
* | | | am 3393a627: Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
|\| | | | | | | | | | | | | | | | | | | * commit '3393a62797fa397823eba720b3f52d39ae065739': Add missing crop message.
| * | | Merge "Add missing crop message." into gb-ub-photos-carlsbadSascha Haeberling2013-10-031-1/+2
| |\ \ \
| | * | | Add missing crop message.Sascha Haeberling2013-10-031-1/+2
| | |/ / | | | | | | | | | | | | | | | | | | | | Bug: 11021907 Change-Id: I9f1b6793e62c098a21f06e2957118cb8bf3475c4
* | | | am 9ac97492: Merge "Show the delete button if there is room in action bar." ↵ztenghui2013-10-031-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '9ac97492cafafc02357de21074d95b29d55d2e9f': Show the delete button if there is room in action bar.
| * | | Merge "Show the delete button if there is room in action bar." into ↵ztenghui2013-10-031-1/+1
| |\ \ \ | | |/ / | |/| | | | | | gb-ub-photos-carlsbad
| | * | Show the delete button if there is room in action bar.ztenghui2013-10-021-1/+1
| | |/ | | | | | | | | | | | | | | | bug:10731828 Change-Id: I251593bcbfc8547d1bc445a56f3cd7fd3dd4acf3
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0355-152/+207
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-10-0255-152/+207
| | | | | | | | | | | | | | | | | | | | Change-Id: Ib171940890f7da47381b6f33a9dddc893cfe60d5 Auto-generated-cl: translation import
* | | | am c60e2b09: Merge "Increase char limit for camera timer sound message." ↵Sascha Haeberling2013-10-021-1/+1
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | into gb-ub-photos-carlsbad * commit 'c60e2b096886e36580c6ecfedd037dcf21130ed3': Increase char limit for camera timer sound message.
| * | Merge "Increase char limit for camera timer sound message." into ↵Sascha Haeberling2013-10-021-1/+1
| |\ \ | | | | | | | | | | | | gb-ub-photos-carlsbad
| | * | Increase char limit for camera timer sound message.Sascha Haeberling2013-10-011-1/+1
| | |/ | | | | | | | | | | | | | | | Bug: 10962439 Change-Id: Ib08734a059082dd6a20a7ded67bc3495500c598e
* | | am 72a83bc2: Merge "Add content description to post-capture thumbnail." into ↵Sascha Haeberling2013-10-013-2/+7
|\| | | | | | | | | | | | | | | | | | | | gb-ub-photos-carlsbad * commit '72a83bc295dfa5c0d07102065f50930bf18e28e2': Add content description to post-capture thumbnail.
| * | Add content description to post-capture thumbnail.Sascha Haeberling2013-10-013-2/+7
| |/ | | | | | | | | | | Bug: 10916138 Change-Id: I6fc5316cf622da8ba7bfcff5c6b43104d50c6652
* | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-10-0155-13972/+14025
|\ \
| * | Import translations. DO NOT MERGEBaligh Uddin2013-09-3055-13972/+14025
| | | | | | | | | | | | | | | Change-Id: I250289ddbb5e5e2a3062ee895b4ebfaf6004db8f Auto-generated-cl: translation import
* | | am 4d21fc2e: Merge "Show status bar in filmstrip mode" into ↵Sascha Haeberling2013-09-301-1/+1
|\ \ \ | |/ / |/| / | |/ | | | | | | gb-ub-photos-carlsbad * commit '4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427': Show status bar in filmstrip mode
| * Show status bar in filmstrip modeSascha Haeberling2013-09-301-1/+1
| | | | | | | | | | | | | | | | | | Bug: 11005642 Also makes sure we only call setSystemUiVisibility in only one place. Change-Id: I6e4709c63c25a4e69219ec7518dc284cef303aaa
* | am 67685a78: Add HQ icon indicator support.Sascha Haeberling2013-09-261-0/+0
|\| | | | | | | | | * commit '67685a78a29a0311043f38f8766a1fbbf881a599': Add HQ icon indicator support.
| * Add HQ icon indicator support.Sascha Haeberling2013-09-261-0/+0
| | | | | | | | | | | | Bug: 10785988 Change-Id: If844caaedc3468dce8153cb434bd89328a4a92ca
* | am 22236064: Merge "Use Camcorder label and icon for video camera activity." ↵Mangesh Ghiware2013-09-263-0/+2
|\| | | | | | | | | | | | | into gb-ub-photos-carlsbad * commit '22236064c8ec28196c07e847d4acb06e214deda8': Use Camcorder label and icon for video camera activity.
| * Merge "Use Camcorder label and icon for video camera activity." into ↵Mangesh Ghiware2013-09-263-0/+2
| |\ | | | | | | | | | gb-ub-photos-carlsbad
| | * Use Camcorder label and icon for video camera activity.Mangesh Ghiware2013-09-253-0/+2
| | | | | | | | | | | | | | | Bug: 10932790 Change-Id: If8847e06049e63116381904382db7dfcebb55010
| * | Import translations. DO NOT MERGEBaligh Uddin2013-09-2547-58/+152
| |/ | | | | | | | | Change-Id: I9fbfdbc9853215d57f6de75e33da059cd9cc4f43 Auto-generated-cl: translation import
* | Import translations. DO NOT MERGEBaligh Uddin2013-09-2555-58/+168
| | | | | | | | | | Change-Id: I760c80468210f750e4d614d7e4099680e032963a Auto-generated-cl: translation import
* | am 98f38bb0: Add HQ option and use it to switch to GCam.Sascha Haeberling2013-09-257-0/+33
|\| | | | | | | | | * commit '98f38bb04daa3db49a072718cd8b5005b8b73af1': Add HQ option and use it to switch to GCam.
| * Add HQ option and use it to switch to GCam.Sascha Haeberling2013-09-247-0/+33
| | | | | | | | | | | | | | Bug: 10430748 Bug: 10785988 Change-Id: If824d1d1876d8434958b2a5bc97d2852da118a8b
* | am e0bf566d: Merge "Removed unused assets from Camera2 Bug: 10493013 ↵Kevin Gabayan2013-09-24175-0/+0
|\| | | | | | | | | | | | | Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad * commit 'e0bf566d4ab2c45e05635397bdfd6c9f9a92a356': Removed unused assets from Camera2 Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
| * Merge "Removed unused assets from Camera2 Bug: 10493013 Change-Id: ↵Kevin Gabayan2013-09-25175-0/+0
| |\ | | | | | | | | | Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399" into gb-ub-photos-carlsbad
| | * Removed unused assets from Camera2Kevin Gabayan2013-09-24175-0/+0
| | | | | | | | | | | | | | | Bug: 10493013 Change-Id: Id07878cbe1a89e0aaeb70942e0f4ca39cd4a3399
| * | Merge "Import translations. DO NOT MERGE" into gb-ub-photos-carlsbadBaligh Uddin2013-09-2447-17/+111
| |\ \
| | * | Import translations. DO NOT MERGEBaligh Uddin2013-09-2347-17/+111
| | |/ | | | | | | | | | | | | Change-Id: I6579c8050e160f317ced1f098af607a622c8a87c Auto-generated-cl: translation import
* | | Merge "Import translations. DO NOT MERGE" into klp-devBaligh Uddin2013-09-2455-20/+130
|\ \ \
| * | | Import translations. DO NOT MERGEBaligh Uddin2013-09-2355-20/+130
| | | | | | | | | | | | | | | | | | | | Change-Id: I69db8d31a7314f67babd49ec59d5c0fb5fb66516 Auto-generated-cl: translation import
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-27 14:09:09 +0000