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

48245 Commits

Author SHA1 Message Date
Jorim Jaggi
9988fb897a am 03a7c4c6: Fix shared drawable state 
* commit '03a7c4c6d4f30416b3fa6e9018f098c0fa41bbd5':
  Fix shared drawable state
 2015-06-02 15:11:58 +00:00
Selim Gurun
1d00071724 am 8a6d511d: Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev 
* commit '8a6d511dad3bb38f8cd1ec4557927bc6f307d4ed':
  Remove ViewAssistStructure and use the frameworks data structure
 2015-06-02 15:11:39 +00:00
Alan Viverette
dcb5ae7b18 am b0f94ae5: Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev 
* commit 'b0f94ae5d2eec2bb4a0bd1b60eb3db75417c1f8f':
  Always send VIEW_CLICKED event from AdapterView.performItemClick()
 2015-06-02 15:11:32 +00:00
Eino-Ville Talvala
35cd659800 am 717a2d09: Merge "Camera2: Remove isLoggable" into mnc-dev 
* commit '717a2d09fa2bb8ffb89e9e602ae97056736da4b0':
  Camera2: Remove isLoggable
 2015-06-02 15:11:27 +00:00
Jeff Brown
3834324e2a am 0505f7f2: Merge "Terminate loop properly when cursor window is full." into mnc-dev 
* commit '0505f7f2b5a2e45884a97eeb75c35086a7560c69':
  Terminate loop properly when cursor window is full.
 2015-06-02 15:11:10 +00:00
Jorim Jaggi
03a7c4c6d4 Fix shared drawable state 
Not calling mutate here had a side-effect making the icon in the
status bar untintable in SysUI.

Bug: 21566007
Change-Id: Ifb78c81ba7f04d496f14031ef635a6e964e6280e
 2015-06-01 23:59:00 +00:00
Selim Gurun
8a6d511dad Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev 2015-06-01 23:53:11 +00:00
Alan Viverette
b0f94ae5d2 Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev 2015-06-01 23:52:36 +00:00
Eino-Ville Talvala
717a2d09fa Merge "Camera2: Remove isLoggable" into mnc-dev 2015-06-01 23:47:32 +00:00
Alan Viverette
376c32f268 Always send VIEW_CLICKED event from AdapterView.performItemClick() 
This makes it consistent with View.performClick().

Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
 2015-06-01 16:41:42 -07:00
Selim Gurun
50b26a5c27 Remove ViewAssistStructure and use the frameworks data structure 
As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated  onProvideVirtualStructure API.

Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7
 2015-06-01 23:41:12 +00:00
Jeff Brown
0505f7f2b5 Merge "Terminate loop properly when cursor window is full." into mnc-dev 2015-06-01 23:34:25 +00:00
Jeff Brown
bb8c841e90 Terminate loop properly when cursor window is full. 
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
 2015-06-01 16:33:24 -07:00
Dianne Hackborn
7e32132a3c am 9ed0c410: Merge "Update VoiceInteractionService from API review." into mnc-dev 
* commit '9ed0c4109df27c0956f97b7a074c0b67daa0ebd8':
  Update VoiceInteractionService from API review.
 2015-06-01 22:41:17 +00:00
Dianne Hackborn
9ed0c4109d Merge "Update VoiceInteractionService from API review." into mnc-dev 2015-06-01 22:28:45 +00:00
Raph Levien
251058ea46 am fb2cdc4c: Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 
* commit 'fb2cdc4ca131ff95179414854eca02a098a29a8a':
  Revert "Revert "Use getRunAdvance to position cursor""
 2015-06-01 22:09:11 +00:00
Alan Viverette
95b120939f am e0e5c1cf: Merge "Clean up AbsListView constructor" into mnc-dev 
* commit 'e0e5c1cf1965302fcf177eaade372313504ea53a':
  Clean up AbsListView constructor
 2015-06-01 22:09:06 +00:00
Raph Levien
fb2cdc4ca1 Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 2015-06-01 21:56:36 +00:00
Alan Viverette
e0e5c1cf19 Merge "Clean up AbsListView constructor" into mnc-dev 2015-06-01 21:56:36 +00:00
Eino-Ville Talvala
c9314290f3 am 14438d12: Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 
* commit '14438d122c1e7ab88a6169bca13a35d50e76e91e':
  Camera2: Add tangential distortion coefficients
 2015-06-01 21:36:26 +00:00
Raph Levien
edb27f14ec Revert "Revert "Use getRunAdvance to position cursor"" 
This reverts commit 5730c97480.
 2015-06-01 14:34:47 -07:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
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
Eino-Ville Talvala
a78791f22a Camera2: Remove isLoggable 
Change-Id: I83b2c8321ab6b48cf68ef7a4d724559ead1a1790
 2015-06-01 12:44:20 -07:00
Raph Levien
5730c97480 Revert "Use getRunAdvance to position cursor" 
This reverts commit cb5499c850.

Bug: 21549197
 2015-06-01 12:40:42 -07:00
Dianne Hackborn
2ee5c368f8 Update VoiceInteractionService from API review. 
This may even manage to retain compatibility with existing
binaries!  (For now.)

Change-Id: I3b1386287a6b9b20b57ac2e2444fd6f458837277
 2015-06-01 11:42:04 -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
Alan Viverette
7eceda3020 Clean up AbsListView constructor 
Change-Id: I5ebe0074849228e5c7fd629df6d1055c867debc8
 2015-06-01 10:47:29 -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