69974 Commits

Author SHA1 Message Date
Alan Viverette
9be801c826 Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 2015-06-01 17:33:21 +00:00
Alan Viverette
7b2f86488c Don't ignore explicit dividerHeight of 0 specified in XML
Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
2015-06-01 10:30:21 -07:00
Alan Viverette
242b9c4eee Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 2015-06-01 16:39:10 +00:00
Stuart Scott
e3e314df4d Network Reset should have a lockdown like Factory Reset.
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb291431a7b39611d72f206b07e839891)
2015-06-01 16:31:00 +00:00
Mady Mellor
3aa33b3da0 Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 2015-06-01 16:17:37 +00:00
Mady Mellor
ef24bc0039 Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 2015-06-01 16:16:20 +00:00
Mady Mellor
cac7b2b175 Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 2015-06-01 16:16:00 +00:00
Alan Viverette
faeac960cc Fix row/column order when unparcelling CollectionItemInfo
Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
2015-06-01 09:03:27 -07:00
Filip Gruszczynski
99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 2015-06-01 15:42:42 +00:00
Neil Fuller
3b7f9615b7 Merge "Fix javadocs based on recent case consistency change" into mnc-dev 2015-06-01 12:04:44 +00:00
Neil Fuller
a5e389ddd2 Fix javadocs based on recent case consistency change
Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
(cherry-picked from commit 0e1c0e11e41c85487349fcb719d2ab1d1823534e)

Change-Id: I7b48958725b32b13bee00347585472f8073e7761
2015-06-01 13:02:18 +01:00
Erik Kline
ab06923576 Treat RTM_DELNEIGH as a transition to NUD_NONE
RTM_DELNEIGHs can happen naturally during garbage collection of STALE
entries, as well as when an interface is going down.  All other
transitions of interest at this time pass through FAILED.

Bug: 18581716
Bug: 21531726
Change-Id: Ib2a731dd6ad6ece478df6950d4cc7752588328a4
2015-06-01 12:46:24 +09:00
Barnaby James
6fad7e7f42 Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 2015-05-30 21:57:48 +00:00
Yohei Yukawa
512234f196 Merge "Close input session when the view is detached from the window." into mnc-dev 2015-05-30 00:52:30 +00:00
Yohei Yukawa
b13f015ab5 Close input session when the view is detached from the window.
This is the 3rd trial to fix Bug 20820914.

In followig CLs, we have tried to address a input session
leak when the focused view is detached from the focused
window by relying on IMM#focusOut() but failed because of
regressions like Bug 21508503.
- Ib4bd70ce0305a6bde6a929bcc6ad20a2b8402a97
- I219394178e4172bc47864297f1418e677dba25e5
- Id6afc8fc64512225578c62557b96c7dc2e969adf
- Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930
- I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f

What we have learned from Bug 21508503 was that re-enabling
IMM#focusOut() probably requires much more work than we
thought.  Also relying on IMM#focusOut() might be overkill
because the situation in Bug 20820914 is really special where
the focused view is detached from the focused window hence
we should be able to be fix the issue more conservatively
by closing input session when and only when the focused
view is detached from the focused view, rather than
re-enabling IMM#focusOut() globally.

Bug: 20820914
Change-Id: Iaf3fe2c065b5bf91e49a729ba46262114bb6da88
2015-05-29 17:44:51 -07:00
Jeff Brown
cb81d18367 Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 2015-05-30 00:33:07 +00:00
Doris Liu
1501da4bae Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev 2015-05-30 00:31:47 +00:00
Jeff Brown
416c49c404 Tell PhoneWindowManager when we start/finish interactive changes.
Added some new callbacks that can be used to more precisely trigger
certain behaviors that need to happen around the time the device
is put to sleep and locked.

Fixed an issue where the going to sleep signal might be sent too
early on devices that don't support ambient mode due to the extra
wakefulness change between DOZING and ASLEEP.  We are now track
the early / late interactive change work separately from the rest.

Bug: 21375811
Change-Id: I95387195e216ae92a6e45485bd1bd362e41aa45a
2015-05-29 17:28:40 -07:00
Alan Viverette
db2911321b Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev 2015-05-29 22:51:04 +00:00
Alan Viverette
87e1938be8 Replace PNG-based seekbar thumb animation with AVD
Adds optical inset support for VectorDrawable and GradientDrawable.

