OSDN Git Service
Matthew Williams [Thu, 5 Jun 2014 20:08:54 +0000 (20:08 +0000)]
am
1a2f47d4: Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
* commit '
1a2f47d4cdc0ea40dff1b88f7976d64c19d687b1':
Add persistence of tasks for TaskManager & BatteryController
Dan Sandler [Thu, 5 Jun 2014 20:04:36 +0000 (20:04 +0000)]
am
4ccaa092: Merge "Don\'t show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev
* commit '
4ccaa092d49deb84885b5daf2e6d6f1c745d56bf':
Don't show private notifications if a secure lockscreen is merely occluded.
Ihab Awad [Thu, 5 Jun 2014 19:59:53 +0000 (19:59 +0000)]
Merge "DO NOT MERGE. Implement connection error dialogs (1/4)"
Ihab Awad [Wed, 4 Jun 2014 01:40:45 +0000 (18:40 -0700)]
DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.
Bug:
15195720
Bug:
15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
(cherry picked from commit
976bfe497da31fa8322969648ffbe77898941d0c)
Matthew Williams [Thu, 5 Jun 2014 19:15:25 +0000 (19:15 +0000)]
Merge "Add persistence of tasks for TaskManager & BatteryController" into lmp-preview-dev
Elliott Hughes [Thu, 5 Jun 2014 18:40:49 +0000 (18:40 +0000)]
Merge "resolved conflicts for merge of
f8272896 to master"
Selim Cinek [Thu, 5 Jun 2014 18:38:49 +0000 (18:38 +0000)]
am
2d49b682: Merge "Fix PanelView over expanding behavior." into lmp-preview-dev
* commit '
2d49b682522cf8ec90bfd3e3fde468b44919ccae':
Fix PanelView over expanding behavior.
Elliott Hughes [Thu, 5 Jun 2014 18:35:53 +0000 (11:35 -0700)]
resolved conflicts for merge of
f8272896 to master
Change-Id: I34a156bceb5dacd90c399c56c6f07d2a8e5c0c85
Dan Sandler [Thu, 5 Jun 2014 18:35:48 +0000 (18:35 +0000)]
Merge "Don't show private notifications if a secure lockscreen is merely occluded." into lmp-preview-dev
Elliott Hughes [Thu, 5 Jun 2014 18:29:24 +0000 (18:29 +0000)]
am
bd1949a4: am
b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."
* commit '
bd1949a4fbd6eb61e7a0a0f81d654a8df50999bf':
[LP64] Fix access to MediaAlbumArt.
Matthew Williams [Sat, 17 May 2014 01:02:17 +0000 (18:02 -0700)]
Add persistence of tasks for TaskManager & BatteryController
Tasks are persisted only if the client has the RECEIVE_BOOT_COMPLETED
permission. This applies to both periodic and one-off tasks.
Write out task as xml, using PersistableBundle for the extras data.
Todo: Add persistable bundle to xml when ag/468207 is merged.
Also added BatteryController logic.
Change-Id: I23eeeb8b3bc6ba155e7fa4ec25857a68ee8b1567
Elliott Hughes [Thu, 5 Jun 2014 18:19:16 +0000 (18:19 +0000)]
am
b2842e72: Merge "[LP64] Fix access to MediaAlbumArt."
* commit '
b2842e72819b3eb724503290e9eaa7c50f65e45b':
[LP64] Fix access to MediaAlbumArt.
Justin Koh [Thu, 5 Jun 2014 18:14:01 +0000 (18:14 +0000)]
am
2304bf4c: am
2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
* commit '
2304bf4cd4e377994d80f55871fd31f82bb4f646':
Add check to allow notification listener packages to post >50 notifications
Justin Koh [Thu, 5 Jun 2014 18:10:01 +0000 (18:10 +0000)]
am
2be3d6f9: Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
* commit '
2be3d6f9361311c1d272965afcd602ae12c769af':
Add check to allow notification listener packages to post >50 notifications
Justin Koh [Thu, 5 Jun 2014 18:06:45 +0000 (18:06 +0000)]
Merge "Add check to allow notification listener packages to post >50 notifications" into klp-modular-dev
Jean-Michel Trivi [Thu, 5 Jun 2014 18:06:06 +0000 (18:06 +0000)]
Merge "AudioAttributes: parcelable, hide support for tags"
Elliott Hughes [Thu, 5 Jun 2014 18:02:04 +0000 (18:02 +0000)]
Merge "[LP64] Fix access to MediaAlbumArt."
Chris Wren [Thu, 5 Jun 2014 18:00:02 +0000 (18:00 +0000)]
am
413edd50: Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
* commit '
413edd50540a7890949c5370d18f293f2e6f8841':
Disable the attention light on devices that do not have it.
Selim Cinek [Thu, 5 Jun 2014 17:57:15 +0000 (17:57 +0000)]
Merge "Fix PanelView over expanding behavior." into lmp-preview-dev
Robin Lee [Thu, 5 Jun 2014 17:56:58 +0000 (17:56 +0000)]
am
7f993419: am
3c189e02: am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
7f99341950273f5284186ea2e59a22ac71241c30':
Add Environment call: get config dir for some user
Jorim Jaggi [Thu, 5 Jun 2014 15:25:40 +0000 (17:25 +0200)]
Fix PanelView over expanding behavior.
Fixes a bug that the panel height was wrongly calculated and lagging
one frame behind. Also fixes the animation when overscrolling and
then flinging the panel to collapse. In addition, the logic to handle
the over expanding is much cleaner and calculated in an absolut
manner (before, it was relative an really complicated to understand).
Bug:
14487435
Change-Id: If8dbb3e063ef63f51f6dac0ae5bf276480514103
Robin Lee [Thu, 5 Jun 2014 17:53:25 +0000 (17:53 +0000)]
am
3c189e02: am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
3c189e02e42fba9d5be2c4f68f76620bae33618e':
Add Environment call: get config dir for some user
Hui Lu [Thu, 5 Jun 2014 17:42:17 +0000 (17:42 +0000)]
am
26f40cc3: am
61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '
26f40cc36dc869fc8de3bf4c97de57aae0d626ca':
Add interface name for proxy network type.
Hui Lu [Thu, 5 Jun 2014 17:39:09 +0000 (17:39 +0000)]
am
61c0f547: Merge "Add interface name for proxy network type." into klp-modular-dev
* commit '
61c0f547339ec870d42b15e84f9628631308f22f':
Add interface name for proxy network type.
Elliott Hughes [Thu, 5 Jun 2014 17:38:30 +0000 (10:38 -0700)]
[LP64] Fix access to MediaAlbumArt.
The mSize field is a uint32_t, not a long.
Change-Id: Id3b9e6049e8998840d33fa886b676db2a8022064
Hui Lu [Thu, 5 Jun 2014 17:36:02 +0000 (17:36 +0000)]
Merge "Add interface name for proxy network type." into klp-modular-dev
Kenny Guy [Thu, 5 Jun 2014 17:29:40 +0000 (17:29 +0000)]
Merge "Fix bug with sending intents to correct user for device admin."
Robin Lee [Thu, 5 Jun 2014 17:26:29 +0000 (17:26 +0000)]
am
271251d7: Merge "Add Environment call: get config dir for some user"
* commit '
271251d739db12838d1521bcf885b4943e9b00b1':
Add Environment call: get config dir for some user
Robin Lee [Thu, 5 Jun 2014 17:16:51 +0000 (17:16 +0000)]
Merge "Add Environment call: get config dir for some user"
Kenny Guy [Thu, 5 Jun 2014 15:51:24 +0000 (16:51 +0100)]
Fix bug with sending intents to correct user for device admin.
Password change intents etc. were always being sent to
owner rather than user the device admin was installed for.
Also add TODO to not assume profile parent is OWNER.
Bug:
15442331
Change-Id: I7e58069bc4a6ab94f038ae1b80c044d666986318
Hui Lu [Tue, 3 Jun 2014 19:50:30 +0000 (15:50 -0400)]
Add interface name for proxy network type.
This will make test
android.net.cts.ConnectivityManagerTest#testRequestRouteToHost pass.
Change-Id: I5a14b6d705e87018e1e2c031aaacee533536a50b
Bug:
15320910
Chris Wren [Thu, 5 Jun 2014 16:51:29 +0000 (16:51 +0000)]
am
89dcfe66: Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev
* commit '
89dcfe66c9101a4124d121d1c8df98e5cd8b7798':
A notification that emerges from Zen Mode interception should beep.
Chris Wren [Thu, 5 Jun 2014 16:49:13 +0000 (16:49 +0000)]
Merge "Disable the attention light on devices that do not have it." into lmp-preview-dev
Eric Laurent [Thu, 5 Jun 2014 16:47:45 +0000 (16:47 +0000)]
am
e637e614: Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev
* commit '
e637e614b95eb8bb5b4d69ad5ab89ce92e4b5a29':
remove debug log in AudioPortEventHandler.
Chris Wren [Thu, 5 Jun 2014 16:44:49 +0000 (16:44 +0000)]
Merge "A notification that emerges from Zen Mode interception should beep." into lmp-preview-dev
Chris Wren [Wed, 4 Jun 2014 19:59:50 +0000 (15:59 -0400)]
Disable the attention light on devices that do not have it.
If the attention and notificaiton light are mapped to the same
physical LED, then pulsing the attention light can turn off the
notification light. See bug for detailed discussion.
Bug:
12900389
Change-Id: I2703af23f50ecc3e92140b9843aaf340d520bce5
Chris Wren [Tue, 3 Jun 2014 22:11:47 +0000 (18:11 -0400)]
A notification that emerges from Zen Mode interception should beep.
If a notificaiton emerges from Zen Mode due to a ranking
reconsideration (possibly because a long-running query resolved an
important person) then it should get the oportunity buzz, beep, blink,
and send accessibility events.
Save what we need to know about the old notificaiton record on the new
record so we don't have to hold onto it.
Bug:
15383458
Change-Id: I15c7834fef03ff6a676e78e9d2caae24f00720ef
Mike Lockwood [Thu, 5 Jun 2014 15:34:48 +0000 (15:34 +0000)]
Merge "UsbDebuggingManager: remove log spam when disconnecting USB"
Mike Lockwood [Thu, 5 Jun 2014 15:24:16 +0000 (08:24 -0700)]
UsbDebuggingManager: remove log spam when disconnecting USB
Bug:
15112047
Change-Id: Ia07895ee166fa87c88d0443f0745bc9384dac10c
Yorke Lee [Thu, 5 Jun 2014 15:21:22 +0000 (15:21 +0000)]
am
d6138017: Merge "API changes per API review for contacts" into lmp-preview-dev
* commit '
d6138017d9d435b176dff424ff75c8e8ea298d06':
API changes per API review for contacts
Yohei Yukawa [Thu, 5 Jun 2014 15:20:53 +0000 (15:20 +0000)]
Merge "Trivial method renaming for notifyTextCommitted"
Eric Laurent [Thu, 5 Jun 2014 15:18:35 +0000 (15:18 +0000)]
Merge "remove debug log in AudioPortEventHandler." into lmp-preview-dev
Robin Lee [Mon, 28 Apr 2014 15:03:22 +0000 (16:03 +0100)]
Add Environment call: get config dir for some user
This returns a read-only directory accessible to any app running as the
same user, containing various configuration files written by the system.
Change-Id: I635de184fc285b8fef166b782bbc1ac79f8f0687
Kenny Guy [Thu, 5 Jun 2014 14:20:35 +0000 (14:20 +0000)]
Merge "Badge notification from managed profiles."
Adam Connors [Thu, 5 Jun 2014 14:10:24 +0000 (14:10 +0000)]
Merge "Fix build break (include current.txt)"
Adam Connors [Thu, 5 Jun 2014 14:07:53 +0000 (15:07 +0100)]
Fix build break (include current.txt)
I forgot to commit this... sorry.
Change-Id: I5efca4d9447f1792a095dd64210a124c29e6a917
Yohei Yukawa [Thu, 5 Jun 2014 07:16:18 +0000 (16:16 +0900)]
Trivial method renaming for notifyTextCommitted
This CL does not change existing behavior but only renames
notifyTextCommitted with notifyUserAction so that we can use
not only text commit but also other actions such as just typing
a character will be used as a trigger to update the IME
rotation order for better IME switching experience.
BUG:
7043015
Change-Id: I7f3e13a7226ef0dceee82b67e8a0d8536f7e9807
Selim Cinek [Thu, 5 Jun 2014 13:45:59 +0000 (13:45 +0000)]
am
995006df: Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
* commit '
995006dfe6e41c8d986c7c7af5bb02ff23e4429a':
Changed the default success color of the lockpatternview to white.
Ihab Awad [Thu, 5 Jun 2014 13:45:59 +0000 (13:45 +0000)]
am
4c0c5cf9: (-s ours) Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev
* commit '
4c0c5cf919dac4708f631a29d7e7537b316e970f':
DO NOT MERGE. Implement connection error dialogs (1/4)
Selim Cinek [Thu, 5 Jun 2014 13:45:58 +0000 (13:45 +0000)]
am
71ea5814: Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
* commit '
71ea5814716a191b3ab2bc9045007865cbad3e34':
Changed the LockPatternView assets to quantum
Yorke Lee [Thu, 5 Jun 2014 13:43:34 +0000 (13:43 +0000)]
Merge "API changes per API review for contacts" into lmp-preview-dev
Adam Connors [Thu, 5 Jun 2014 13:07:12 +0000 (13:07 +0000)]
Merge "API Review: rename FEATURE_MANAGEDPROFILES"
Adam Connors [Thu, 5 Jun 2014 11:20:15 +0000 (11:20 +0000)]
Merge "Allow system process to call getApplicationBlockedAsUser"
Adam Connors [Thu, 5 Jun 2014 11:13:03 +0000 (12:13 +0100)]
API Review: rename FEATURE_MANAGEDPROFILES
To be FEATURE_MANAGED_PROFILES
Bug:
15025371
Change-Id: I2f818b4d8488fe7943fe5ff6051d6b1f84ca9e8c
Adam Connors [Thu, 5 Jun 2014 09:36:01 +0000 (10:36 +0100)]
Allow system process to call getApplicationBlockedAsUser
MDMs in the managed profile needs to be able to call
DPM.isApplicationBlocked without the INTERACT_ACROSS_USERS
permission. DevicePolicyManager checks for appropriate
PROFILE_OWNER permission and then removes callerId, so this
change is needed to prevent a spurious security exception.
Change-Id: Idd1bda6bb234f6cb7cb78a885ae2d7cc5cca4890
Dan Sandler [Thu, 5 Jun 2014 09:47:47 +0000 (09:47 +0000)]
am
8c2079c2: Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
* commit '
8c2079c2ce89bb7311f6db08f5f0d09e262d650f':
Platlogo: The icon now matches the activity.
Dan Sandler [Thu, 5 Jun 2014 04:58:02 +0000 (00:58 -0400)]
Don't show private notifications if a secure lockscreen is merely occluded.
Bug:
15430088
Change-Id: I27187216462b5bb7d52c3f85b9444348138fd9ea
Selim Cinek [Thu, 5 Jun 2014 05:36:22 +0000 (05:36 +0000)]
Merge "Changed the default success color of the lockpatternview to white." into lmp-preview-dev
Selim Cinek [Thu, 5 Jun 2014 05:25:01 +0000 (07:25 +0200)]
Changed the default success color of the lockpatternview to white.
Since it was distracting when unlocking
Bug:
13735707
Change-Id: I6b9c5baa22dc5c102f36bdf9a99390c5dd1690ba
Ihab Awad [Thu, 5 Jun 2014 05:24:38 +0000 (05:24 +0000)]
Merge "DO NOT MERGE. Implement connection error dialogs (1/4)" into lmp-preview-dev
Selim Cinek [Thu, 5 Jun 2014 05:03:10 +0000 (05:03 +0000)]
Merge "Changed the LockPatternView assets to quantum" into lmp-preview-dev
Selim Cinek [Wed, 4 Jun 2014 14:06:51 +0000 (16:06 +0200)]
Changed the LockPatternView assets to quantum
Bug:
13735707
Change-Id: Id999adbd8a4aeb3ca91fcb9957ec38ec75ff91b0
Justin Koh [Wed, 4 Jun 2014 20:57:49 +0000 (13:57 -0700)]
Add check to allow notification listener packages to post >50 notifications
Bug:
13433398
Change-Id: I77abf19982add240e1bbe8196fbe148d32884f68
Craig Mautner [Thu, 5 Jun 2014 03:59:13 +0000 (20:59 -0700)]
Merge commit '
21483b9f' into manualmerge
Change-Id: If9261cc1625f9f492697fe16c21d2b71c0cc0e11
Craig Mautner [Thu, 5 Jun 2014 03:31:06 +0000 (03:31 +0000)]
am
e34fcf8f: Merge "Add callback when ActivityView activities complete" into klp-modular-dev
* commit '
e34fcf8ff9a023641505a8decdeb1b77232d8a16':
Add callback when ActivityView activities complete
Craig Mautner [Thu, 5 Jun 2014 03:28:21 +0000 (03:28 +0000)]
Merge "Add callback when ActivityView activities complete" into klp-modular-dev
Eric Laurent [Thu, 5 Jun 2014 03:09:13 +0000 (20:09 -0700)]
remove debug log in AudioPortEventHandler.
Bug:
14815883.
Change-Id: Ib5076fcfe8a36d1dd772b072fdf3400e57acc61c
Eino-Ville Talvala [Thu, 5 Jun 2014 02:30:08 +0000 (02:30 +0000)]
am
4b1b33ef: Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev
* commit '
4b1b33eff0eabd17f1078d55188b40e9a27d047a':
Camera2: Invoke onError callbacks for failure to open
Dan Sandler [Thu, 5 Jun 2014 02:26:40 +0000 (02:26 +0000)]
Merge "Platlogo: The icon now matches the activity." into lmp-preview-dev
Jungshik Jang [Wed, 28 May 2014 08:58:58 +0000 (17:58 +0900)]
Implement hotplug detection sequence.
Hotplug detection is periodic operation to detect new/removed device.
In case of directly connected device fires hotplug devices
but remote devices which are plugged in hdmi switch may not
report their existence.
Hotplug action polls all devices in regular base; 5s for
system audio (only when it's active) 15s for others.
Change-Id: I77c308ecfd5d6bf92f306923fa5ac9eabdad4127
Jungshik Jang [Thu, 5 Jun 2014 01:24:02 +0000 (01:24 +0000)]
Merge "Refactor HdmiCecLocalDevice and logical address allocation logic."
Jungshik Jang [Tue, 3 Jun 2014 07:22:30 +0000 (16:22 +0900)]
Refactor HdmiCecLocalDevice and logical address allocation logic.
1. Factor out logical allocation logic to HdmiControlService.
2. Contains a reference to HdmiControlService rather than
HdmiCecController so that it enables to access service's logic
directly.
3. Move launch device discovery logic to HdmiCecLocalDeviceTv.
Change-Id: Ic97b4d51311a3c18f6d586c2245cac410cbd370e
Yorke Lee [Thu, 5 Jun 2014 01:01:46 +0000 (18:01 -0700)]
API changes per API review for contacts
* Improve documentation for REMOVE_DUPLICATE_ENTRIES
* Hide android.provider.ContactsContract.PinnedPositions, it will be
reworked and improved for L.
* Hide android.provider.ContactsContract.Preferences - we will rework
the various apps that are relying on this to use their own preferences
instead
* Remove inheritance of hidden interfaces in android.provider.Contacts
Bug:
15430304
Change-Id: I0f96e8a506083df21023f9b95655f0ce5244bdce
Deepanshu Gupta [Thu, 5 Jun 2014 01:10:44 +0000 (01:10 +0000)]
Eino-Ville Talvala [Thu, 5 Jun 2014 01:08:53 +0000 (01:08 +0000)]
Merge "Camera2: Invoke onError callbacks for failure to open" into lmp-preview-dev
Craig Mautner [Mon, 2 Jun 2014 22:06:40 +0000 (15:06 -0700)]
Add callback when ActivityView activities complete
Users of ActivityViews can now be informed when there are no more
active activities in ActivityView by registering a callback.
Fixes bug
15330616.
Change-Id: I39d55bdb0db8b0a12ee751cdcb039b7fbb899c85
Amith Yamasani [Thu, 5 Jun 2014 00:22:46 +0000 (00:22 +0000)]
Merge "Fix messed up current.txt"
Jean-Michel Trivi [Tue, 3 Jun 2014 23:06:48 +0000 (16:06 -0700)]
AudioAttributes: parcelable, hide support for tags
Make the AudioAttributes class parcelable.
Hide support for adding and querying tags, there is no SDK-backed
use case for this feature.
Bug
15306334
Change-Id: Idb67a735778e687d73020ed0120643f31fc230a6
Amith Yamasani [Thu, 5 Jun 2014 00:19:24 +0000 (17:19 -0700)]
Fix messed up current.txt
Change-Id: Id472fda6112593c1ba933100249bbd5c6ecb0ccb
Deepanshu Gupta [Thu, 5 Jun 2014 00:02:55 +0000 (00:02 +0000)]
am
4c0d33f2: Merge "Add basic support for simulating older versions." into lmp-preview-dev
* commit '
4c0d33f29f295e5ae27ba057fc8cb2270295865a':
Add basic support for simulating older versions.
Eino-Ville Talvala [Wed, 4 Jun 2014 01:30:27 +0000 (18:30 -0700)]
Camera2: Invoke onError callbacks for failure to open
When the initial attempt to connect to the remote camera device fails,
fire the onError callback as documented, instead of throwing an
exception from open().
Also ensure the correct exception is sent when methods are called
while in the error state, and make sure onClosed() is called correctly
if closing the device after an initial startup error.
Bug:
14413756
Bug:
14413363
Change-Id: I0822261dad52bcd428a0c4556202f00032499990
Dave Holmes [Wed, 4 Jun 2014 23:50:38 +0000 (23:50 +0000)]
am
b3b6f148: am
b766edce: am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d
* commit '
b3b6f1481e710a4f528dba962a8d860cc9d391a4':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Deepanshu Gupta [Wed, 4 Jun 2014 23:49:26 +0000 (16:49 -0700)]
Fix build.
Change-Id: I877532b5056a035dbd4b0c6c55b5969d6292846a
Dave Holmes [Wed, 4 Jun 2014 23:45:42 +0000 (23:45 +0000)]
am
b766edce: am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to incl
* commit '
b766edcea3dfdc6513218649b9ad2030bc195c23':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Amith Yamasani [Wed, 4 Jun 2014 23:44:29 +0000 (23:44 +0000)]
Merge "Change preference category text color for quantum"
Igor Murashkin [Wed, 4 Jun 2014 23:42:58 +0000 (23:42 +0000)]
am
97b2bc9a: Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
* commit '
97b2bc9a05a56dad609360f8fec1e5a51059e656':
camera2: Change CaptureListener callbacks to include the session (api)
Raph Levien [Wed, 4 Jun 2014 23:42:57 +0000 (23:42 +0000)]
am
424f369a: Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
* commit '
424f369a38371294fdf3fc8d769ae9ca1e790807':
Turn off elegantTextHeight in quantum theme
Dave Holmes [Wed, 4 Jun 2014 23:41:49 +0000 (23:41 +0000)]
am
4e99af34: am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to
* commit '
4e99af342b340bebcd635137966d21c59c294532':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Dave Holmes [Wed, 4 Jun 2014 23:38:34 +0000 (23:38 +0000)]
am
aabfcb78: Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I\'d like to include a link to the Building
* commit '
aabfcb78cf29e3d670831c770b9d757eb79487e4':
Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation.
Deepanshu Gupta [Wed, 4 Jun 2014 23:37:36 +0000 (23:37 +0000)]
Merge "Add basic support for simulating older versions." into lmp-preview-dev
Dave Holmes [Wed, 4 Jun 2014 23:35:50 +0000 (23:35 +0000)]
Merge "Adding links to the Gradle docs. Both of these files ask you to change the contents of your gradle file, but neither links to reference information on gradle. Because this is still pretty new information, I'd like to include a link to the Building with Gradle documentation." into klp-docs
Igor Murashkin [Wed, 4 Jun 2014 23:31:53 +0000 (23:31 +0000)]
Merge "camera2: Change CaptureListener callbacks to include the session (api)" into lmp-preview-dev
Raph Levien [Wed, 4 Jun 2014 23:28:47 +0000 (23:28 +0000)]
Merge "Turn off elegantTextHeight in quantum theme" into lmp-preview-dev
Alan Viverette [Wed, 4 Jun 2014 23:26:57 +0000 (23:26 +0000)]
am
c1462be8: Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
* commit '
c1462be80a2581ddd522bf24d91ba183f166de80':
Update ripple spec, fix ripple mask, rotate progress drawable
Adam Powell [Wed, 4 Jun 2014 23:26:56 +0000 (23:26 +0000)]
am
f0e4ca1b: Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev
* commit '
f0e4ca1b0398a9709d1516434e6d926f477acd70':
Fix list navigation callbacks for ActionBarView
Ihab Awad [Wed, 4 Jun 2014 01:40:45 +0000 (18:40 -0700)]
DO NOT MERGE. Implement connection error dialogs (1/4)
Implement reporting of connection errors from ConnectionServices through
Telecomm to the InCallUI.
Bug:
15195720
Bug:
15117141
Change-Id: I0e1443f75a175a212fb19afde5a7eadef15d239d
Matthew Williams [Wed, 4 Jun 2014 23:14:44 +0000 (23:14 +0000)]
am
7e36b718: (-s ours) DO NOT MERGE Redact SyncService stuff from master
* commit '
7e36b7183afc47c81581efad648e7930771e5f9a':
DO NOT MERGE Redact SyncService stuff from master
Alan Viverette [Wed, 4 Jun 2014 23:13:55 +0000 (23:13 +0000)]
Merge "Update ripple spec, fix ripple mask, rotate progress drawable" into lmp-preview-dev
Raph Levien [Wed, 4 Jun 2014 23:09:11 +0000 (16:09 -0700)]
Turn off elegantTextHeight in quantum theme
Setting elegantTextHeight to true was a great experiment, but it led to
too much difficulty getting text to fit in space-constrained spaces
(action bar, list items). A long term solution is optical bounds, but
for the time being, just turn it off.
This patch fixes bug
14227056: "Language name displaying under Personal
dictionary are truncated in landscape mode"
Change-Id: I2b0e1ca2e7a06cd0fd9a4d84c1c07fdea2ddbf03
Adam Powell [Wed, 4 Jun 2014 23:04:56 +0000 (23:04 +0000)]
Merge "Fix list navigation callbacks for ActionBarView" into lmp-preview-dev