Chris Craik
abedca3983
Support Z reorder/shadows in root render node
...
bug:17310188
Change-Id: If2281218c458cf767d79b4d81944e2c8a23ca32c
2014-08-28 15:03:55 -07:00
Christopher Tate
fd5d43d09d
am a618e54a: am 2c85f54f: Merge "Correct misleading javadoc for BackupHelper" into lmp-dev
...
* commit 'a618e54ac648fd9b161ee08cd102ae31a1de17f8':
Correct misleading javadoc for BackupHelper
2014-08-28 21:14:08 +00:00
Alan Viverette
b1b267114c
Merge "Update action bar item widths, overflow menu, button, and spinner styles" into lmp-dev
2014-08-28 21:05:04 +00:00
Alan Viverette
f023c2530a
Update action bar item widths, overflow menu, button, and spinner styles
...
Manually modifies the overflow button hotspot bounds so that the ripple
appears to be centered on the overflow icon. Adds styleable and parsing
for list popup window offsets. Updates spinner text appearance to be
consistent with drop down item text appearance. Also updates horizontal
inner padding in buttons.
BUG: 17305079
BUG: 17304391
BUG: 17302567
Change-Id: Iafddfef290078de968894a3b443ba9f60f84c6d4
2014-08-28 13:55:18 -07:00
Christopher Tate
a43e2409ad
Merge "Correct misleading javadoc for BackupHelper" into lmp-dev
2014-08-28 20:53:36 +00:00
Julia Reynolds
9130ae4501
am fa39108f: am d266bd44: Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
...
* commit 'fa39108f4a59e96915d9efbddd2548d49611745d':
Audio/Micrphone user restriction/multiuser updates.
2014-08-28 20:01:16 +00:00
Dianne Hackborn
85facfc1b7
am c297cc71: am f63aa97c: Merge "Fix issue #17289876 : startActivityFromRecents appears to launch the wrong task" into lmp-dev
...
* commit 'c297cc71d1382b3a492087d64205ebe6f13b164a':
Fix issue #17289876 : startActivityFromRecents appears to launch the wrong task
2014-08-28 20:01:12 +00:00
Raph Levien
26c87cfb58
Ignore width of trailing whitespace for computing ellipsis
...
We used the full width of a line, including trailing spaces, to compute
ellipsis, sometimes causing spurious ellipsization when the space pushed
it past the layout width. This patch uses only the width up to the last
graphing character.
Fix for bug 17186801 "First line of title text is getting truncated even
if there's space on second line"
Change-Id: I49d07c18c8dd1d3b279f591224d23e10645dc8c0
2014-08-28 12:56:51 -07:00
Julia Reynolds
a8528c6420
Merge "Audio/Micrphone user restriction/multiuser updates." into lmp-dev
2014-08-28 19:41:42 +00:00
Winson Chung
19042f10fa
am ef390cca: am 62354353: Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
...
* commit 'ef390cca57352e4284827981d39d6cb600b2811d':
Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
2014-08-28 19:38:45 +00:00
Dianne Hackborn
2db754ac6e
Merge "Fix issue #17289876 : startActivityFromRecents appears to launch the wrong task" into lmp-dev
2014-08-28 19:33:08 +00:00
Christoph Studer
2a7058d18d
am a03d8335: am 6049c4b7: Merge "NoListener: Factor out ZEN mode API" into lmp-dev
...
* commit 'a03d8335fea5e19e56e901e15213f0db16d570b6':
NoListener: Factor out ZEN mode API
2014-08-28 19:23:19 +00:00
Dianne Hackborn
93d0678e80
am 82f7dc78: am c6273338: Merge "Fix issue #16953886 : History and batterystats checkin summary..." into lmp-dev
...
* commit '82f7dc780dc2fb1c877fce19bea9a9e92b0a0bac':
Fix issue #16953886 : History and batterystats checkin summary...
2014-08-28 19:23:14 +00:00
Winson Chung
8bd5d69008
Merge "Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)" into lmp-dev
2014-08-28 19:15:10 +00:00
Christoph Studer
45c0d5838f
Merge "NoListener: Factor out ZEN mode API" into lmp-dev
2014-08-28 18:59:41 +00:00
Dianne Hackborn
7e7f9a3f7c
Merge "Fix issue #16953886 : History and batterystats checkin summary..." into lmp-dev
2014-08-28 18:58:16 +00:00
Dianne Hackborn
d7c9289f93
Fix issue #17289876 : startActivityFromRecents appears to launch the wrong task
...
It would be good to actually bring the task to the front.
Also, make the flow when inTask is provided better match what happens when
we go looking for a task on our own.
And this includes another fix that was supposed to be part of a different
change but I forgot this class is part of the framework project now.
Change-Id: I3cf05f2e585c0fd7a0dbb7c7cf9fb1655764dd93
2014-08-28 11:38:13 -07:00
George Mount
05951ddc63
am fc83d404: am 077805bf: Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev
...
* commit 'fc83d40438a331a6f06da4b4cb27c85621ef3019':
Call SharedElementListener#setSharedElementEnd on back.
2014-08-28 18:27:48 +00:00
George Mount
bc1d08849a
am 7ffe01f2: am b0333ac9: Merge "Allow arbitrarily-added shared elements." into lmp-dev
...
* commit '7ffe01f2158212c6b9c46e23e3167e832fe53c5f':
Allow arbitrarily-added shared elements.
2014-08-28 18:27:43 +00:00
Alan Viverette
16a24bc435
Cancel the date picker dialog when BUTTON_NEGATIVE is clicked
...
BUG: 17308290
Change-Id: I2cad1ece9eefc3c48e7574498ff9f79fe60c5f80
2014-08-28 11:19:59 -07:00
Nancy Chen
389eda0398
am 48add9d4: am 2ead90e0: Merge "Add field for sub_id in call log for sprout database." into lmp-dev
...
* commit '48add9d40e014cd585058358bbbb2e48fc10fe74':
Add field for sub_id in call log for sprout database.
2014-08-28 18:18:44 +00:00
Jose Lima
7fa75c1d58
am 0cdcdf5c: am 61c45885: Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev
...
* commit '0cdcdf5cd1517760dcff30004a3e0f5686e68440':
Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
2014-08-28 18:18:39 +00:00
George Mount
de18420aff
Merge "Call SharedElementListener#setSharedElementEnd on back." into lmp-dev
2014-08-28 18:05:40 +00:00
George Mount
01abcaa295
Merge "Allow arbitrarily-added shared elements." into lmp-dev
2014-08-28 18:02:27 +00:00
Nancy Chen
d1a5a46368
Merge "Add field for sub_id in call log for sprout database." into lmp-dev
2014-08-28 17:55:50 +00:00
Yigit Boyar
4286fa20f5
am 9662e6de: am 129ca22e: Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev
...
* commit '9662e6ded368d0eeaca0ca857be3c32eeb5f3f40':
Use a weak observable in AutoCompleteTextView
2014-08-28 17:51:58 +00:00
Jose Lima
d3458a9c34
Merge "Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()" into lmp-dev
2014-08-28 17:49:32 +00:00
Yigit Boyar
3e92d2ec47
Merge "Use a weak observable in AutoCompleteTextView" into lmp-dev
2014-08-28 17:33:36 +00:00
Christoph Studer
85a384b425
NoListener: Factor out ZEN mode API
...
Bug: 17255109
Bug: 17295014
Change-Id: I7e1f6e29b8a23b8e59a8615a8012a86bd5dd22d7
2014-08-28 19:28:12 +02:00
Winson Chung
48a10a56e9
Change API to return thumbnail size instead of individual dimensions. (Bug 17295512)
...
- Fixing issue where we were pulling the thumbnail dimensions too early in AMS. (Bug 17286904)
- Simplifying the Recents code between start & configuration change
Change-Id: I6d667cbf37b844939e5fc466da613bb78ca05082
2014-08-28 10:23:40 -07:00
Chet Haase
b198e5e475
am b6c2cf70: am f223babb: Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
...
* commit 'b6c2cf70d0e4918093e1ca3d1056facbf196ac7c':
Canceling ViewPropertyAnimator now removes pending actions
2014-08-28 17:09:29 +00:00
Robert Greenwalt
c8ff9c4d9f
am 709b9740: am 97733309: Merge "Clean up Connectivity Logging." into lmp-dev
...
* commit '709b97402db136331f2a58c1a0b612b4f0fed365':
Clean up Connectivity Logging.
2014-08-28 16:54:42 +00:00
Chet Haase
06c34e7cbe
Merge "Canceling ViewPropertyAnimator now removes pending actions" into lmp-dev
2014-08-28 16:42:27 +00:00
Jeff Sharkey
896fe7aa04
am cb1236be: am 7cb28e7b: Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
...
* commit 'cb1236be15023152535cedfb9ed20a0c8b94ada1':
Define EXTRA_SIZE for ContentProviders.
2014-08-28 16:36:01 +00:00
Robert Greenwalt
2836dbb953
Merge "Clean up Connectivity Logging." into lmp-dev
2014-08-28 16:29:55 +00:00
Jeff Sharkey
ca5186e9d5
Merge "Define EXTRA_SIZE for ContentProviders." into lmp-dev
2014-08-28 16:12:47 +00:00
Nancy Chen
3a78092127
Add field for sub_id in call log for sprout database.
...
Adding sub_id as a column in the calls table to make the sprout and
non-sprout contacts databases consistent.
Bug: 14990572
Change-Id: I82d9fe65e6cdf4e10b6115a8565c2be3a6f93562
2014-08-28 08:47:27 -07:00
Chet Haase
5637b7d239
Canceling ViewPropertyAnimator now removes pending actions
...
Normally, calling cancel() on ViewPropertyAnimator() will cancel any
running animations as well as any associated actions (layers and
start/end actions). But if the animation is canceled before the first
frame, these other actions are still pending and will not be canceled.
This fix also cancels these pending actions.
Issue #17296082 VPA.cancel() doesn't clear the end action
Change-Id: If104d21c1e2d64516500048a06ba217284732ef0
2014-08-28 07:53:59 -07:00
Selim Cinek
f1d8349bb3
am b6f60439: am 1bebe3c0: Added a warning when the profile has an owner
...
* commit 'b6f60439e7ce36d582c508075f030e04933f0d0f':
Added a warning when the profile has an owner
2014-08-28 13:49:25 +00:00
Selim Cinek
24ac55e658
Added a warning when the profile has an owner
...
Also fixed a bug where a post in the QSFooter
was not always on the mainthread leading to a
crash.
Bug: 17066115
Change-Id: Iea9e1032973058ed5e63e70da4dc0bcf34fa59a3
2014-08-28 15:09:28 +02:00
Esteban Talavera
20b41f85f0
am da3a8981: am f734047a: Renamed getUninstallBlocked to isUninstallBlocked
...
* commit 'da3a898110b91fb913e539e38b68233d12bf54ca':
Renamed getUninstallBlocked to isUninstallBlocked
2014-08-28 10:49:21 +00:00
Terry Heo
959d2db12c
CEC: Implement dump() of HdmiControlService
...
In addition, use hexadecimal address representation in HdmiPortInfo.toString()
Bug: 17310007
Change-Id: Iaba8f718f86a18a23b50f983053c7589dcdcfaf8
2014-08-28 19:07:59 +09:00
Esteban Talavera
729b2a6c2f
Renamed getUninstallBlocked to isUninstallBlocked
...
As per API review.
Bug: 17297103
Change-Id: Icb4ceded317b0df4deb0f5221512541a632e150b
2014-08-28 10:56:18 +01:00
Jose Lima
fcf7083eab
Renamed Activity.onVisibleBehindCancelled() to Activity.onVisibleBehindCanceled()
...
API review request.
Bug: 17288987
Change-Id: If63f847ce630a57e4aa1e5291befe2863cb7e0c7
2014-08-27 23:09:05 -07:00
Jae Seo
41b12ff46b
am edf8161e: am 9d86176d: Merge "Add android.software.live_tv feature" into lmp-dev
...
* commit 'edf8161ea45f134b0732634aac8afa7836f1bab1':
Add android.software.live_tv feature
2014-08-28 06:07:54 +00:00
Jae Seo
11cfe2c036
Merge "Add android.software.live_tv feature" into lmp-dev
2014-08-28 05:50:19 +00:00
Selim Gurun
9342a657d9
am 405c03ad: am 8f1de303: Merge "Address API Feedback" into lmp-dev
...
* commit '405c03aded694e85ee278f650a19988a8c17f8c4':
Address API Feedback
2014-08-28 03:39:27 +00:00
John Reck
59f71093fe
am 969f3860: am ad0faa70: Merge "Animator stuff" into lmp-dev
...
* commit '969f3860d940bdcaa66441d561448cca92ebd8ea':
Animator stuff
2014-08-28 03:39:21 +00:00
Svetoslav
eebff5a5a1
am 84805a00: am b4bd1427: Merge "Fix live region updates." into lmp-dev
...
* commit '84805a00a3ed0234948b76274c93a60f36e96e00':
Fix live region updates.
2014-08-28 03:39:16 +00:00
Yorke Lee
1238a8e7d3
am 9aedb262: am e4ba7f2b: Merge "Update value of EXTRA_CALL_TYPE_FILTER" into lmp-dev
...
* commit '9aedb262a98532e30658c00e5acff33c1b7c32a9':
Update value of EXTRA_CALL_TYPE_FILTER
2014-08-28 03:38:18 +00:00