drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
108,029 Commits 1 Branch 0 Tags
Commit Graph

108029 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Spurlock
e804cb56d0 Stabilize hideybar confirmation toast. 
Remove gravity workaround no longer needed after recent window
manager layout fix.

Also migrate instable code-based toast text calculation to use
the resource system properly.

Change-Id: Ifa380e387389ed9917336ad19dfde49f67a5fb10
 2013-06-14 14:04:21 -04:00
Adam Powell
77b7c33a7a Merge "Don't save ScrollView/HorizontalScrollView saved state for old apps" 2013-06-14 01:28:25 +00:00
Chris Craik
d1f9aaa5d7 Merge "Fix various draw ops that may incorrectly not scissor" 2013-06-14 01:06:30 +00:00
Adam Powell
90f339a5a3 Don't save ScrollView/HorizontalScrollView saved state for old apps 
Older apps may have given IDs to ScrollViews and views of a different
class in layouts that vary by configuration. Now that ScrollViews save
state this causes ClassCastExceptions when trying to restore instance
state.

Only save new instance state for ScrollView/HorizontalScrollView for
apps targeting post-API 18.

Change-Id: Icaa095cd20bef35dddc225a17c5a8e30b3faea02
 2013-06-13 17:44:04 -07:00
Geremy Condra
e08d54b92e Merge "Add NetworkManagement methods for netd uid binds" 2013-06-13 23:30:49 +00:00
Chris Craik
39a908c1df Fix various draw ops that may incorrectly not scissor 
bug:8965976

Also consolidates quickReject scissor-ing and scissor-less paths.
Renamed plain 'quickReject' method, as it has sideEffects beyond what
the java and skia canvases do.

Change-Id: I4bdf874d3c8f469d283eae1e71c5e7ea53d47016
 2013-06-13 16:16:13 -07:00
Alan Viverette
256a5f8cda Merge "Postpone creating new drawables for DrawableContainerState." 2013-06-13 23:03:03 +00:00
Romain Guy
4969fecf07 Merge "Fix possible NPE when a ViewRoot doesn't have a view" 2013-06-13 22:27:26 +00:00
Romain Guy
70d4c5a0fe Fix possible NPE when a ViewRoot doesn't have a view 
Change-Id: I8f76a657fa44fc5c7e0bec3e609eaf49e269910f
 2013-06-13 15:26:50 -07:00
Alan Viverette
f390f770ee Postpone creating new drawables for DrawableContainerState. 
When creating a DrawableContainerState from a constant state, calls to
ConstantState.newDrawable() are postponed and made as they are needed.

Bug: 9280861
Change-Id: I03c93a43ee00aca3ff618d66d7f507f1722538d1
 2013-06-13 15:11:16 -07:00
Romain Guy
735760e3c2 Merge "Add new Query class for debugging" 2013-06-13 22:10:22 +00:00
Romain Guy
7f4307668b Add new Query class for debugging 
This class can be used to perform occlusion queries. An occlusion query
can be used to test whether an object is entirely hidden or not.

Change-Id: Ida456df81dbe008a64d3ff4cb7879340785c6abf
 2013-06-13 14:58:32 -07:00
Scott Main
539d270516 am 11caa0b6: am f52532de: am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '11caa0b6d9202e27e24daf6cef030ec9599f7af4':
  add ninepatch search tag
 2013-06-13 14:58:16 -07:00
Scott Main
11caa0b6d9 am f52532de: am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'f52532de2a3da2f41ddc28e25d2883d45f189018':
  add ninepatch search tag
 2013-06-13 14:56:03 -07:00
Scott Main
f52532de2a am cb2a8505: am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit 'cb2a85058e24ecd35349b5470e402bcb52df2d6b':
  add ninepatch search tag
 2013-06-13 14:54:48 -07:00
Scott Main
cb2a85058e am 695896a4: am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '695896a46578e7ad4e540151e799a9f0b8828ad1':
  add ninepatch search tag
 2013-06-13 14:51:47 -07:00
Scott Main
695896a465 am 46c8931f: Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 
* commit '46c8931ffc78f5204b34f7ba5098defbc318b7a4':
  add ninepatch search tag
 2013-06-13 14:49:20 -07:00
Scott Main
46c8931ffc Merge "add ninepatch search tag" into jb-mr1.1-ub-dev 2013-06-13 21:47:27 +00:00
Alan Viverette
7d8885df35 Merge "Ensure page up/down always moves to first/last selectable item." 2013-06-13 20:32:20 +00:00
Alan Viverette
af9c5ea240 Ensure page up/down always moves to first/last selectable item. 
Bug: 5088505
Change-Id: Ie73705f46602003b1c02fa08427dc940ad9f9b8a
 2013-06-13 13:27:59 -07:00
Adam Powell
1241e39f38 Merge "Show the default activity icon in the action bar if one is not supplied" 2013-06-13 20:25:32 +00:00
Adam Powell
0a317e9116 Show the default activity icon in the action bar if one is not supplied 
Fix a regression where the system default activity icon was not used
in the action bar if neither the activity nor application supplied
one.

Bug 9409846

Change-Id: I80a95a0bee511f21cd326372edaf6af811272825
 2013-06-13 13:15:43 -07:00
