Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,197 Commits 3 Branches 0 Tags
0c4214191fa93ff3c628a8461d6bd6ef2bb54d3a
Commit Graph

52643 Commits

Author SHA1 Message Date
Eino-Ville Talvala
0c4214191f am a2956f6e: am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit 'a2956f6e059e8565a0f6d48ea3c85cc827bffdb4':
  Camera2: Add tangential distortion coefficients
 2015-06-01 23:22:00 +00:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
Raph Levien
590e32212c am c73314bc: am cf8b3b1c: Merge "Revert "Use getRunAdvance to position cursor"" into mnc-dev 
* commit 'c73314bcb18f6879bb6f9923912ab38a0c831637':
  Revert "Use getRunAdvance to position cursor"
 2015-06-01 20:06:24 +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
Jorim Jaggi
6c49882975 am c8d5901b: am 1e47a8e0: Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 
* commit 'c8d5901bc83814c0dab281fc108de643cdd7b09d':
  Cleanup Keyguard handling when turning off screen
 2015-06-01 19:29:19 +00:00
Filip Gruszczynski
f02ace9b9b am 49895c6e: am 29c840eb: am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '49895c6eadcca35bfe4369b53c8fc2e13a603520':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:29:14 +00:00
Jorim Jaggi
1e47a8e096 Merge "Cleanup Keyguard handling when turning off screen" into mnc-dev 2015-06-01 19:13:11 +00:00
Filip Gruszczynski
29c840ebb0 am 11d50c9c: am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '11d50c9cc6f9990af5b9abf2058f6b7d4a5c8ae0':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 19:09:57 +00:00
Filip Gruszczynski
11d50c9cc6 am 06756f35: Dismiss or cancel in SwipeDismissLayout on screen off. 
* commit '06756f352d2046246bc147fa1f55d1dfbfcb37f5':
  Dismiss or cancel in SwipeDismissLayout on screen off.
 2015-06-01 18:57:21 +00:00
Alan Viverette
217974cbe7 am c6296a76: am 0ee2c1ae: Merge "Prevent crash when ColorStateList has unresolved attrs" into mnc-dev 
* commit 'c6296a76869422fd698ada889a74bc3129792db5':
  Prevent crash when ColorStateList has unresolved attrs
 2015-06-01 18:51:48 +00:00
Yin-Chia Yeh
ccb8616ab3 am 21f55342: am 254ed616: Merge "Camera2: Add missing LEGACY available keys" into mnc-dev 
* commit '21f55342d60e54c9e899aa746cf1a848f2910e61':
  Camera2: Add missing LEGACY available keys
 2015-06-01 18:51:43 +00:00
Andres Morales
ab21d60c24 am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit '9250d9727b5a71267cb33b535bdd959c1c03b11a':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 18:51:32 +00:00
Chien-Yu Chen
e573a5e23f am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit 'a56dee8edecddfe298d348c4006de6dea0e92374':
  Camera2: update docs for reprocess timestamp
 2015-06-01 18:51:27 +00:00
Alan Viverette
c820559a91 am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit 'af3134ae74538bf716da8ecdc0a07f29e5bdc145':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 18:51:12 +00:00
Alan Viverette
b88314ad72 am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 
* commit '508b6d2d576b1bdd528362fbb069961a9a65c2fb':
  Fix row/column order when unparcelling CollectionItemInfo
 2015-06-01 18:50:46 +00:00
Stuart Scott
c96a66dd03 am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset. 
* commit '378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 18:50:39 +00:00
Mady Mellor
fae785fccf am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 
* commit '8de52276a1f5faf83ea8147f0ddee74195279bba':
  Update button to BUTTON_STYLUS_PRIMARY
 2015-06-01 18:50:15 +00:00
Mady Mellor
ee8ac623ed am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 
* commit '8c189479a02dfae2874a622dd79abcbcded0c809':
  Update stylus button press recognition in View to use new MotionEvent APIs
 2015-06-01 18:50:09 +00:00
Mady Mellor
36ffd6d6b6 am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 
* commit 'ed836decd81c2b8d894bf2fd658f45a761f795cd':
  Update stylus button press recognition in GestureDetector to use new APIs
 2015-06-01 18:50:04 +00:00
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
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
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
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
Filip Gruszczynski
06756f352d Dismiss or cancel in SwipeDismissLayout on screen off. 
Fix for situation where you palm the device while swiping away an
ambiactive activity (or rather, when you swipe slightly an ambiactive
activity during palm gesture). This would make the activity stay in half
dismissed state. Instead when the screen goes off, we either dismiss or
cancel the dismissal.

Change-Id: I82e699c00c25bc97dd95bc6473a17e5817f7667a
 2015-06-01 10:09:45 -07: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
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
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
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