193519 Commits

Author SHA1 Message Date
Andrew Solovay
832654a857 am 2f85475c: am 7d36a250: docs: Quick spelling fix
* commit '2f85475c18d68d8719f20e4385dccb3ba0117d1a':
  docs: Quick spelling fix
2015-05-29 02:28:05 +00:00
Andrew Solovay
2f85475c18 am 7d36a250: docs: Quick spelling fix
* commit '7d36a25097099b958262e90d22992ce4cac485c9':
  docs: Quick spelling fix
2015-05-29 02:15:04 +00:00
John Spurlock
995a749f27 Zen: Use account name instead of calendar id in event conditions.
- Migrate the existing calendar attribute in the event condition
   from a long calendar id to the calendar account name.  More
   portable across a backup/restore.
 - Also skip restoring transient state (like the current condition
   state) from restored automatic rules.

Bug: 17755700
Change-Id: I9bdb421d2209e3ce90873008665c254d67c788d2
2015-05-28 22:13:03 -04:00
Sungsoo Lim
6dddc7d1a9 Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 2015-05-29 01:37:00 +00:00
Andrew Solovay
7d36a25097 docs: Quick spelling fix
Fix is quick and the misspelling was embarassing (spelled channel as
"chanel" three times) so I'm just going to +2 this myself.

Change-Id: Icc4dcd5f47ba2337db29cc81b6afe426e6986e95
2015-05-28 18:36:29 -07:00
Yorke Lee
d600966c39 Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 2015-05-29 00:55:12 +00:00
Glenn Kasten
ad43220384 Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 2015-05-29 00:12:54 +00:00
Raph Levien
71a2876497 Merge "Use getRunAdvance to position cursor" into mnc-dev 2015-05-29 00:05:09 +00:00
Alan Viverette
a4d66f3933 Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev 2015-05-28 23:55:32 +00:00
Makoto Onuki
0d889cdeb7 Merge "CountryDetector no longer requires location permissions." into mnc-dev 2015-05-28 23:54:09 +00:00
Yohei Yukawa
5176b5451a Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 2015-05-28 23:52:50 +00:00
Alan Viverette
94680e8667 Synchronize Theme.Material and Theme.Material light attributes
Adds a few attributes that were missing from either theme, ensures all
the attributes match up so that it's easier to scan through for errors.

Bug: 21490615
Change-Id: Iabfed8f61a7bc121e618164dee4121c41e82db09
2015-05-28 16:52:29 -07:00
Brian Attwell
19d9d0ca2e Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 2015-05-28 23:43:47 +00:00
Alan Viverette
3c436cb99f Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev 2015-05-28 23:43:25 +00:00
Andres Morales
a5705a4ada Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 2015-05-28 23:41:04 +00:00
Raph Levien
cb5499c850 Use getRunAdvance to position cursor
TextLine used to use getTextRunAdvances on a substring to compute a
cursor position, but this had a number of problems, especially when
the substring is a wider than the full string (as can happen in
certain Tamil ligatures).

This patch changes the implementation to use getRunAdvance, which was
explicitly designed for this use case.

We should also change Layout.getHorizontal to use the dual
getOffsetForAdvance, but that's basically a performance optimization,
the functionality should be basically equivalent.

Bug: 21125816
Change-Id: I669b85eaecfbf6f7aa6c6a9dddbf1a210eb94571
2015-05-28 16:36:36 -07:00
Brian Attwell
1a15ab91bc Rename "end" to "endExclusive" in addPhoneTtsSpan
Bug: 21209482
Change-Id: If505acecf5ca398560a9a23ea23ff8dd741e4025
2015-05-28 16:23:37 -07:00
Yohei Yukawa
85b883cae4 Merge "Clear the inset of previous IME when necessary." into mnc-dev 2015-05-28 23:20:12 +00:00
Yorke Lee
656eeb0402 Make ACTION_CONNECTION_SERVICE_CONFIGURE public
Bug: 21499146
Change-Id: I3b931231807eec0aed91832013c7c055005fc9ad
2015-05-28 16:12:46 -07:00
Santos Cordon
7cb0925e7e Merge "Add extras to Connections/Calls. (1/3)" into mnc-dev 2015-05-28 23:06:17 +00:00
Amit Mahajan
ff0c25ce31 Merge "Cleaning up logging in TelephonyManager." into mnc-dev 2015-05-28 23:05:29 +00:00
David Friedman
3675694775 am c397dde1: am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit 'c397dde17960f2308ecc3ef0b5143c95df8e160c':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.
2015-05-28 22:54:29 +00:00
Yohei Yukawa
2977eb7b6c Clear the inset of previous IME when necessary.
In the following scenario, the system continues keeping the previous
IME's inset in the display until the new IME shows its window.
1. an IME shows its software keyboard with reporting non-empty inset.
2. the user switches to another IME, which does not show the software
   keyboard when it is selected (e.g., because the physical keyboard
   is connected.)

This CL tries to address above situation by introducing a new state
flag IMMS#mShouldClearInsetOfPreviousIme to clear the previous IME's
inset when necessary.

Bug: 15922840
Change-Id: Ib04967f39b2529251e4835c42e9f99dba2cf43f2
2015-05-28 22:52:49 +00:00
James Cook
5cfaae4aae assist: Fix reported colors/styles for TextView/Switch
Changes to the data provided to AssistStructure:
* Text foreground color is correct even if the view has not yet been
painted.
* Text background color is now always 1 (TEXT_COLOR_UNDEFINED) for a
TextView, as it has no separate concept of background color.
* Switch now reports the text size/color/style of the label text
(usually user visible) rather than the on/off text on the button
itself (usually hidden in Material, and not usually revelant when
visible).

