Deepanshu Gupta
de4ee0f1be
am 75bf1b1c: Merge "Skip loading animations." into lmp-dev
...
* commit '75bf1b1c6af0bc0d09b04292565915fab0e49a30':
Skip loading animations.
2014-10-29 00:20:42 +00:00
Deepanshu Gupta
916d779650
am c55eb170: Merge "Fix multiple styles case in resource resolution." into lmp-dev
...
* commit 'c55eb170cccea10158cedaeccd991b4b97d0036c':
Fix multiple styles case in resource resolution.
2014-10-29 00:15:56 +00:00
Deepanshu Gupta
6fb2fda85c
am 92a52142: Merge "Use right theme for drawable inflation." into lmp-dev
...
* commit '92a52142fd988590aa61aedd54f48e9d249a2f53':
Use right theme for drawable inflation.
2014-10-29 00:15:52 +00:00
Shishir Agrawal
c8787beca6
Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev
2014-10-29 00:15:51 +00:00
Deepanshu Gupta
75bf1b1c6a
Merge "Skip loading animations." into lmp-dev
2014-10-29 00:13:54 +00:00
Deepanshu Gupta
c55eb170cc
Merge "Fix multiple styles case in resource resolution." into lmp-dev
2014-10-29 00:07:59 +00:00
Deepanshu Gupta
92a52142fd
Merge "Use right theme for drawable inflation." into lmp-dev
2014-10-29 00:07:42 +00:00
Ihab Awad
6c37f374b5
Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev
2014-10-28 23:48:20 +00:00
Alan Viverette
85085343b3
Add content description to Toolbar collapse button
...
BUG: 17722111
Change-Id: If6caa8bc61b0d178648952c419591380f4edf4ba
2014-10-28 16:42:24 -07:00
David Friedman
0fa6edced7
Fixes linebreaks that had gotten altered during the run-up to 5.0 release.
...
Change-Id: I7be014d27ef85631b5e26ad2b3ab81d3a12d1813
2014-10-28 16:38:11 -07:00
Ihab Awad
074bf104c8
PhoneAccounts include literal icon bitmap (1/4)
...
Change-Id: I9110d983c0ca6610075bd24975f1e90d123ef9c1
2014-10-28 15:56:29 -07:00
Sanket Padawe
52f811ecda
Merge "Remove checks to support new sim color selection." into lmp-mr1-dev
2014-10-28 22:47:09 +00:00
Alan Viverette
4bf9edfc1f
Merge "Update drag-to-open menu close behavior" into lmp-mr1-dev
2014-10-28 22:45:33 +00:00
Wink Saville
78e652a5e4
Import translations. DO NOT MERGE
...
This is for lmp-sprout-dev only.
Hide SubscriptionManager and SubInfoRecord for lmp-sprout-dev branch
Change-Id: I5f299a7b200798ada9350bee2c1b26e6f74eaea1
2014-10-28 15:32:11 -07:00
Wale Ogunwale
c74b5723a4
Fix issue 6455374: Bad recent image on camera launch from lockscreen.
...
When transitioning from the lockscreen to the camera app,
the previous activity that was running before the screen was
locked is briefly resumed and then paused. During the pause
we take a screenshot of the activity for recents which ends up
being an image of the wallpaper, because the activity was
moved behind the wallpaper while the lockscreen is up. With
this change we no longer include the wallpaper layer in the
screenshot if it is layered on top of the window we are
targeting for the screenshot.
Bug: 6455374
Change-Id: I305950a32c176f55eeeb6358266746e32e848383
2014-10-28 15:13:16 -07:00
Yorke Lee
e398db4a45
Merge "Add comment to TelecomManager.getCallState" into lmp-mr1-dev
2014-10-28 22:08:51 +00:00
Deepanshu Gupta
0b42936d86
Skip loading animations.
...
This is a temporary fix until Path.approximate() is supported.
Bug: http://b.android.com/77865
Change-Id: I28739e58f51fabaaf1dcc1c9be61cd0b17e84eec
2014-10-28 15:07:25 -07:00
Kenny Guy
7005840d88
Listen for package changes for all users not just owner.
...
Listen for package changes for all users to cancel notifications
for secondary users and profiles when an app is uninstalled.
Bug: 18151696
Change-Id: I6921729e2878e1e5890411b173a56849eb2e0745
2014-10-28 21:32:21 +00:00
Yorke Lee
7c72c2d3c2
Add comment to TelecomManager.getCallState
...
Explain why READ_PHONE_STATE permission is not required so that
people don't try to add it in the future. Requiring the permission
causes stability crashes with legacy apps and system components
that don't have the permission.
Change-Id: Idf8766aa409d4a2c4ed3d6f81a398f4a0eb24615
2014-10-28 14:12:02 -07:00
Alan Viverette
632af84924
Ensure accessibility focus rect is drawn correctly
...
Reverts previous change that draws it as part of View.draw() and ensures
that the display is always redrawn if a view has accessibility focus.
Correctly removes focus from views with accessibility focused ancestors.
Also reverts the focus indicator to use a solid line since the dotted
line looked janky.
BUG: 17675993
Change-Id: I25718334cc1ae1c2cd19d3c23af1c18c6a67504c
2014-10-28 20:57:47 +00:00
Tyler Gunn
3bffcf78b5
Communicating participant changes to conference controller.
...
- Add new ConferenceParticipant parcelable class which represents a
single participant contained in the conference event package.
- Adding callbacks/listeners to Connection to handle changes to
participant state.
Bug: 18057361
Change-Id: Iadfebe84959f30f8e835f282aa994c0b92768aa6
2014-10-28 13:51:27 -07:00
Adrian Roos
579a7f9940
Merge "Close keyguard user switcher on tap outside" into lmp-mr1-dev
2014-10-28 20:27:41 +00:00
Sanket Padawe
d95198eb36
Remove checks to support new sim color selection.
...
Remove checks to support new sim color selection in multi-sim settings UI.
Change-Id: I26da0a79f5b1edf829fc5d46af2c0c23962226b8
2014-10-28 13:06:08 -07:00
John Spurlock
2896517ba1
Merge "Zen: Fix quantity format specifiers for quantity=1." into lmp-mr1-dev
2014-10-28 20:04:20 +00:00
Santos Cordon
ccbc3e5c66
Merge "Update javadocs for Telecom APIs." into lmp-mr1-dev
2014-10-28 20:01:01 +00:00
Jeff Davidson
f82b029c7c
Merge "Check UID instead of package name when preparing VPN." into lmp-mr1-dev
2014-10-28 20:00:32 +00:00
Chris Wren
8326a8a945
Reveal notification listener settings APIs.
...
Fix the value of the ACTION_NOTIFICATION_LISTENER_SETTINGS constant
to be the actual value to which the settings app responds.
Bug: 10023397
Change-Id: I80a0ff76406a3b0b893793f9a63ffa563dae103b
2014-10-28 15:54:53 -04:00
John Spurlock
9c4b060e41
Zen: Fix quantity format specifiers for quantity=1.
...
Bug: 16824863
Change-Id: I3c7fc5961cd65b0b8291b7d9aef6110e6dfe85f1
2014-10-28 15:49:25 -04:00
Joe Fernandez
9513604cdc
am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
...
automerge: 56a8cb7
* commit '56a8cb7fd1eff26da30c4ebcb58eae71b9774b81':
docs: Update timing of Android Wear app review
2014-10-28 19:28:36 +00:00
David Friedman
79c332a694
am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
...
automerge: b648cab
* commit 'b648cabadfd73bcd3fa8b88db48007f58739300e':
Updates Notifications screenshot for Android 5.0.
2014-10-28 19:27:37 +00:00
Eric Gilmore
3fc61015f5
am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service.
...
automerge: 77760e7
* commit '77760e753eb9a6c533eb2b52f228149e49356f64':
Docs: Adding Android Studio instructions for adding IAB service.
2014-10-28 19:26:43 +00:00
Quddus Chong
50631f97b4
am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
...
automerge: eb07af2
* commit 'eb07af2ced7aa438dca941fcde2e3ca0b338a620':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
2014-10-28 19:25:57 +00:00
Ricardo Cervera
989f4bfd8d
am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents
...
automerge: be07f2a
* commit 'be07f2a853cb2a69eeecbd7b0d68f455b55edae6':
docs: Add SearchXonY to Common Intents
2014-10-28 19:25:10 +00:00
Joe Fernandez
56a8cb7fd1
am 5c0ed74b: am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
...
* commit '5c0ed74b3886c5765c576e9e427b93c76b37635a':
docs: Update timing of Android Wear app review
2014-10-28 19:22:45 +00:00
David Friedman
b648cabadf
am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
...
* commit 'b2d582d995622cc8379603cfadae7ee6d4163b3e':
Updates Notifications screenshot for Android 5.0.
2014-10-28 19:22:40 +00:00
Eric Gilmore
77760e753e
am 9a6aa0ff: am d126294a: Docs: Adding Android Studio instructions for adding IAB service.
...
* commit '9a6aa0ffa460aca1df9ef03501dd6b20b483198b':
Docs: Adding Android Studio instructions for adding IAB service.
2014-10-28 19:22:37 +00:00
Quddus Chong
eb07af2ced
am 6face8a0: am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
...
* commit '6face8a04c1aa695a744f12ee2ca0e18cdfb5ed0':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
2014-10-28 19:22:15 +00:00
Ricardo Cervera
be07f2a853
am f4e32145: am 61fcad92: docs: Add SearchXonY to Common Intents
...
* commit 'f4e32145a214b28522d67e748c0eff74aa915bf6':
docs: Add SearchXonY to Common Intents
2014-10-28 19:22:11 +00:00
Jason Monk
8c01dfc5af
Merge "QS: Bring back BT/Wi-Fi sub-panels" into lmp-mr1-dev
2014-10-28 18:45:34 +00:00
Jason Monk
09895be87e
Merge "Add hotspot icon to status bar" into lmp-mr1-dev
2014-10-28 18:27:06 +00:00
Shishir Agrawal
1ae88e3420
Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
...
The change above deleted these lines by mistake.
Bug: 18153840
Change-Id: I010c36f227e313cdf00a363f1f851e61a4db1af4
2014-10-28 11:19:14 -07:00
Joe Fernandez
5c0ed74b38
am 40bf63e0: Merge "docs: Update timing of Android Wear app review" into lmp-docs
...
* commit '40bf63e0f04b336325c370fbe4c6a8563ba5e2b7':
docs: Update timing of Android Wear app review
2014-10-28 18:15:33 +00:00
David Friedman
b2d582d995
am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
...
* commit '3c00bc01f9c6e82a0859201f74237998b24872da':
Updates Notifications screenshot for Android 5.0.
2014-10-28 18:15:28 +00:00
Eric Gilmore
9a6aa0ffa4
am d126294a: Docs: Adding Android Studio instructions for adding IAB service.
...
* commit 'd126294a8f954fb758d3f67bc5271014748ba9e7':
Docs: Adding Android Studio instructions for adding IAB service.
2014-10-28 18:15:24 +00:00
Quddus Chong
6face8a04c
am 2b4b3d28: cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
...
* commit '2b4b3d289bb26607c8db198dae4bcfbf6247b0c1':
cherrypick from lmp-dev docs: Updated GMS Javadocs for Moarchego release. Change-Id: I696098f563f774f585458aa658deefe03570c0ce
2014-10-28 18:15:20 +00:00
Ricardo Cervera
f4e32145a2
am 61fcad92: docs: Add SearchXonY to Common Intents
...
* commit '61fcad92ab55e3f874eb8fddde39dbe64235c2e5':
docs: Add SearchXonY to Common Intents
2014-10-28 18:15:17 +00:00
Deepanshu Gupta
b6444c4309
Fix multiple styles case in resource resolution.
...
When multiple styles are applied to a theme, we only remembered the last
one. This change fixes the issue.
Change-Id: I46490e882edc3eabe522a641c83366234b5bb25d
2014-10-28 11:11:10 -07:00
Deepanshu Gupta
4a605c6fa0
Use right theme for drawable inflation.
...
The theme information was lost when inflating drawables. As a result,
drawables inflated in the ActionBar did not have the right tint.
Change-Id: I13d5c78039e35085ed4902289fcb735bb15d972e
2014-10-28 11:11:09 -07:00
Jason Monk
5d325074b1
QS: Bring back BT/Wi-Fi sub-panels
...
Bluetooth has stayed pretty much the same, just came back.
Wi-Fi now shows the currently available networks like settings does.
Networks that require extra steps are taken to Settings to complete
the process.
Bug: 17722817
Change-Id: Idfcfd92f557b20168693ced26d4001f3708f08a4
2014-10-28 13:43:04 -04:00
Adam Lesinski
31b76b66b1
Merge "libandroidfw: Do not build device library when building SDK" into lmp-mr1-dev
2014-10-28 17:41:12 +00:00