Commit Graph

48201 Commits

Author SHA1 Message Date
Alan Viverette
7f1fb67046 am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev
* commit '242b9c4eee9d42d02fd2259ffe2124234653aaf2':
  Fix row/column order when unparcelling CollectionItemInfo
2015-06-01 16:45:48 +00:00
Stuart Scott
ba2a4e4a92 am e3e314df: Network Reset should have a lockdown like Factory Reset.
* commit 'e3e314df4d52881225326d426a76e3e7f1bc40d3':
  Network Reset should have a lockdown like Factory Reset.
2015-06-01 16:45:42 +00: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 94b038bbb2)
2015-06-01 16:31:00 +00:00
Mady Mellor
a8fa3e50ea am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev
* commit '3aa33b3da04774d76e1a65b749667450dc81532b':
  Update button to BUTTON_STYLUS_PRIMARY
2015-06-01 16:24:56 +00:00
Mady Mellor
e531d8135d am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev
* commit 'ef24bc00399ceb627e9780f05eb68f955e6bd495':
  Update stylus button press recognition in View to use new MotionEvent APIs
2015-06-01 16:24:51 +00:00
Mady Mellor
16ca42fddf am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev
* commit 'cac7b2b17505dd3d84966ff15abf5e5343783dee':
  Update stylus button press recognition in GestureDetector to use new APIs
2015-06-01 16:24:46 +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
31e530bb5b am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev
* commit '99bcc3eee23ed8bd15bd108d068d6f9f694e4393':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
2015-06-01 15:52:55 +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
Neil Fuller
d37bdedb74 am 3b7f9615: Merge "Fix javadocs based on recent case consistency change" into mnc-dev
* commit '3b7f9615b70c7e62a018eb1abf0a52c8ba3e4d27':
  Fix javadocs based on recent case consistency change
2015-06-01 12:19:34 +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
Erik Kline
0deacfdbc2 am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE
* commit 'ab06923576d4a49bc84c94badfcebcb7f6b103a8':
  Treat RTM_DELNEIGH as a transition to NUD_NONE
2015-06-01 07:36:49 +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
471a65c069 am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev
* commit '6fad7e7f42a4269a51d2f5aa785c5f253c2b4e45':
  Minor VoiceInteractor documentation fixes.
2015-05-30 22:12:59 +00:00
Barnaby James
6fad7e7f42 Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 2015-05-30 21:57:48 +00:00
Yohei Yukawa
5c1e058425 am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev
* commit '512234f1961bd98df8087e1f94f1361e280cc28a':
  Close input session when the view is detached from the window.
2015-05-30 01:04:28 +00:00
Jeff Brown
ec0396cd7c am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev
* commit 'cb81d183672a3d9858ade10a997990c5d66a1be3':
  Tell PhoneWindowManager when we start/finish interactive changes.
2015-05-30 01:04:02 +00:00
Doris Liu
3b2c207e87 am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev
* commit '1501da4bae9b50be885de4480d0f318b7e8da27d':
  Fix calls to Rect.intersect() in package android.view
2015-05-30 01:03:55 +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
96e7a85cc9 am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev
* commit 'db2911321b1cb0870d10baab370c93da13a91067':
  Replace PNG-based seekbar thumb animation with AVD
2015-05-29 23:00:52 +00: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
37039ccf31 am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev
* commit '650a91356b59fe4100f624c0b32d397ec00d51d9':
  Revert "Rely on IMM#focusOut() to close input session."
2015-05-29 20:53:23 +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
27cbf5eaa1 am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev
* commit 'f042cd841fcc6607bb84f8ddb25db3f4b6ddb3e0':
  Update doc to include how clipToPadding affects EdgeEffect
2015-05-29 20:36:53 +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
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
f3d017dd38 am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev
* commit '63b6320af4302c0d190bbfaba739049b59c2418b':
  assist: Fix reported colors/styles for TextView/Switch
2015-05-29 17:40:47 +00: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
fbfe254e24 am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev
* commit '6a2999073ce4d4ac203e7e2d7b40aaaa794851d4':
  Zen: Use account name instead of calendar id in event conditions.
2015-05-29 13:31:48 +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
Raph Levien
4900619bc1 am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev
* commit '71a2876497385cd61083cf3a7a86db068ae4b0b3':
  Use getRunAdvance to position cursor
2015-05-29 00:25:52 +00:00
Yohei Yukawa
c96dceefd9 am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev
* commit '5176b5451a8447de3ff86712a95efd6af93aa556':
  Rely on IMM#focusOut() to close input session.
2015-05-29 00:25:28 +00:00
Andres Morales
a93089711a am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev
* commit 'a5705a4ada8e719ebf73ed757c514b74785e7ae3':
  [partition checking] re-enable bootimage/bootloader, add recovery
2015-05-29 00:25:09 +00:00
Yohei Yukawa
d9dacd4c5e am 85b883ca: Merge "Clear the inset of previous IME when necessary." into mnc-dev
* commit '85b883cae410bd2b8e1dc5c34265ed253d758e86':
  Clear the inset of previous IME when necessary.
2015-05-29 00:24:59 +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