Commit Graph

52601 Commits

Author SHA1 Message Date
Filip Gruszczynski
183f8fa450 am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev
* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
2015-06-01 18:49:47 +00:00
Erik Kline
413cd5a329 am 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE
* commit '8ef5ac13abf3602c195ea972a9c5ce5626d1a6dd':
  Treat RTM_DELNEIGH as a transition to NUD_NONE
2015-06-01 17:11:37 +00:00
Barnaby James
fab12f200a am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
* commit '4ead90a1c200f144e91d176b4c1627b1bad37f45':
  Minor VoiceInteractor documentation fixes.
2015-06-01 17:09:02 +00:00
Yohei Yukawa
64f5d4f031 am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev
* commit 'd9597642ebbe4601568ad73ff20281c237e606fa':
  Close input session when the view is detached from the window.
2015-06-01 17:07:48 +00:00
Jeff Brown
19d50b8f79 am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
* commit '82f7affa196d9efbca7f47fdb6ce96b498172829':
  Tell PhoneWindowManager when we start/finish interactive changes.
2015-06-01 17:07:34 +00:00
Doris Liu
82b455892c am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
* commit 'dab830615ebb6c4dc31fc52b05143a950142f7fe':
  Fix calls to Rect.intersect() in package android.view
2015-06-01 17:07:29 +00:00
Alan Viverette
e2fa70eaea am 8dbdd860: am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
* commit '8dbdd860e57618a5738b5c39758fc5feb75ef58f':
  Replace PNG-based seekbar thumb animation with AVD
2015-06-01 17:02:24 +00: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
Yohei Yukawa
1d95daf37d am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '4ad0161a45a872981199285a0c72d2e79de44ba5':
  Revert "Rely on IMM#focusOut() to close input session."
2015-06-01 15:28:01 +00:00
Doris Liu
0040c7d2ba am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit 'c271314154efc468022b9464a8d18eadf07a7183':
  Update doc to include how clipToPadding affects EdgeEffect
2015-06-01 15:27:54 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
2015-06-01 15:26:00 +00:00
John Spurlock
f7043e284a am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '015a95ff35e5e9de959c10d082fbe2e10c58885c':
  Zen: Use account name instead of calendar id in event conditions.
2015-06-01 15:24:42 +00:00
Raph Levien
1091defa85 am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '023973ecc66c62f2b83d9154097bb370966ed96d':
  Use getRunAdvance to position cursor
2015-06-01 15:23:16 +00:00
Yohei Yukawa
47d691baf7 am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '92086e06ad3167ebfadbc746d32e86c335878a8f':
  Rely on IMM#focusOut() to close input session.
2015-06-01 15:22:58 +00:00
Andres Morales
0b8ddb4792 am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery
2015-06-01 15:22:42 +00:00
Neil Fuller
1d66281e4b am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change"
* commit '59b240404f19f3450e710e07a90d4e8d35fabcaf':
  Fix javadocs based on recent case consistency change
2015-06-01 12:26:01 +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 0e1c0e11e4)

Change-Id: I7b48958725b32b13bee00347585472f8073e7761
2015-06-01 13:02:18 +01:00
Neil Fuller
e761938c39 Merge "Fix javadocs based on recent case consistency change" 2015-06-01 12:01:44 +00: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
Chad Brubaker
533d164ed0 am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish"
* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish
2015-05-29 21:44:34 +00: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 41bb4953da.

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
Chad Brubaker
9ce30624a4 Add optional additional entropy to finish
If provided the extra entropy will be added to the device before calling
finish. If entropy is provided and the device does not support supplying
additional entropy then finish will fail with KM_ERROR_UNIMPLEMENTED.

Change-Id: If26be118bf382604f6f8e96e833b76e6f9e94d58
2015-05-29 12:32:56 -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
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
Yohei Yukawa
c6fb8f827d am 98e88900: am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
* commit '98e8890022119bc9d053b55d2f05617b6d7bacb9':
  Clear the inset of previous IME when necessary.
2015-05-29 00:29:14 +00: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
Yohei Yukawa
5176b5451a Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 2015-05-28 23:52:50 +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
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
Tao Bao
69dd849ed3 am 5f90a8c5: am 165102f3: Merge "Wait for uncrypt to finish before rebooting" into mnc-dev
* commit '5f90a8c5bd689afa8403d7dce967bf96a82880c4':
  Wait for uncrypt to finish before rebooting
2015-05-28 22:35:45 +00:00
Dianne Hackborn
e6562d903b am da71e100: am 4573dddc: Merge "Add new API to set URI on AssistContent." into mnc-dev
* commit 'da71e1004082427e36db21c39f47b13e0afa8ed4':
  Add new API to set URI on AssistContent.
2015-05-28 22:35:39 +00:00
Doris Liu
937b7ad9f7 am 7b554a8f: am 057d9397: Merge "Fix ScrollView\'s EdgeEffect to respect clipToPadding flag" into mnc-dev
* commit '7b554a8f1513c1737a9326b7e99b83fe5aab53f0':
  Fix ScrollView's EdgeEffect to respect clipToPadding flag
2015-05-28 22:34:57 +00:00
Adam Lesinski
1d4db0e4a6 am e87126e8: am 8a179cab: Merge "BatteryStats: Output per-app wifi controller distribution" into mnc-dev
* commit 'e87126e8915785e1801580d44ea181304bbfa701':
  BatteryStats: Output per-app wifi controller distribution
2015-05-28 22:34:37 +00:00