OSDN Git Service
Jason Sams [Wed, 19 Sep 2012 01:43:09 +0000 (18:43 -0700)]
Merge "Clean up and publish the YUV to RGB intrinsic." into jb-mr1-dev
Adam Powell [Wed, 19 Sep 2012 01:42:58 +0000 (18:42 -0700)]
Merge "Make invalidateOptionsMenu asynchronous" into jb-mr1-dev
Adam Powell [Wed, 19 Sep 2012 01:34:08 +0000 (18:34 -0700)]
Make invalidateOptionsMenu asynchronous
Process any pending menu invalidations on the animation tick, before
traversals are performed. Collapse multiple menu invalidations
together.
Bug
7189372
Change-Id: I7a33ae9813980eb8fbcc958804de2c03328ecca8
Jason Sams [Wed, 19 Sep 2012 01:23:15 +0000 (18:23 -0700)]
Clean up and publish the YUV to RGB intrinsic.
Change-Id: Iffb346a5d751f0bae123455869bda8db37d542ff
Dianne Hackborn [Wed, 19 Sep 2012 01:22:15 +0000 (18:22 -0700)]
Merge "Don't allow more than 3 actively running users at a time." into jb-mr1-dev
Dianne Hackborn [Tue, 18 Sep 2012 22:48:21 +0000 (15:48 -0700)]
Don't allow more than 3 actively running users at a time.
Change-Id: Ic047c62b518a0faaa7b507343909330044ec290b
Andy Stadler [Wed, 19 Sep 2012 00:51:09 +0000 (17:51 -0700)]
Merge "Move X509TrustManagerExtensions to correct directory" into jb-mr1-dev
Andy Stadler [Wed, 19 Sep 2012 00:40:14 +0000 (17:40 -0700)]
Move X509TrustManagerExtensions to correct directory
Also removed unused imports.
Original Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
Change-Id: I66886ee9792c23a1e421022fd1f675fdf35ea049
Mike Lockwood [Wed, 19 Sep 2012 00:12:37 +0000 (17:12 -0700)]
Merge "AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected" into jb-mr1-dev
Romain Guy [Wed, 19 Sep 2012 00:03:04 +0000 (17:03 -0700)]
Merge "mutate() didn't work as advertised Bug #
7162705" into jb-mr1-dev
Jim Miller [Wed, 19 Sep 2012 00:00:37 +0000 (17:00 -0700)]
Merge "Refactor Carrier text as a movable module." into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 23:56:11 +0000 (16:56 -0700)]
mutate() didn't work as advertised
Bug #
7162705
Change-Id: I15b2663fa7f1c71a2a3479134b8b7f37bfcbc607
Romain Guy [Tue, 18 Sep 2012 22:43:04 +0000 (15:43 -0700)]
Merge "Minimize state changes when updating layers" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 22:42:34 +0000 (15:42 -0700)]
Merge "Fix bug #
7173155 API REVIEW: android.view.View" into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 22:40:58 +0000 (15:40 -0700)]
Minimize state changes when updating layers
Change-Id: I407fcc80bd3178f9f09a3b379ceb7f7ce0749e08
Romain Guy [Tue, 18 Sep 2012 22:39:29 +0000 (15:39 -0700)]
Merge "Compute GradientDrawable's opacity correctly" into jb-mr1-dev
Romain Guy [Tue, 18 Sep 2012 22:37:24 +0000 (15:37 -0700)]
Compute GradientDrawable's opacity correctly
The current implementation of GradientDrawable always assumes the shape needs
to be blended. This causes all windows to be considered translucent by default.
This change recomputes the opacity as needed to ensure windows are marked
opaque when they should.
Change-Id: Iaf291d889a6c5122ab00c9f5781df3e7f61547fa
Geremy Condra [Tue, 18 Sep 2012 22:37:21 +0000 (15:37 -0700)]
Merge "Code cleanup for X509TrustManagerExtensionsTest.java" into jb-mr1-dev
Winson Chung [Tue, 18 Sep 2012 22:34:37 +0000 (15:34 -0700)]
Merge "Fixing crash in emulator due to no BluetoothAdapter. (Bug
7188166)" into jb-mr1-dev
Jim Miller [Tue, 18 Sep 2012 22:33:49 +0000 (15:33 -0700)]
Merge "Remove trailing period from missing SIM string" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 22:33:07 +0000 (15:33 -0700)]
Fix bug #
7173155 API REVIEW: android.view.View
- remove getFocusRect(Rect) as it was redundant
- fix Javadoc
Change-Id: I3784c4b0a38770cba5d3ba09196f9271050a3c20
Jim Miller [Tue, 18 Sep 2012 22:32:04 +0000 (15:32 -0700)]
Merge "Selectively enable back button in keyguard for security screens." into jb-mr1-dev
Irfan Sheriff [Tue, 18 Sep 2012 22:26:15 +0000 (15:26 -0700)]
Merge "send connection broadcast on client disconnect" into jb-mr1-dev
Irfan Sheriff [Tue, 18 Sep 2012 19:39:22 +0000 (12:39 -0700)]
send connection broadcast on client disconnect
Bug:
7188646
Change-Id: I69f2c2581004b08730407930fb056cc1fe54feec
Mike Lockwood [Tue, 18 Sep 2012 18:16:57 +0000 (11:16 -0700)]
AudioService: Send "becoming noisy" intent when USB accessory audio is disconnected
Bug:
7051259
Change-Id: I5b5fb3ad7c7e38dbf49700d893fd49354eaecf51
Signed-off-by: Mike Lockwood <lockwood@google.com>
Jeff Sharkey [Tue, 18 Sep 2012 21:52:46 +0000 (14:52 -0700)]
Merge "Multi-user MTP." into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 21:49:10 +0000 (14:49 -0700)]
Merge "Fix bug #
7172972 API REVIEW: android.graphics.drawable.Drawable" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 21:47:52 +0000 (14:47 -0700)]
Merge "Fix bug #
7173351 API REVIEW: android.util.LocaleUtil" into jb-mr1-dev
Adam Cohen [Tue, 18 Sep 2012 21:47:06 +0000 (14:47 -0700)]
Merge "Tweaking how settings adds keyguard widgets" into jb-mr1-dev
Winson Chung [Tue, 18 Sep 2012 20:11:37 +0000 (13:11 -0700)]
Fixing crash in emulator due to no BluetoothAdapter. (Bug
7188166)
Change-Id: I63fe4b229a8a460170df153e71b7ad65655dfad1
Fabrice Di Meglio [Tue, 18 Sep 2012 21:46:59 +0000 (14:46 -0700)]
Merge "Fix bug #
7172699" into jb-mr1-dev
Geremy Condra [Tue, 18 Sep 2012 21:41:39 +0000 (14:41 -0700)]
Code cleanup for X509TrustManagerExtensionsTest.java
Change-Id: I85584f7a9dbc726be811f783d125efcf70c9f6af
Adam Cohen [Tue, 18 Sep 2012 20:39:42 +0000 (13:39 -0700)]
Tweaking how settings adds keyguard widgets
-> Fix for issue
7173587
-> Fix for issue
7173877
Change-Id: I60cd3952113335df60292f67461d50f6c8bd2ed3
Jamie Gennis [Tue, 18 Sep 2012 21:32:00 +0000 (14:32 -0700)]
Merge "SurfaceTexture: remove call to doGLFenceWait" into jb-mr1-dev
Andy Stadler [Tue, 18 Sep 2012 21:20:30 +0000 (14:20 -0700)]
Merge "Move files to make eclipse-java happy" into jb-mr1-dev
Chet Haase [Tue, 18 Sep 2012 21:13:57 +0000 (14:13 -0700)]
Merge "Fix GL shader bugs" into jb-mr1-dev
Chet Haase [Tue, 18 Sep 2012 00:43:45 +0000 (17:43 -0700)]
Fix GL shader bugs
Fixing errors in emitted shader code that caused GL errors
at runtime
Change-Id: I267a84398a81329a6688b292505f8779bd750ad1
Andy Stadler [Tue, 18 Sep 2012 21:08:30 +0000 (14:08 -0700)]
Move files to make eclipse-java happy
No changes to text at all, just moving the java files to match their
declared packages.
There was no original bug# but this cleans up the code submitted in
the original Change-Id: I42307f58074157b33b6e01216aab10022340d449
Change-Id: I233fa7f21167a42565aadb7ad109600b1a1a5721
Geremy Condra [Tue, 18 Sep 2012 20:47:17 +0000 (13:47 -0700)]
Merge "Fix bad isinstance check in X509TrustManagerExtensions and add test." into jb-mr1-dev
Geremy Condra [Tue, 18 Sep 2012 20:35:29 +0000 (13:35 -0700)]
Fix bad isinstance check in X509TrustManagerExtensions and add test.
Change-Id: I333957186655b2543a637dafa8c51b0bba9d4dfb
Fabrice Di Meglio [Tue, 18 Sep 2012 20:38:53 +0000 (13:38 -0700)]
Fix bug #
7172972 API REVIEW: android.graphics.drawable.Drawable
- add @hide
Change-Id: I20dca8d7f6a58dfd1dd342135dcff912e08d4ab9
Christopher Tate [Tue, 18 Sep 2012 20:35:59 +0000 (13:35 -0700)]
Merge "Settings provider needs to send notifications as itself" into jb-mr1-dev
Daniel Sandler [Tue, 18 Sep 2012 20:33:20 +0000 (13:33 -0700)]
Merge "Remove settings and rotation buttons from notification panel." into jb-mr1-dev
Christopher Tate [Tue, 18 Sep 2012 20:27:36 +0000 (13:27 -0700)]
Settings provider needs to send notifications as itself
... and not as its ultimate caller, who may be a less-privileged
application. Fixes bug
7188309
Change-Id: Iffd37b8da84f683bf665bf3d48c0b7fbc8dd721d
Jeff Sharkey [Sun, 16 Sep 2012 19:49:00 +0000 (12:49 -0700)]
Multi-user MTP.
The current MTP kernel driver at /dev/mtp_usb is exclusive, meaning
only one process can have it open. In addition, each MTP session
with a desktop requires unique object IDs, which doesn't hold true
across users on the device.
To solve these two issues, when switching users we cycle the USB host
stack to disconnect both local and remote MTP connections, giving the
new user's media process a chance to claim /dev/mtp_usb, and causing
the desktop to initiate a new MTP session.
This change also allows BroadcastReceivers to registerReceiver()
allow retrieval of a current sticky broadcast. Adds a system property
to override maximum users. Removes MOUNTED broadcasts for secondary
users. Allows INTERACT_ACROSS_USERS to getCurrentUser().
Bug:
6925114
Change-Id: I02b4a1b535af95fb2142655887b6d15a8068d18a
Jason Sams [Tue, 18 Sep 2012 20:24:55 +0000 (13:24 -0700)]
Merge "Add Kernel, Method, and field IDs bug
7182873" into jb-mr1-dev
Fabrice Di Meglio [Tue, 18 Sep 2012 19:55:32 +0000 (12:55 -0700)]
Fix bug #
7173351 API REVIEW: android.util.LocaleUtil
Change-Id: I08fd491eff714059e9ec874fadebe7eb556c34d5
Jason Sams [Tue, 18 Sep 2012 19:32:10 +0000 (12:32 -0700)]
Add Kernel, Method, and field IDs
bug
7182873
Change-Id: I066a359bb04027e9376dac088560f042c496b10e
Irfan Sheriff [Tue, 18 Sep 2012 19:22:06 +0000 (12:22 -0700)]
Merge "WFD fixes" into jb-mr1-dev
Irfan Sheriff [Tue, 18 Sep 2012 19:05:31 +0000 (12:05 -0700)]
WFD fixes
- Specificy max GO intent for WFD
- Increase GO idle time out to 20s and use it for GO and client
- Fix connection broadcast
Change-Id: Ia0e28bc9eb3e23d2830a6c814c5a537ca0bcd5db
Fabrice Di Meglio [Tue, 18 Sep 2012 19:06:13 +0000 (12:06 -0700)]
Fix bug #
7172699
- remove @link as we are already using a @see which is doing a link by itself
Change-Id: I6ff6979bb2d960c3c980cdf0a88885b92e80fd7f
Geremy Condra [Tue, 18 Sep 2012 18:39:13 +0000 (11:39 -0700)]
Merge "Initial commit for X509TrustManagerExtensions." into jb-mr1-dev
Geremy Condra [Sat, 15 Sep 2012 01:11:29 +0000 (18:11 -0700)]
Initial commit for X509TrustManagerExtensions.
This provides a mechanism for exposing the bells
and whistles we've attached to trust managers to
third parties.
Change-Id: If117ffd2240a7bf3437115f3cf2f766c4e249600
Mike Lockwood [Tue, 18 Sep 2012 18:01:32 +0000 (11:01 -0700)]
am
ad23333f: am
945080b5: am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
ad23333f728471a7f2c49cd1c9575f1cea2503f6':
MtpData bmp format file can't recognize when copy bmp into DUT
Mike Lockwood [Tue, 18 Sep 2012 17:59:27 +0000 (10:59 -0700)]
am
945080b5: am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
945080b5b61e28bfc05c75ba5b2030d1e43d0f19':
MtpData bmp format file can't recognize when copy bmp into DUT
Scott Main [Tue, 18 Sep 2012 17:57:39 +0000 (10:57 -0700)]
am
a59b1dac: am
edf0ba6e: am
44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
* commit '
a59b1dacd7e7c7494692c79c31b22243e45a0ec4':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:57:35 +0000 (10:57 -0700)]
am
3ce6b008: am
d67459ff: new Google Play badges and some updates to corresponding pages
* commit '
3ce6b0085a20cbc6b8759f9e42649955fcdeebb9':
new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:57:31 +0000 (10:57 -0700)]
am
fe7e473d: am
b574a264: am
b86b7f07: small update to the ADT installation steps based on new ADT UI
* commit '
fe7e473d0579c20e22fd86876d92c680d5dbedf7':
small update to the ADT installation steps based on new ADT UI
Katie McCormick [Tue, 18 Sep 2012 17:57:27 +0000 (10:57 -0700)]
am
04afdd68: am
ad4bbdf2: am
844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '
04afdd68f338ae925cec79d131ca9beff98c9cb6':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Scott Main [Tue, 18 Sep 2012 17:57:24 +0000 (10:57 -0700)]
am
6c47d0a9: am
ada4f081: am
61d85c43: add link to device dock lesson
* commit '
6c47d0a9ff3a7a2b2a64e87bb37949e214b5411b':
add link to device dock lesson
Dirk Dougherty [Tue, 18 Sep 2012 17:57:20 +0000 (10:57 -0700)]
am
880051db: am
2dec9928: am
24a024ec: Doc change: fix typo in JB highlights.
* commit '
880051db778a635839fc7d491d0ae96f9c662bd1':
Doc change: fix typo in JB highlights.
Scott Main [Tue, 18 Sep 2012 17:57:17 +0000 (10:57 -0700)]
am
08ec998b: am
a1981bc1: am
d5abc558: docs: update for multi apk doc for ABI support
* commit '
08ec998bb35bf63eb5af289078556d5fb9969160':
docs: update for multi apk doc for ABI support
Katie McCormick [Tue, 18 Sep 2012 17:57:13 +0000 (10:57 -0700)]
am
0a94b84d: am
917d45e3: am
73ec048e: Doc update: Appwidgets JB additions.
* commit '
0a94b84def26b25cee823bf3914f6b3713622665':
Doc update: Appwidgets JB additions.
Scott Main [Tue, 18 Sep 2012 17:57:10 +0000 (10:57 -0700)]
Joe Fernandez [Tue, 18 Sep 2012 17:57:07 +0000 (10:57 -0700)]
am
77ae2e6f: am
b9b05dfc: am
8982939d: docs: Accessibility DevGuide, Jelly Bean edition
* commit '
77ae2e6f27664f05e4adba18756111a698dea9f6':
docs: Accessibility DevGuide, Jelly Bean edition
Scott Main [Tue, 18 Sep 2012 17:57:04 +0000 (10:57 -0700)]
am
db6313ce: am
0cc7398a: am
d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
* commit '
db6313ceba2fd35efc97e9bcd4bdfc25d10093f4':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
Katie McCormick [Tue, 18 Sep 2012 17:57:00 +0000 (10:57 -0700)]
am
f5c717a9: am
2141c068: am
243170f7: Doc update: Fix typo.
* commit '
f5c717a96ce3efb4a451433dd85af80283f56934':
Doc update: Fix typo.
Scott Main [Tue, 18 Sep 2012 17:56:54 +0000 (10:56 -0700)]
am
5c97d966: am
9ae01846: fix broken link for action bar pack
* commit '
5c97d966cc0e555bbf0abf4a6517d8d2c3934c72':
fix broken link for action bar pack
Mike Lockwood [Tue, 18 Sep 2012 17:53:11 +0000 (10:53 -0700)]
am
1e86994c: Merge "MtpData bmp format file can\'t recognize when copy bmp into DUT"
* commit '
1e86994cd0e13f9084d3f4bd0060b9e34c935490':
MtpData bmp format file can't recognize when copy bmp into DUT
Fabrice Di Meglio [Tue, 18 Sep 2012 17:47:06 +0000 (10:47 -0700)]
Merge "Fix bug #
7112174 ActionMenuView should be aware of layout direction" into jb-mr1-dev
Scott Main [Tue, 18 Sep 2012 17:45:23 +0000 (10:45 -0700)]
am
edf0ba6e: am
44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
* commit '
edf0ba6e1b6de8f43880267862e43ee461901c25':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:45:19 +0000 (10:45 -0700)]
am
d67459ff: new Google Play badges and some updates to corresponding pages
* commit '
d67459ff191aaee34d5459960ef8e1fed82f59d5':
new Google Play badges and some updates to corresponding pages
Scott Main [Tue, 18 Sep 2012 17:45:15 +0000 (10:45 -0700)]
am
b574a264: am
b86b7f07: small update to the ADT installation steps based on new ADT UI
* commit '
b574a264e687385a236a42d3c95d00825845c820':
small update to the ADT installation steps based on new ADT UI
Katie McCormick [Tue, 18 Sep 2012 17:45:11 +0000 (10:45 -0700)]
am
ad4bbdf2: am
844d2a94: Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
* commit '
ad4bbdf22cc63489b541b9b8f82073e851836780':
Doc update: ACTION_APPWIDGET_OPTIONS_CHANGED link
Scott Main [Tue, 18 Sep 2012 17:45:07 +0000 (10:45 -0700)]
am
ada4f081: am
61d85c43: add link to device dock lesson
* commit '
ada4f081c641b09f7e3a3c214db868f24df957e9':
add link to device dock lesson
Dirk Dougherty [Tue, 18 Sep 2012 17:45:04 +0000 (10:45 -0700)]
am
2dec9928: am
24a024ec: Doc change: fix typo in JB highlights.
* commit '
2dec992884db8ca54ee814b4c7967c358dcd8212':
Doc change: fix typo in JB highlights.
Scott Main [Tue, 18 Sep 2012 17:45:00 +0000 (10:45 -0700)]
am
a1981bc1: am
d5abc558: docs: update for multi apk doc for ABI support
* commit '
a1981bc1ab96cd6e1c7dcb66225a5890e6a04805':
docs: update for multi apk doc for ABI support
Katie McCormick [Tue, 18 Sep 2012 17:44:57 +0000 (10:44 -0700)]
am
917d45e3: am
73ec048e: Doc update: Appwidgets JB additions.
* commit '
917d45e3d1a2d405aa0996889c40554b4a508fe1':
Doc update: Appwidgets JB additions.
Scott Main [Tue, 18 Sep 2012 17:44:53 +0000 (10:44 -0700)]
Joe Fernandez [Tue, 18 Sep 2012 17:44:50 +0000 (10:44 -0700)]
am
b9b05dfc: am
8982939d: docs: Accessibility DevGuide, Jelly Bean edition
* commit '
b9b05dfcc1deba0e5daefe13231327432cdb6cc3':
docs: Accessibility DevGuide, Jelly Bean edition
Scott Main [Tue, 18 Sep 2012 17:44:46 +0000 (10:44 -0700)]
am
0cc7398a: am
d46023d2: (-s ours) dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
* commit '
0cc7398ab9196cf3ae8075f8e7bd055a900ebb2e':
dashboard update for 9/4 switch to simplified pie charts: codenames for platforms and separate size and density charts
Katie McCormick [Tue, 18 Sep 2012 17:44:42 +0000 (10:44 -0700)]
am
2141c068: am
243170f7: Doc update: Fix typo.
* commit '
2141c06849cb5b2f5bea06a79de66b7de4112ac9':
Doc update: Fix typo.
Scott Main [Tue, 18 Sep 2012 17:44:32 +0000 (10:44 -0700)]
am
9ae01846: fix broken link for action bar pack
* commit '
9ae018462a5fa44e3e1d4837942b5fd880531124':
fix broken link for action bar pack
Mike Lockwood [Tue, 18 Sep 2012 17:25:41 +0000 (10:25 -0700)]
Merge "MtpData bmp format file can't recognize when copy bmp into DUT"
Adam Powell [Tue, 18 Sep 2012 17:24:59 +0000 (10:24 -0700)]
Merge "Use a larger scaling span for larger screen devices." into jb-mr1-dev
Adam Powell [Tue, 18 Sep 2012 17:23:43 +0000 (10:23 -0700)]
Use a larger scaling span for larger screen devices.
Change-Id: I67486e65799c076fc9ac150f67a6be715c2ed4d0
Jean-Baptiste Queru [Tue, 18 Sep 2012 17:07:09 +0000 (10:07 -0700)]
am
7f5de016: Skip
f5cbd762 - it\'s in frameworks/opt/telephony
* commit '
7f5de0161b4df9fc8ed817b10a258668ec7513a2':
Show plmn in emergency call allowed mode.
Marco Nelissen [Tue, 18 Sep 2012 16:44:55 +0000 (09:44 -0700)]
Merge "Visualizer only works on sounds >5 sec." into jb-mr1-dev
Andy McFadden [Tue, 18 Sep 2012 16:22:48 +0000 (09:22 -0700)]
Merge "Plumb display name into SurfaceFlinger" into jb-mr1-dev
Nick Kralevich [Tue, 18 Sep 2012 16:21:59 +0000 (09:21 -0700)]
Merge "Adjust FAQ." into jb-mr1-dev
Marco Nelissen [Tue, 18 Sep 2012 16:19:55 +0000 (09:19 -0700)]
Visualizer only works on sounds >5 sec.
Various media framework tests use a Visualizer to look at the output
of another effect, but this requires the played file to be longer
than 5 seconds.
b/
4571740
b/
7173543
b/
7173545
b/
7175623
Change-Id: I066a737542bb50e7245fef99f9e11ae8f2aadd6c
Jean-Baptiste Queru [Tue, 18 Sep 2012 15:01:04 +0000 (08:01 -0700)]
Skip
f5cbd762 - it's in frameworks/opt/telephony
Change-Id: Ifeeeab4e2672c9c71b9a1298e13e12005b53f801
Marco Nelissen [Tue, 18 Sep 2012 14:58:36 +0000 (07:58 -0700)]
Merge "Activity.onStop(Bundle) does not exist" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 06:26:30 +0000 (23:26 -0700)]
Merge "Fix build - current.txt regenerated" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 06:24:38 +0000 (23:24 -0700)]
Fix build - current.txt regenerated
Change-Id: I3d6e96f8144522f0b4fafcf9836f58f149866550
Amith Yamasani [Tue, 18 Sep 2012 05:53:21 +0000 (22:53 -0700)]
Merge "Pass Bitmap instead of ParcelFileDescriptor in UserManager" into jb-mr1-dev
Jim Miller [Tue, 18 Sep 2012 05:31:56 +0000 (22:31 -0700)]
Refactor Carrier text as a movable module.
We seem to move carrier text around a lot. Rather than moving the support code,
this creates a smart text field that updates itself.
Change-Id: I9b5b7b22813e944f673a50e952742a1ac38c0e08
Jim Miller [Tue, 18 Sep 2012 05:30:26 +0000 (22:30 -0700)]
Merge "Don't show empty widget in the case where a widget can't be inflated" into jb-mr1-dev
Amith Yamasani [Tue, 18 Sep 2012 04:46:51 +0000 (21:46 -0700)]
Pass Bitmap instead of ParcelFileDescriptor in UserManager
Add a USER_INFO_CHANGED intent for lockscreen and quicksettings to use
to monitor changes to the user name or icon.
Bug:
7164040
Change-Id: Id6fb8b6d38ce04ccd02bbadcf0c10699783d6c03
Scott Main [Tue, 18 Sep 2012 04:30:16 +0000 (21:30 -0700)]
am
44204020: cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
* commit '
442040208cba3be464d7a180283d72d9ec074def':
cherrypick from jb-dev Change-Id: Ib0ec41960017725db3fbedb2b62350dc8f8d3468 new Google Play badges and some updates to corresponding pages
OSDN Git Service