buzbee
34761a3abf Merge "Process new system property for max JIT cache size" 2013-06-13 19:57:25 +00:00
Chris Craik
b28f8c82d9 Merge "Reset batching state when overlap batch deletion occurs" 2013-06-13 19:24:17 +00:00
Jeff Sharkey
6fbb5553a5 Merge "Protect more system broadcasts." 2013-06-13 18:55:21 +00:00
Chris Craik
f70119cd77 Reset batching state when overlap batch deletion occurs 
Change-Id: Ifdbee9baaa734e27d15d2b54aa3b3abfffbce1e9
 2013-06-13 11:28:45 -07:00
Dianne Hackborn
cc6027e4c8 Merge "Fix some things." 2013-06-13 17:41:06 +00:00
The Android Open Source Project
33709d7f43 am 026cba6c: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
* commit '026cba6c66677b6eb8ad6ac260dfd1bece07362d':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
  Fix logspam when battery sysfs file not available.
 2013-06-13 08:25:36 -07:00
The Android Open Source Project
026cba6c66 Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge 
Change-Id: Ic69db23c3b1ba493a97b162caa664759cf3b1bda
 2013-06-13 08:22:44 -07:00
John Spurlock
1623b8cf7f Merge "Remove TabletStatusBar from systemui package." 2013-06-13 13:54:43 +00:00
Craig Mautner
f76c17f0cb Merge "Add debug for specific bug." 2013-06-13 13:53:27 +00:00
The Android Automerger
06420f2eca merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev 2013-06-13 05:55:24 -07:00
Narayan Kamath
6db1054692 am 7d1fd557: am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '7d1fd557a3fd96365565531e5e45ac5e93dd8315':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:34:23 -07:00
Narayan Kamath
7d1fd557a3 am 372d21ad: am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '372d21ad69a43e3d0a26b23f45351511ed88e9e6':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:31:51 -07:00
Narayan Kamath
372d21ad69 am 6706ca96: Merge "Update HttpResponseCache to use the new cache API." 
* commit '6706ca96b21ebbd620fb597a23e8180f76bb37cf':
  Update HttpResponseCache to use the new cache API.
 2013-06-13 02:29:11 -07:00
Narayan Kamath
6706ca96b2 Merge "Update HttpResponseCache to use the new cache API." 2013-06-13 09:26:34 +00:00
Adam Powell
b44d66fa8e Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter" 
This reverts commit ef2277ec5802143b8af1da32d7b01518401b97a9.

This caused a regression for some apps relying on the old behavior.

Bug 9372495
 2013-06-12 23:26:35 -07:00
Dave Burke
2ce9bae80c am bafc8dcf: am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 
* commit 'bafc8dcf690776ec7fdcf26518f3aff47724871d':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
 2013-06-12 21:13:51 -07:00
Dave Burke
bafc8dcf69 am 34bc73df: Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 
* commit '34bc73dff1f0c8402da3fc9bd1f0175bddcaa842':
  Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"
 2013-06-12 21:11:12 -07:00
Dave Burke
34bc73dff1 Merge "Revert "Make implementation of isEmpty consistent with implementation of getCount in HeaderListViewAdapter"" into jb-mr2-dev 2013-06-13 04:08:42 +00:00
Jeff Brown
aab3453965 Fix logspam when battery sysfs file not available. 
This was a regression caused by a recent change to use String8
instead of char*.  We missed the implicit null check here.

Bug: 9377604
Change-Id: I7eff138096622c47b5d45678010373dc82138384
 2013-06-12 20:55:08 -07:00
Craig Mautner
9e105e0a9a Add debug for specific bug. 
To be removed once the bug is fixed.

Change-Id: I83bd5b9fd722826c59b1178303fc4e7feb8eefd2
 2013-06-12 20:19:00 -07:00
kmccormick
95acc52c79 am 40609ff0: am 4b5a6255: am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '40609ff0fdcbebc6bd86fca3bcf81293dd59fb74':
  Doc update: restoring deprecation messages
 2013-06-12 19:40:58 -07:00
kmccormick
40609ff0fd am 4b5a6255: am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '4b5a6255e096b20513468cc1f55f3038c4c53327':
  Doc update: restoring deprecation messages
 2013-06-12 19:38:51 -07:00
kmccormick
4b5a6255e0 am e9abc5e9: am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'e9abc5e935deab1c63f89971380b9f9a9eed1af9':
  Doc update: restoring deprecation messages
 2013-06-12 19:35:56 -07:00
kmccormick
e9abc5e935 am b89c6ac4: am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit 'b89c6ac4e65c0aaadddd65d1f816860681615b1e':
  Doc update: restoring deprecation messages
 2013-06-12 19:33:50 -07:00
kmccormick
b89c6ac4e6 am 9af7d407: am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '9af7d4072849de24a0ac6401247c18c6ef915e2f':
  Doc update: restoring deprecation messages
 2013-06-12 19:31:12 -07:00
kmccormick
9af7d40728 am 227615ee: am bf370185: Doc update: restoring deprecation messages 
* commit '227615eeb7b6008e18d2b205cadccf4943a82e94':
  Doc update: restoring deprecation messages
 2013-06-12 19:28:58 -07:00
kmccormick
227615eeb7 am bf370185: Doc update: restoring deprecation messages 
* commit 'bf3701854841f97f52cd29b601431861598f5277':
  Doc update: restoring deprecation messages
 2013-06-12 19:26:57 -07:00
kmccormick
bf37018548 Doc update: restoring deprecation messages 
Change-Id: I58ca2002043d47cc55f15cdaff581e019a6dd7ef
 2013-06-12 19:15:58 -07:00