Bug: 21080375
Change-Id: I7e15f68d89510a76cab76031c2c8ca6ca3f32435
2015-05-28 15:52:44 -07:00
Doris Liu
a9ac835437 Merge "Clean up calls to Rect.intersect()" into mnc-dev 2015-05-28 22:51:42 +00:00
Glenn Kasten
626f0dc73b Merge "Deprecations are warnings not errors" into mnc-dev 2015-05-28 22:51:17 +00:00
Chris Craik
da28c8681a Merge "Fix round cap approximation to understand scale" into mnc-dev 2015-05-28 22:50:03 +00:00
David Friedman
b3af4f43d7 am 9ffbf9bd: am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit '9ffbf9bd9b40487b7edacdf0c790714f080494c4':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
2015-05-28 22:40:16 +00:00
Quddus Chong
2f9f8a38f1 am 01c4d8d3: am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit '01c4d8d357aef661d15ef770986e35be324c6d03':
  docs: Fixed training TOC formatting and broken link in TV training landing.
2015-05-28 22:40:01 +00:00
Doris Liu
adb8921453 Clean up calls to Rect.intersect()
This CL checks for the return value for Rect.intersect() for whether
there is actually an intersection before taking the return intersected
rect. In the case of no intersection (Rect.intersect() returns false),
an empty rect will be used as the intersection.

bug: 7368679
Change-Id: Ibda3bfd662f8ca83cb5662748d9be250243b72b2
2015-05-28 15:39:05 -07:00
Wale Ogunwale
c7cbdd11c3 Merge "Don't kill process with active service/receiver when task is removed." into mnc-dev 2015-05-28 22:38:03 +00:00
Chris Craik
2df124b854 Merge "Fix build" into mnc-dev 2015-05-28 22:35:00 +00:00
Chris Craik
469fb1efd6 Fix build
Change-Id: I7ee28c474aa821eb598f719723d87416a41537b9
2015-05-28 15:33:40 -07:00
Alan Viverette
4562f0bc89 Merge "Fix drawable CTS breakages" into mnc-dev 2015-05-28 22:33:33 +00:00
David Friedman
c397dde179 am 92451a97: Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs
* commit '92451a97271d014ab10ca4685beae728d53601b4':
  Docs: A few minor corrections: deleted obsolete sentences, fixed references.
2015-05-28 22:33:22 +00:00
David Friedman
92451a9727 Merge "Docs: A few minor corrections: deleted obsolete sentences, fixed references." into mnc-preview-docs 2015-05-28 22:16:20 +00:00
David Friedman
9ffbf9bd9b am ed8c6295: Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs
* commit 'ed8c62955aa6512fb4e929e59893c774ae894358':
  Docs: Fixes a broken link and a typo; deletes obsolete sentence/link.
2015-05-28 22:09:15 +00:00
Chris Craik
1cd7e4c3d0 Merge "Use path intersection instead of saveLayer+mesh to mask projected ripples" into mnc-dev 2015-05-28 22:03:08 +00:00
Deepanshu Gupta
5cd795a909 Merge "Fix NPE in BridgeContext.obtainStyledAttributes()" into mnc-dev 2015-05-28 21:59:12 +00:00
Quddus Chong
01c4d8d357 am dcfa7556: docs: Fixed training TOC formatting and broken link in TV training landing.
* commit 'dcfa755616504fb4443f4d79d936f30c3742d77a':
  docs: Fixed training TOC formatting and broken link in TV training landing.
2015-05-28 21:59:02 +00:00
David Friedman
ed8c62955a Merge "Docs: Fixes a broken link and a typo; deletes obsolete sentence/link." into mnc-preview-docs 2015-05-28 21:58:58 +00:00
Deepanshu Gupta
1421583bca Merge "Fix BridgeTypedArray.getType()" into mnc-dev 2015-05-28 21:58:58 +00:00
Deepanshu Gupta
d758e042ce Fix NPE in BridgeContext.obtainStyledAttributes()
Replace direct member access with getter that checks for nullness.

Change-Id: I4a56a0ee903ae7d8c89b91d74b128302e1965586
2015-05-28 14:57:43 -07:00
Deepanshu Gupta
5779ad71ea Fix BridgeTypedArray.getType()
Also includes some fixes for BridgeTypedArray.getInt() - when value is a
color, when value is an octal int, when value is true/false.

Bug: http://b.android.com/162438
Change-Id: I0b985ea3437be8018d0e116e7a599843cc7aacd6
2015-05-28 14:57:43 -07:00
Xiyuan Xia
79f38a2e32 Avoid keyguard UI layout dimensions underflow
KeyguardBouncer could have 0 as its content area size. Two transient
cases found: on device boot with a 0 sized StatusBarWindowView and
first time showing after user switching. Be defensive and protect
against the case.

Bug:21333202
Change-Id: I73eabf64c597ea3ae96ccfba1aecf702da8dfb23
2015-05-28 14:57:21 -07:00
Tony Mantler
b3543e0d1d Move ZoneGetter into SettingsLib
Change-Id: I8ecfc018e6de2514e9ada4c1b6fe9c8d71cc4e88
2015-05-28 14:49:11 -07:00
Tao Bao
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +00:00
Quddus Chong
dcfa755616 docs: Fixed training TOC formatting and broken link in TV training landing.
Change-Id: Ie159a1e5d3d84bfc20b2e2f0f5d4973d3880876d
2015-05-28 14:46:24 -07:00
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Evgenii Stepanov
bf7fe1e051 Merge "Update asan/app_process." into mnc-dev 2015-05-28 21:30:58 +00:00