Adam Cohen
956aefb3c5
am 26ed04ba: Merge "Caching the FixedSizeRemoteViewsCaches across rotation" into jb-dev
...
* commit '26ed04ba862074e78834e0af222083cb2c4fddbb':
Caching the FixedSizeRemoteViewsCaches across rotation
2012-07-25 10:51:41 -07:00
Daniel Sandler
f5221a86c4
am cb1aec34: Remove old unused DreamsDockLauncher.
...
* commit 'cb1aec3403115467d1298fcabd45137eb483a1fe':
Remove old unused DreamsDockLauncher.
2012-07-25 10:51:36 -07:00
Adam Cohen
26ed04ba86
Merge "Caching the FixedSizeRemoteViewsCaches across rotation" into jb-dev
2012-07-25 10:43:52 -07:00
Daniel Sandler
cb1aec3403
Remove old unused DreamsDockLauncher.
...
Bug: 6802065
Change-Id: I403b02ca7c78bb90eed712b3b6f846a4a6d68f8b
2012-07-25 11:00:49 -04:00
Daniel Sandler
7d1ef0cee7
am 3ee47ae7: Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev
...
* commit '3ee47ae7ee0d0afc0a2bbe71636c31483b5502cd':
Fix 6804479: "Emergency calls only" in notification shade
2012-07-24 22:13:56 -07:00
Adam Cohen
355301e968
am 2daf9dc9: Merge "Prevent crash in AppWidgetHost that can be triggered by an AppWidget" into jb-dev
...
* commit '2daf9dc9eb462b8e16e8871a6f4573cded1e3fa6':
Prevent crash in AppWidgetHost that can be triggered by an AppWidget
2012-07-24 22:13:52 -07:00
Quddus Chong
38f849ca81
am 4eb6973b: Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev
...
* commit '4eb6973bc1f8cd51a2466708b227fb51314ad0c1':
docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358
2012-07-24 22:13:46 -07:00
Jake Hamby
c213246d25
am 7b661fb3: (-s ours) Implement CMAS service category program results.
...
* commit '7b661fb3fc17f981bb122520791344891a3c1661':
Implement CMAS service category program results.
2012-07-24 22:13:42 -07:00
Shawn Pearce
5f8d48324e
am 8d6ff012: Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev
...
* commit '8d6ff012ed14fb2e0ddad059deea3b1fe74aac3c':
Fix 5608959: Make keyguard follow user setting for orientation
2012-07-24 22:08:57 -07:00
Scott Main
f574698404
am 0804b6db: docs: specify that adt v20 or higher is required for class
...
* commit '0804b6dbf557df6d69f96c18ebd638ee74c7c050':
docs: specify that adt v20 or higher is required for class
2012-07-24 22:08:52 -07:00
Joe Fernandez
c7f59ec1a1
am 156671ef: Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev
...
* commit '156671ef9a6581b6790bb17bfda8a9efcf9f0693':
docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
2012-07-24 22:01:00 -07:00
Dianne Hackborn
f52dcf32f2
am da9754e8: Merge "Fix issue #6860828 Non-root shell can\'t grant permissions" into jb-dev
...
* commit 'da9754e883cd7b738da9cc6ec4bb1c5b6c5b8d93':
Fix issue #6860828 Non-root shell can't grant permissions
2012-07-24 22:00:56 -07:00
Scott Main
6ce3887a62
am 707e6321: Merge "typo fix" into jb-dev
...
* commit '707e6321fd1dbff33e6fa3437fdce4eeaa3e1168':
typo fix
2012-07-24 22:00:49 -07:00
Joe Fernandez
881a2f6676
am 614b7307: Merge "doc: fix for NDK r8b release notes" into jb-dev
...
* commit '614b7307c771db7a6328a55b14983c34554440be':
doc: fix for NDK r8b release notes
2012-07-24 22:00:45 -07:00
Michael Chan
19a048626e
am a13730f4: Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev
...
* commit 'a13730f42449d97ec7206769ccaad9d95bc2924f':
Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string.
2012-07-24 22:00:39 -07:00
Wink Saville
46653c2fa0
am bc8bab89: (-s ours) Merge "Don\'t send terminal response without cmd details." into jb-dev
...
* commit 'bc8bab8949e3ab1ccfff5b5b96ed3726cfa938bb':
Don't send terminal response without cmd details.
2012-07-24 22:00:35 -07:00
Adam Cohen
335c3b681b
Caching the FixedSizeRemoteViewsCaches across rotation
...
-> This prevents unnecessary flashing of collection widgets on rotation
Change-Id: Id29d4952aa640ca90b31dc3e02e2402cc0fb84d3
2012-07-24 21:45:22 -07:00
Daniel Sandler
3ee47ae7ee
Merge "Fix 6804479: "Emergency calls only" in notification shade" into jb-dev
2012-07-24 20:30:26 -07:00
Adam Cohen
2daf9dc9eb
Merge "Prevent crash in AppWidgetHost that can be triggered by an AppWidget" into jb-dev
2012-07-24 19:17:19 -07:00
Quddus Chong
4eb6973bc1
Merge "docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072 Bug: 5942358" into jb-dev
2012-07-24 17:59:11 -07:00
Quddus Chong
375d72baa7
docs: Added docs for lint tool. Change-Id: I06192262b56e0333bcfbcac223395788f7b0d072
...
Bug: 5942358
Change-Id: Ib15f96f267aa0a713fbd03b3bf5dced8c37da12e
2012-07-24 17:44:55 -07:00
Daniel Sandler
0ae29275b8
Fix 6804479: "Emergency calls only" in notification shade
...
Add an additional codepath to the "no connectivity" logic in
NetworkController to allow the PLMN bubble up from the
GsmServiceStateTracker, where R.string.emergency_calls_only
is returned if we're in emergency call mode.
Bug: 6804479
Change-Id: I0a77261e4393cc0dc32bae3e631ef196b2342f06
2012-07-24 20:41:31 -04:00
Jake Hamby
7b661fb3fc
Implement CMAS service category program results.
...
Correctly handle CDMA Service Category Program Data requests,
and send the SCPT response to the message center. Parcel SCPD
operations as an ArrayList instead of an array (current version
will throw ClassCastException when the array is cast).
Bug: 6853691
Change-Id: I949ea68891c78306059248832e59a593ab606e11
2012-07-24 17:31:05 -07:00
Shawn Pearce
8d6ff012ed
Merge "Fix 5608959: Make keyguard follow user setting for orientation" into jb-dev
2012-07-24 17:23:38 -07:00
Scott Main
0804b6dbf5
docs: specify that adt v20 or higher is required for class
...
Change-Id: I11b9bdf59d10fad2dc49ccda47078e273fe064f7
2012-07-24 15:51:27 -07:00
Jim Miller
82f9196318
Fix 5608959: Make keyguard follow user setting for orientation
...
This fixes a bug where keyguard would always change orientation
when enabled from config_enableLockScreenRotation. Now it follows
the user preference.
Change-Id: I0437d11e1984d22cdadddc57deb47d800fb86aa1
2012-07-24 14:27:12 -07:00
Joe Fernandez
156671ef9a
Merge "docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348" into jb-dev
2012-07-24 11:47:04 -07:00
Joe Fernandez
cb58e6b7cf
docs: ADT r20.0.2 Release Notes, bug fixes - reprise of reverted: Change-Id: I66cfcb46c5f8a4825f1a12640dacc3c2c42ff348
...
Change-Id: I590028c0eebc5d3142c63036e3fffb1a53cb55a6
2012-07-24 11:41:17 -07:00
Dianne Hackborn
da9754e883
Merge "Fix issue #6860828 Non-root shell can't grant permissions" into jb-dev
2012-07-24 11:07:55 -07:00
Scott Main
707e6321fd
Merge "typo fix" into jb-dev
2012-07-24 10:21:17 -07:00
Joe Fernandez
614b7307c7
Merge "doc: fix for NDK r8b release notes" into jb-dev
2012-07-24 09:11:25 -07:00
Michael Chan
a13730f424
Merge "Fixed the problem where getEntityAndIncrementCursor would always return "0" for attendeeIdentity & attendeeIdNamespace instead of the actual string." into jb-dev
2012-07-24 08:53:52 -07:00
Wink Saville
bc8bab8949
Merge "Don't send terminal response without cmd details." into jb-dev
2012-07-24 08:27:03 -07:00
Scott Main
eb48884133
typo fix
...
Change-Id: Ib7c8f17fd0f2a1e2b462b6ab9b711c3b4bf3edda
2012-07-23 18:58:19 -07:00
Scott Main
2e5d7c539a
am 9f061e28: fix information about layout overrides bug: 6852515
...
* commit '9f061e2809ce89e0646519791cb69825abbb03a5':
fix information about layout overrides bug: 6852515
2012-07-23 18:49:55 -07:00
Scott Main
26db8b9594
am fc815c32: Merge "docs: update Building Your First App class to reflect changes to New Project setup in eclipse" into jb-dev
...
* commit 'fc815c328bea63c2dee7e67b81c95d7c4d5696bb':
docs: update Building Your First App class to reflect changes to New Project setup in eclipse
2012-07-23 18:49:50 -07:00
Jake Hamby
0275552bba
resolved conflicts for merge of f364fccf to jb-dev-plus-aosp
...
Change-Id: If2913010a98e7c0d1cb3a9efc3389b50d4079532
2012-07-23 18:33:11 -07:00
Scott Main
9f061e2809
fix information about layout overrides
...
bug: 6852515
Change-Id: I80681a06e87aad3de8243bb731d7513e5aa29d08
2012-07-23 18:32:03 -07:00
Scott Main
fc815c328b
Merge "docs: update Building Your First App class to reflect changes to New Project setup in eclipse" into jb-dev
2012-07-23 18:20:08 -07:00
Scott Main
39871b7e43
docs: update Building Your First App class to reflect changes to New Project setup in eclipse
...
Change-Id: I57c02676fbc2886872c2d294c5517b458e8751c5
2012-07-23 18:16:54 -07:00
Jake Hamby
f364fccff4
Merge "Fix detection of CDMA cell broadcast messages." into jb-dev
2012-07-23 16:24:10 -07:00
Joe Fernandez
abfbce0844
am 7ba01780: Merge "Revert "docs: ADT r20.0.2 Release Notes, bug fixes"" into jb-dev
...
* commit '7ba017807593bad0ae01204ff9c5f4af7d4a537a':
Revert "docs: ADT r20.0.2 Release Notes, bug fixes"
2012-07-23 15:41:02 -07:00
Joe Fernandez
7ba0178075
Merge "Revert "docs: ADT r20.0.2 Release Notes, bug fixes"" into jb-dev
2012-07-23 15:38:20 -07:00
Joe Fernandez
eef8340ab1
doc: fix for NDK r8b release notes
...
Change-Id: I223db230887b17e452df2cacd35160e1fcaea5d1
2012-07-23 15:37:46 -07:00
Scott Main
87a8003946
am 67922bb2: docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
...
* commit '67922bb286c7a39afe6171cccdabcdcf96e0826a':
docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
2012-07-23 15:30:42 -07:00
Joe Fernandez
7e5cb8421a
Revert "docs: ADT r20.0.2 Release Notes, bug fixes"
...
This reverts commit 04364be7344a9429e7a07b1daf7da91bc684b264
Change-Id: I7d0c9c7a4e876de8e44c4f46578b8e5d60c488e6
2012-07-23 15:29:40 -07:00
Scott Main
67922bb286
docs: add new IO videos playlist and update blog posts to show N7 post and Tools 20
...
Change-Id: I247d2bfd549a48dcaaa1c5668559e3d5d2cd6fc5
2012-07-23 14:51:18 -07:00
Jake Hamby
15c257eb8f
Fix detection of CDMA cell broadcast messages.
...
The bIsServicePresent field of an incoming CDMA SMS RIL message
is not a reliable way to distinguish broadcast from point-to-point
messages on some RILs. Change CDMA SmsMessage.getMessageType() to
return MESSAGE_TYPE_BROADCAST when the service category is not 0,
and MESSAGE_TYPE_POINT_TO_POINT when the service category is 0.
Bug: 6853691
Change-Id: I0d44a8ce0bb295da5125271db90652570d655bc1
2012-07-23 14:42:33 -07:00
Dianne Hackborn
4d5f968f41
Fix issue #6860828 Non-root shell can't grant permissions
...
That, plus a few other permissions.
Bug: 6860828
Change-Id: I69f0360471e4fd46e689388cd993e18c1e0bfb02
2012-07-23 11:46:32 -07:00
Scott Main
95f83fd79f
am c7504032: Merge "docs: remove link that points to empty page" into jb-dev
...
* commit 'c7504032f3826a27da7ac9d75b1b56c7e4c4ce32':
docs: remove link that points to empty page
2012-07-23 11:03:10 -07:00