Skip to content

GitLab

Switch branch/tag
  1. 04 Nov, 2012 1 commit
  3. 31 Oct, 2012 1 commit
  5. 30 Oct, 2012 1 commit
  7. 26 Oct, 2012 2 commits
  9. 25 Oct, 2012 2 commits
    • Ruben Brunk's avatar
      Fixed crop intent. · 5aa454b3
      Ruben Brunk authored 
      Bug: 7415140
Bug: 7403813
Change-Id: I545162544f845d210d21185cddaca09b219fb091
      5aa454b3
    • nicolasroard's avatar
      Remove the old photo editor · 50116ffb
      nicolasroard authored 
      bug:7407573
Change-Id: Ifac6d3d7cec02c9cb8ef8bbd390f0512e6cdb66c
(cherry picked from commit a96c8e9c9aac509ba074b340c66e31e20ec05823)
      50116ffb
  11. 22 Oct, 2012 1 commit
  13. 19 Oct, 2012 1 commit
    • Scott Main's avatar
      DO NOT MERGE · 9baf2fd5
      Scott Main authored 
      cherrypick from Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8
remove old fashioned Dream, no longer supported

Change-Id: I51c6a730e8663586153750a1cda6ea65aad592e8

Conflicts:

	AndroidManifest.xml
      9baf2fd5
  15. 18 Oct, 2012 2 commits
  17. 17 Oct, 2012 2 commits
  19. 16 Oct, 2012 1 commit
  21. 11 Oct, 2012 1 commit
  23. 10 Oct, 2012 1 commit
  25. 09 Oct, 2012 1 commit
  27. 08 Oct, 2012 1 commit
  29. 03 Oct, 2012 1 commit
  31. 29 Sep, 2012 1 commit
  33. 28 Sep, 2012 1 commit
    • nicolasroard's avatar
      Use an actionbar · 9594c8d3
      nicolasroard authored 
      - move the "show original" button to the bottom left
- move the history button to the overflow menu for now
- add a reset item in the overflow menu.

bug:7234317
bug:7233975
bug:7233986
Change-Id: Icc1d03d1e1ce18f38b1169b466be62645424bc7e
      9594c8d3
  35. 27 Sep, 2012 1 commit
  37. 26 Sep, 2012 2 commits
  39. 25 Sep, 2012 2 commits
  41. 18 Sep, 2012 1 commit
    • Wu-cheng Li's avatar
      Use a different task affinity for secure camera. · 2e346284
      Wu-cheng Li authored 
      This makes sure non-secure camera activity is not started in
secure lock screen. Also add excludeFromRecents for secure
camera.

bug:7148152
Change-Id: I18a10ccf95f22563aad59d5d936470af47596b91
      2e346284
  43. 17 Sep, 2012 2 commits
  45. 14 Sep, 2012 3 commits
  47. 11 Sep, 2012 2 commits
    • Teng-Hui Zhu's avatar
      Add the UI elements for video trim activity. · 3f1f1baf
      Teng-Hui Zhu authored 
      1. Refactored the classes to support both the video play and trim.

Now the common code for controller overlay is in CommonControllerOverlay,
which is basically the same as the original MovieControllerOverlay without
animation. Because in trimming, we don't want to hide all the controller.
The specific animations are implemented in the sub-classes which are
TrimControllerOverlay and MovieControllerOverlay.

At the same time, TrimTimeBar extended TimeBar to support the extra
trimming start scrubber and end scrubber.

The interface between the timebar and the controllerOverlay are kept almost
the same way, except adding the trimming info when necessary.

With all these, the activity of TrimVideo now relied on the TrimTimeBar
and TrimControllerOverlay. Similarily, the MovieActivity relied on the TimeBar
and MovieControllerOverlay.

2. Hook the TrimVideo activity with the trim menu.

Note that the icons are temporary for now, still need UX input on that.

bug:7093055

Change-Id: Ib9bfbc090106744a569fce4c451ddffc0a2c699b
      3f1f1baf
    • Wu-cheng Li's avatar
      Add attribution of icons. · 3d9a8e20
      Wu-cheng Li authored 
      Change-Id: I5c7a5580ec4bd6313a3f536f0b9e3927d8ab624e
      3d9a8e20
  49. 10 Sep, 2012 1 commit
    • Michael Kolb's avatar
      Enable new camera UI · a1f4258a
      Michael Kolb authored 
        Bug: 7139361

Leave both icons in launcher for comparisons

Change-Id: I9ecf0af5f27f5fc3e8be092a54188238d51b281e
      a1f4258a
  51. 26 Aug, 2012 1 commit
  53. 24 Aug, 2012 1 commit
  55. 22 Aug, 2012 1 commit
  57. 14 Aug, 2012 1 commit
  59. 08 Aug, 2012 1 commit