Bug: 19944181
Change-Id: I9df04d9fe17ad858413e7f93694bf37ee2c43c85
2015-05-29 15:12:14 -07:00
Yohei Yukawa
650a91356b Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev 2015-05-29 20:41:25 +00:00
Doris Liu
f042cd841f Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev 2015-05-29 20:28:21 +00:00
Yohei Yukawa
0b52ed02df Revert "Rely on IMM#focusOut() to close input session."
This reverts commit 41bb4953dad33b56b6d039d5bc87a574a0b70fe9.

Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930 caused Bug 21508503.
Since it looks like a timing issue, many other applications
could be affected potentially.

Bug 21508503 implies that re-enabling IMM#focusOut() globally
requires much more work than we thought.  Probably the memory
leak found in Bug 20820914 should be addressed in a more
conservative way at the moment, e.g., by plumbing events from
ViewGroup to IMMS.

Bug: 21508503
Bug: 20820914
Change-Id: I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f
2015-05-29 13:28:13 -07:00
Doris Liu
b134b5e376 Update doc to include how clipToPadding affects EdgeEffect
Bug: 19126514
Change-Id: I72c6ac20b4c72421137d97f77da5425e74f2b09a
2015-05-29 11:20:46 -07:00
James Cook
63b6320af4 Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 2015-05-29 17:30:23 +00:00
Geoff Mendal
66f49af2fe Revert "Import translations. DO NOT MERGE"
This reverts commit 29af96c4486c1baf8601482e54e6886139f49546.

Change-Id: Ie95b16f0ad99994e375484f1f2c6e99debbee37d
2015-05-29 15:04:40 +00:00
Geoff Mendal
29af96c448 Import translations. DO NOT MERGE
Change-Id: I08da4367a1ba723e7dfb701f47fba96b548e7f86
Auto-generated-cl: translation import
2015-05-29 07:27:57 -07:00
John Spurlock
6a2999073c Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 2015-05-29 13:22:33 +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
Doris Liu
9607fbe9d7 Fix calls to Rect.intersect() in package android.view
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: Ib874345210c8f62550627544d717e958d46cfe13
2015-05-28 17:17:28 -07: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
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
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
Yohei Yukawa
85b883cae4 Merge "Clear the inset of previous IME when necessary." into mnc-dev 2015-05-28 23:20:12 +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
Glenn Kasten
626f0dc73b Merge "Deprecations are warnings not errors" into mnc-dev 2015-05-28 22:51:17 +00:00
Tao Bao
165102f350 Merge "Wait for uncrypt to finish before rebooting" into mnc-dev 2015-05-28 21:48:29 +00:00
Dianne Hackborn
4573dddcce Merge "Add new API to set URI on AssistContent." into mnc-dev 2015-05-28 21:35:41 +00:00
Doris Liu
057d93971a Merge "Fix ScrollView's EdgeEffect to respect clipToPadding flag" into mnc-dev 2015-05-28 20:33:12 +00:00
Doris Liu
c81c082628 Fix ScrollView's EdgeEffect to respect clipToPadding flag
bug: 19126514
Change-Id: I21fe4fd3e2f1240ee31c51f9deac7f285ffe2408
2015-05-28 13:29:44 -07:00
Bryce Lee
3aeb5f848e am 2836b863: am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit '2836b863fb2aa593d19ffdcaacb8e9fd84dabb12':
  Introduce indirection for base micro themes.
2015-05-28 20:07:57 +00:00
Adam Lesinski
8a179cab79 Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev 2015-05-28 20:04:18 +00:00
Bryce Lee
2836b863fb am f33da518: Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev
* commit 'f33da5188d5d1d66c1697a84358f334018e9f905':
  Introduce indirection for base micro themes.
2015-05-28 19:52:17 +00:00
Adam Lesinski
049c88b48a BatteryStats: Output per-app wifi controller distribution
Currently we only output this data on checkin, adding the output
to dumpsys as well.

Change-Id: I649474b576d7341bbf54ff95c0b0e6fed367bcb0
2015-05-28 12:51:19 -07:00
Bryce Lee
f33da5188d Merge "Introduce indirection for base micro themes." into cw-d-mr1-dev 2015-05-28 19:39:45 +00:00
Peng Xu
08ecf676e6 Merge "Bug fix and documentation clarification" into mnc-dev 2015-05-28 18:57:46 +00:00