summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Add possibility for UX improvement measurements" into gb-ub-photos-bryceBobby Georgescu2013-03-073-1/+22
|\
| * Add possibility for UX improvement measurementsBobby Georgescu2013-02-253-1/+22
| | | | | | | | | | Bug: 4293199 Change-Id: I45f8a63c676c8d7700c422a0a18f799fb6d02d2e
* | Merge "Add convertRGBAtoA." into gb-ub-photos-bryceTim Murray2013-03-072-0/+42
|\ \
| * | Add convertRGBAtoA.Tim Murray2013-03-072-0/+42
| | | | | | | | | | | | Change-Id: I358bc0517480883c470df51189f46fb238fde101
* | | Merge "Album set shim" into gb-ub-photos-bryceBobby Georgescu2013-03-073-28/+126
|\ \ \
| * | | Album set shimBobby Georgescu2013-03-073-28/+126
| | | | | | | | | | | | | | | | Change-Id: I12257ea09b7b5bc4b1d5ef638e685c66df86538a
* | | | Merge "Add batch operations to PhotoProvider" into gb-ub-photos-bryceGeorge Mount2013-03-073-84/+320
|\ \ \ \ | |/ / / |/| | |
| * | | Add batch operations to PhotoProviderGeorge Mount2013-03-073-84/+320
| | | | | | | | | | | | | | | | Change-Id: I36b2f0305e2ef7502df7b896c8baedc86519ac52
* | | | recycle bitmapsJohn Reck2013-03-071-1/+5
|/ / / | | | | | | | | | Change-Id: I3afda4f009fda07b4e2858cb65dee4444f8484e5
* | | Remove redundant Album NAME (replaced by TITLE)Mangesh Ghiware2013-03-072-5/+2
| | | | | | | | | | | | Change-Id: I0482f8b4bd85e07aefe4af02b1e8dab4702eb9f6
* | | Merge "Add inserts to PhotoProvider." into gb-ub-photos-bryceGeorge Mount2013-03-071-17/+38
|\ \ \
| * | | Add inserts to PhotoProvider.George Mount2013-03-071-17/+38
| | | | | | | | | | | | | | | | Change-Id: Ie91df59975d185948c7c2fd96432d311847c3e00
* | | | Merge "Add album cover art downloading." into gb-ub-photos-bryceGeorge Mount2013-03-071-5/+20
|\| | |
| * | | Add album cover art downloading.George Mount2013-03-071-5/+20
| |/ / | | | | | | | | | Change-Id: I660761c3bf59b1b314be9674fc3f1e43f307c686
* | | Merge "Data provider shim" into gb-ub-photos-bryceJohn Reck2013-03-076-38/+378
|\ \ \ | |/ / |/| |
| * | Data provider shimJohn Reck2013-03-066-38/+378
| | | | | | | | | | | | | | | | | | | | | Bolt the new UI framework on top of the old data model temporarily to unblock UI work Change-Id: I2f61f70647faca1f6a95b1f02f719ec4277fa5fb
* | | Merge "Add required fields to PhotoProvider." into gb-ub-photos-bryceGeorge Mount2013-03-072-64/+150
|\ \ \
| * | | Add required fields to PhotoProvider.George Mount2013-03-062-64/+150
| |/ / | | | | | | | | | Change-Id: I1e830702412d4431ba3b01fe4945a4818385b6cd
* | | Merge "Preliminary AlbumSet UI" into gb-ub-photos-bryceBobby Georgescu2013-03-063-2/+144
|\ \ \
| * | | Preliminary AlbumSet UIBobby Georgescu2013-03-053-2/+144
| | | | | | | | | | | | | | | | Change-Id: Ie99bd2939bfcb47c80605cbb22b84b1064098e91
* | | | Fix camera switcher mode pickerDoris Liu2013-03-061-4/+8
| | | | | | | | | | | | | | | | | | | | Bug: 8330008 Change-Id: I08ccd38a6898e88d28214cceb22cee6688ce0b3f
* | | | Merge "fix undo bug" into gb-ub-photos-bryceJohn Hoford2013-03-061-0/+1
|\ \ \ \
| * | | | fix undo bugJohn Hoford2013-03-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | bug:8319433 Change-Id: If6bea005677b63267130d446e7b0298d21bbb3be
* | | | | Fix NPE in switcher popupDoris Liu2013-03-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 8327966 Change-Id: I4181a59871c065435756c100b3e8b43930781ee5
* | | | | Merge "Add a black bar symmetric to nav bar" into gb-ub-photos-bryceDoris Liu2013-03-062-21/+27
|\ \ \ \ \
| * | | | | Add a black bar symmetric to nav barDoris Liu2013-03-052-21/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fix bug: 8323926 Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4
* | | | | | Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryceDoris Liu2013-03-065-28/+99
|\| | | | | | |_|/ / / |/| | | |
| * | | | Keep camera controls on the same physical sideDoris Liu2013-03-055-28/+99
| | | | | | | | | | | | | | | | | | | | Change-Id: I09c50650c77a89fadfeb376564ef43e750994f8a
* | | | | Improves visual historynicolasroard2013-03-051-2/+12
| |/ / / |/| | | | | | | | | | | Change-Id: Ie43e99777d590a504b068d81f327119cca03b9d9
* | | | Visual Historynicolasroard2013-03-055-24/+59
|/ / / | | | | | | | | | Change-Id: I3397c44b8c47985c97de5b82456c03469b2fb8db
* | | Merge "Simplify and speed up thumbnail creation" into gb-ub-photos-brycenicolasroard2013-03-053-5/+63
|\ \ \
| * | | Simplify and speed up thumbnail creationnicolasroard2013-03-043-5/+63
| | | | | | | | | | | | | | | | Change-Id: I1423573c600a807081f81d3cb3036b690e426f9e
* | | | fixed vignetnette refresh during pan/zoomJohn Hoford2013-03-041-0/+10
| | | | | | | | | | | | | | | | Change-Id: I6bcc13cdd5232a15f199d8f64258c450f045c1cf
* | | | fix tiny planet shown after rotationJohn Hoford2013-03-041-0/+9
|/ / / | | | | | | | | | Change-Id: Ia27f424c7936b8f3c7fb69d3b80966d4f364f116
* / / Improves state/history panel behaviournicolasroard2013-03-041-14/+30
|/ / | | | | | | Change-Id: Icfd071aa5de11f1fe8cbba34f2837d5a850f9a68
* | Merge "Fix build break." into gb-ub-photos-bryceGeorge Mount2013-03-051-3/+0
|\ \
| * | Fix build break.George Mount2013-03-041-3/+0
| | | | | | | | | | | | Change-Id: If19356395fe005a98036888cd9a688c4d36720ea
* | | Merge "UI cleanup" into gb-ub-photos-brycenicolasroard2013-03-054-15/+27
|\ \ \
| * | | UI cleanupnicolasroard2013-03-044-15/+27
| | | | | | | | | | | | | | | | Change-Id: Iaf138455651511e610b640a716820bd846284948
* | | | Merge "Update PhotoProvider and tests to allow tests to run against ↵George Mount2013-03-043-49/+100
|\ \ \ \ | |/ / / |/| / / | |/ / GalleryGoogle.apk" into gb-ub-photos-bryce
| * | Update PhotoProvider and tests to allow tests to run against GalleryGoogle.apkGeorge Mount2013-03-043-49/+100
| | | | | | | | | | | | Change-Id: I6630e7a5ba0883b887915f63094885a2dc9f025c
* | | Merge "Clean up comments" into gb-ub-photos-bryceBobby Georgescu2013-03-041-8/+0
|\ \ \
| * | | Clean up commentsBobby Georgescu2013-03-041-8/+0
| | | | | | | | | | | | | | | | Change-Id: I29e6d7ffef6b6b319262982709794aadd7919d8c
* | | | Merge "Flatten view hierarchy and rotate views" into gb-ub-photos-bryceDoris Liu2013-03-049-205/+285
|\ \ \ \ | |/ / / |/| | |
| * | | Flatten view hierarchy and rotate viewsDoris Liu2013-03-049-205/+285
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TODO: SRI pano and Lightcycle can use a bit more flattening. I will get to them next. (Maybe in a different CL.) TODO: Need to cancel capture animation in onConfigurationChanged() Change-Id: I00fd3e098117d9fb74fde2c128407ab6275bcedf
* | | | Merge "Refactor AutoThumbnailDrawable, fix race conditions" into ↵Bobby Georgescu2013-03-024-54/+208
|\ \ \ \ | |_|/ / |/| | | | | | | gb-ub-photos-bryce
| * | | Refactor AutoThumbnailDrawable, fix race conditionsBobby Georgescu2013-03-024-54/+208
| | | | | | | | | | | | | | | | Change-Id: I80243ee177387e0d9b309acb5a7c1d364cc73530
* | | | Fix preview rendering speed...nicolasroard2013-03-012-1/+4
| | | | | | | | | | | | | | | | Change-Id: I6a6ba3c14a91d60446f28f5dce52fd3c4bc49f79
* | | | Fix disappearing border thumbnailsnicolasroard2013-03-011-1/+1
| | | | | | | | | | | | | | | | Change-Id: I9ed43646a353658a590354f13e51dc96fa760442
* | | | Improves State panel and Refactor FilterShowActivitynicolasroard2013-03-017-161/+360
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - handles multiple xml layout - add a portrait layout - improves the state panel (delete, etc.) Change-Id: I29762c99cdd467db8705174c660304c8ed673ce2