Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
tag: android-4.0.4_…

Feb 18, 2012

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored February 17, 2012

Feb 17, 2012

  1. Fix the share popup. DO NOT MERGE

    Fix the share popup to comply with the new design:
    1. Black background.
    2. Image is centered.
    3. Share popup won't rotate automatically.
    
    bug:6031042
    Change-Id: I86b15a19bc8f7598d444cd9032960ea02e251668
    authored February 18, 2012

Feb 14, 2012

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored February 14, 2012

Feb 09, 2012

  1. Import translations. DO NOT MERGE

    Change-Id: I0719643bd6d66a3990dbfd2b6eb9e2fc64ab307e
    authored February 08, 2012

Jan 21, 2012

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored January 20, 2012

Jan 20, 2012

  1. Merge "Do not allow switching to other activities during panorama cap…

    …ture. (do not merge)" into ics-mr1
    authored January 20, 2012 Android (Google) Code Review committed January 20, 2012
  2. Do not allow switching to other activities during panorama capture. (…

    …do not merge)
    
    bug:5541182
    Change-Id: I1cdbba9a8aec3b5c832f6e58baa26ff6312cf59a
    authored January 20, 2012

Jan 12, 2012

  1. Allow saving panorama after the activity is paused. (do not merge)

    bug: 5541182
    Change-Id: I42237d8dd4f8c39ddc2041ae32b886328a9c45c0
    authored January 05, 2012 Wu-cheng Li committed January 12, 2012

Jan 07, 2012

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored January 06, 2012

Jan 06, 2012

  1. Use default volume control stream instead of the music stream.

    Since the Camera API is moving back to using the system audio stream,
    do not override the camera app volume control stream any more.
    
    Bug: 5778365
    Change-Id: I27a6a1769d39cb0b246bce7d721d846f6c1430d1
    authored January 05, 2012

Dec 07, 2011

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored December 06, 2011

Dec 06, 2011

  1. Merge "Import revised translations. DO NOT MERGE" into ics-mr1

    authored December 06, 2011 Android (Google) Code Review committed December 06, 2011
  2. Import revised translations. DO NOT MERGE

    Change-Id: If70739b6fc62ac7acf009355dc4cd5b9fabe8218
    authored December 06, 2011
  3. Fix crash after restoring defaults.

    After restoring defaults in camcorder mode, the indicator
    control calls onSharedPreferenceChanged if record location
    is on. onSharedPreferenceChanged is also called in the end
    of restorePreferences.
    
    With two onSharedPreferenceChanged calls in a row, the first
    call notices effects have been disabled, and begins the
    effect pipeline teardown in the background thread. Normally,
    this would conclude in a few hundred milliseconds, and would
    then restart regular preview.
    
    However, with the second call to onSharedPreferenceChanged
    coming in right after the first, the method no longer sees
    an effect transition in progress (since current and new
    effect are equal to none now), and thus just ends up
    restarting preview. That attempt at restart runs into the
    crash because the main SurfaceView has not yet been released
    by the background effects thread.
    
    To fix this, InLineSettingSwitch should not invoke the
    listener when updating UI.
    
    bug:5679133
    
    Change-Id: I06aca382105455585b633dc63f014a8f71ccadbe
    authored December 06, 2011

Nov 30, 2011

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored November 30, 2011

Nov 29, 2011

  1. Import revised translations. DO NOT MERGE

    Change-Id: I3dc168e6ebcec5b133ca21dc8175d959798927b9
    authored November 29, 2011
  2. merge in ics-mr1-release history after reset to ics-mr1

    authored November 29, 2011

Nov 28, 2011

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored November 28, 2011
  2. Fix NPE if the camera cannot be connected.

    bug:5673972
    Change-Id: I85587bd982e0af5dd7c3630958e105571d8e12d9
    authored November 28, 2011

Nov 22, 2011

  1. merge in ics-mr1-release history after reset to ics-mr1

    authored November 22, 2011
  2. Dismiss open menu if exists.

    bug:5648754
    Change-Id: I44be2226e65de76e6240adc7b554e0ee7cda2226
    authored November 22, 2011
  3. Merge "Update camera sound API." into ics-mr1

    authored November 21, 2011 Android (Google) Code Review committed November 21, 2011

Nov 21, 2011

  1. Merge "Import revised translations. DO NOT MERGE" into ics-mr1

    authored November 21, 2011 Android (Google) Code Review committed November 21, 2011
  2. Import revised translations. DO NOT MERGE

    Change-Id: Ie3dd7e4f5b1adfd9fb7f5959ebc20416d8a13946
    authored November 21, 2011
  3. Fix share popup is not aligned with viewfinder.

    bug:5641001
    Change-Id: I0d77a93a9c0ef5b7b661abf36028eb559981dc67
    authored November 21, 2011

Nov 18, 2011

  1. Update camera sound API.

    bug:5640219
    Change-Id: Ic3af6527f3025ec04ba4be16b621b462f89953f1
    authored November 18, 2011
  2. Merge "Fix NPE in panorama when camera failed to connect." into ics-mr1

    authored November 18, 2011 Android (Google) Code Review committed November 18, 2011
  3. Fix NPE in panorama when camera failed to connect.

    bug:5637587
    Change-Id: Iea275b4e3780a41f4a0c3fe0845acbfdb1e95cd1
    authored November 18, 2011
  4. Merge "Fix OpenGL processing when activity is not active." into ics-mr1

    authored November 17, 2011 Android (Google) Code Review committed November 17, 2011
  5. Fix OpenGL processing when activity is not active.

    bug:5624690
    Change-Id: I87af684e165a275adb4b765a86a2df2b62137ca0
    authored November 17, 2011

Nov 17, 2011

  1. Merge "Rotate priority indicators according to the device orientation…

    …." into ics-mr1
    authored November 17, 2011 Android (Google) Code Review committed November 17, 2011
  2. merge in ics-mr1-release history after reset to ics-mr1

    authored November 17, 2011
  3. Rotate priority indicators according to the device orientation.

    + Do not show flash indicator if it is off.
    
    bug:5039279
    
    Change-Id: I329b63d04f46fbe23f5ade3e4cacf446ce41f98c
    authored November 16, 2011

Nov 16, 2011

  1. Merge "Fix EffectsRecorder error path handling when ending recording.…

    …" into ics-mr1
    authored November 16, 2011 Android (Google) Code Review committed November 16, 2011
  2. Fix EffectsRecorder error path handling when ending recording.

    Previously, if mRunner had already been set to null, errors sent by
    mediarecorder would not be propagated to VideoCamera correctly.  This
    resulted in crashes when putting device to sleep right after starting
    timelapse recording with effects.
    
    Bug: 5627242
    Change-Id: I3ae3c713a0aaf9a4507442bbbcd3ec89971d5f95
    authored November 16, 2011
Something went wrong with that request. Please try again.