Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,818 Commits 3 Branches 0 Tags
50bbdadad405ee7362dac3094cf4ac3ebfd718f0
Commit Graph

48219 Commits

Author SHA1 Message Date
Raph Levien
50bbdadad4 am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'cf8b3b1c56b5aaaa8552c1bc9bb88c8a1285f99f':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 19:55:22 +00:00
Raph Levien
cf8b3b1c56 Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 2015-06-01 19:45:43 +00:00
Raph Levien
5730c97480 Revert "Use getRunAdvance to position cursor" 
This reverts commit cb5499c850.

Bug: 21549197
 2015-06-01 12:40:42 -07:00
Alan Viverette
c3f51ca6af am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 
* commit '0ee2c1aef93987663968dbfd693cc5eda06c8244':
  Prevent crash when ColorStateList has unresolved attrs
 2015-06-01 18:15:26 +00:00
Yin-Chia Yeh
49824dec6b am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 
* commit '254ed616712866518225dbc156182f39339e76a4':
  Camera2: Add missing LEGACY available keys
 2015-06-01 18:15:20 +00:00
Andres Morales
57f5f21173 am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit '0fddb1a63109e2d4a92327ea1ffc74307292be48':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 18:15:10 +00:00
Chien-Yu Chen
ea339b138f am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit '61bae6d8de096c8982074ac507554fda42a802a5':
  Camera2: update docs for reprocess timestamp
 2015-06-01 18:15:05 +00:00
Alan Viverette
0ee2c1aef9 Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 2015-06-01 18:00:06 +00:00
Yin-Chia Yeh
254ed61671 Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 2015-06-01 17:53:42 +00:00
Andres Morales
0fddb1a631 Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 2015-06-01 17:50:58 +00:00
Chien-Yu Chen
61bae6d8de Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 2015-06-01 17:50:58 +00:00
Andres Morales
c97b92e346 Revert "[partition checking] re-enable bootimage/bootloader, add recovery" 
This reverts commit 831e01a89e.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a
 2015-06-01 17:50:43 +00:00
Alan Viverette
50ba321fbc Prevent crash when ColorStateList has unresolved attrs 
Bug: 21471789
Change-Id: Ieba6ab62b5e82eb716934a65efb6bfef2fc4e15a
 2015-06-01 10:48:55 -07:00
Yin-Chia Yeh
71c605c54a Camera2: Add missing LEGACY available keys 
Add missing available characteristics keys.

Bug: 20883751
Change-Id: I6f07deca4b469de720f44a663ce9140658c346f1
 2015-06-01 10:44:04 -07:00
Alan Viverette
fcf730053d am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit '9be801c8269358ded8e4bed6103ca2346da7e179':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 17:43:56 +00:00
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
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
Chien-Yu Chen
6216e4e06f Camera2: update docs for reprocess timestamp 
Bug: 21112186
Change-Id: Ie49c00c96f7e69b672df5afa34e06e3dcd49490f
 2015-05-29 17:21:11 -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