Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
167,347 Commits 3 Branches 0 Tags
f1923c368c5c08a477b9f94dea6a499798d91d4f
Commit Graph

61783 Commits

Author SHA1 Message Date
John Reck
f1923c368c am 8dda03a0: am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit '8dda03a08603f45b3c2c90633491ce2c1fea266b':
  Have an actual fallback if the surface is lost
 2014-11-07 22:55:32 +00:00
John Reck
8dda03a086 am ca93f69c: Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 
* commit 'ca93f69c96df85bd6bc72a2a47dae6c0d5336ab2':
  Have an actual fallback if the surface is lost
 2014-11-07 22:45:33 +00:00
John Reck
ca93f69c96 Merge "Have an actual fallback if the surface is lost" into lmp-mr1-dev 2014-11-07 22:41:03 +00:00
Sander Alewijnse
1b0dbd5c95 am 8c1cd7e6: am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '8c1cd7e61f050afd450cb05add633e2fbe0b195a':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:35:51 +00:00
Sander Alewijnse
8c1cd7e61f am 3eed90f3: Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 
* commit '3eed90f39301089a1c16d6e2c0d027b187567cf0':
  Added the restrictions pending application restrictions key.
 2014-11-07 22:30:50 +00:00
Sander Alewijnse
3eed90f393 Merge "Added the restrictions pending application restrictions key." into lmp-mr1-dev 2014-11-07 22:25:00 +00:00
Alan Viverette
e37c761e5e am c30a7623: am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit 'c30a7623a2f97ce791ed019d7014b842f9c9b7d2':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:20:09 +00:00
Sander Alewijnse
53d63dcd04 Added the restrictions pending application restrictions key. 
Bug:17632522
Change-Id: If5a0d0ea1f479b0584fc0b1cff2a179d296d2904
 2014-11-07 22:19:48 +00:00
Alan Viverette
c30a7623a2 am 48c8cd06: Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 
* commit '48c8cd06aa0b284368d836cf5d2e6c1b1630d322':
  Support theme attributes in StateListDrawable <item> element
 2014-11-07 22:14:45 +00:00
Alan Viverette
48c8cd06aa Merge "Support theme attributes in StateListDrawable <item> element" into lmp-mr1-dev 2014-11-07 22:09:44 +00:00
Dan Stoza
1437146a3e am bb8a87f4: am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'bb8a87f48a9978d8faec11819d5fabbbc97cac47':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:58:51 +00:00
Dan Stoza
bb8a87f48a am d17793ea: Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 
* commit 'd17793ea2a93af6ba9bc64c77502f48aa32814e4':
  Add a BufferItem parameter to onFrameAvailable
 2014-11-07 19:48:50 +00:00
Dan Stoza
d17793ea2a Merge "Add a BufferItem parameter to onFrameAvailable" into lmp-mr1-dev 2014-11-07 19:44:34 +00:00
John Reck
692135effb am 76adcd6e: am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit '76adcd6ec551637f57f2630a60f6cdb2bbbf908b':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:41:08 +00:00
John Reck
76adcd6ec5 am ea4e76f6: Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 
* commit 'ea4e76f68a60a02e175755d22e88894f11282850':
  Fix finalizer ordering/double-free issue
 2014-11-07 19:35:48 +00:00
John Reck
ea4e76f68a Merge "Fix finalizer ordering/double-free issue" into lmp-mr1-dev 2014-11-07 19:29:47 +00:00
Jason Monk
aac9f433ff am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '68d0089c66b67b2df2b4c3d9f9e68bbcae637d79':
  Material design for screen pinning cling
 2014-11-07 19:12:03 +00:00
Jason Monk
81f5fa7422 am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '88aad1af7f6f3f775d10b8ea5e61225c0c89d3d1':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:07:15 +00:00
Jason Monk
68d0089c66 am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '975590f22916e184204678758bb339c1d2b6b57f':
  Material design for screen pinning cling
 2014-11-07 19:05:50 +00:00
John Reck
aa95a88327 Have an actual fallback if the surface is lost 
Bug: 17516789

This will force a relayout/reinitialize pass if the Surface
is lost mid-render instead of crashing on the next frame

Change-Id: If08bfa16f740728fa7c05904fa11e26f07b81e2e
 2014-11-07 11:02:07 -08:00
Jason Monk
88aad1af7f am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '2f04d16f16ea935895872efe4dfcff3366070e9c':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:01:09 +00:00
Jason Monk
975590f229 Merge "Material design for screen pinning cling" into lmp-mr1-dev 2014-11-07 18:59:25 +00:00
Jason Monk
2f04d16f16 Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 2014-11-07 18:53:54 +00:00
John Reck
cabf8a7064 am f7d3ce6a: am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev 
* commit 'f7d3ce6a3ca88b23a227e29a5fa3285e24f7b2b1':
  Fix wrong-thread issue
 2014-11-07 18:48:43 +00:00
Jeff Davidson
6eab8d67c3 am d9475786: am ea09c7da: Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 
* commit 'd9475786081fd89769901685bb9ba42f00da976d':
  Let scorers fine-tune scoring heuristics.
 2014-11-07 18:43:23 +00:00
John Reck
f7d3ce6a3c am 4b19b7aa: Merge "Fix wrong-thread issue" into lmp-mr1-dev 
* commit '4b19b7aaff1d1ff972ebe68101c2107454bbe5de':
  Fix wrong-thread issue
 2014-11-07 18:42:28 +00:00
Jeff Davidson
d947578608 am ea09c7da: Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 
* commit 'ea09c7da01c1cd61a2f6d84302fd510c3887db07':
  Let scorers fine-tune scoring heuristics.
 2014-11-07 18:37:03 +00:00
John Reck
4b19b7aaff Merge "Fix wrong-thread issue" into lmp-mr1-dev 2014-11-07 18:34:55 +00:00
John Reck
c298f9c917 Fix finalizer ordering/double-free issue 
Bug: 18289984

If Surface:finalize() happens after HwuiContext:finalize()
it would try to manipulate a destroyed object. However, as
Surface:finalize() always calls HwuiContext:destroy() this
can be fixed by simply getting rid of HwuiContext's finalizer

Change-Id: I7c912214417ab32891b1c58d045c9721e5f01965
 2014-11-07 10:33:36 -08:00
John Reck
12f5e34332 Fix wrong-thread issue 
Bug: 18259560

Change-Id: Ic63a86efba9c86f21defac0695a73db8b09ae284
 2014-11-07 10:31:53 -08:00
Jeff Davidson
ea09c7da01 Merge "Let scorers fine-tune scoring heuristics." into lmp-mr1-dev 2014-11-07 17:38:38 +00:00
Jason Monk
18f99d9134 Material design for screen pinning cling 
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar.  In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.

Bug: 16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
 2014-11-07 11:09:19 -05:00
Baligh Uddin
326b291988 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:45:43 +00:00
Baligh Uddin
c805d3599b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:45:39 +00:00
Ignacio Solla
ad87ec5bba am cf045ea8: am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit 'cf045ea8e4b91ac662d0aff74df429a2569d8e46':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:08:22 +00:00
Ignacio Solla
cf045ea8e4 am 803908b0: Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 
* commit '803908b0db0139a2bc3eca2868cad67c9a274d97':
  [WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting.
 2014-11-07 10:01:08 +00:00
Ignacio Solla
803908b0db Merge "[WebView] Remove WEBVIEW_DATA_REDUCTION_PROXY setting." into lmp-mr1-dev 2014-11-07 09:44:59 +00:00
Baligh Uddin
d3531b9880 Import translations. DO NOT MERGE 
Change-Id: I353eea105f85b0d45a2dd0f45b84921462c87c89
Auto-generated-cl: translation import
 2014-11-06 23:19:45 -08:00
Baligh Uddin
a8b1305363 Import translations. DO NOT MERGE 
Change-Id: Id09faf98f305e5319eecc2d18b25ccde8aed55c1
Auto-generated-cl: translation import
 2014-11-06 23:11:55 -08:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
513aa79290 am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '3ed9f2f903a8e6c38ca9f2ce3819ac063281a020':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:33:28 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Amit Mahajan
b34892e1a0 am b0abe26d: am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'b0abe26dd98e005f25afeacc55723bd8e508b703':
  Add configuration to control converting sms destination number
 2014-11-07 00:31:22 +00:00
Amit Mahajan
b0abe26dd9 am fc3f2380: Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 
* commit 'fc3f2380c97b0e2704b6350e031c96e0b01a3046':
  Add configuration to control converting sms destination number
 2014-11-07 00:24:27 +00:00
Amit Mahajan
fc3f2380c9 Merge "Add configuration to control converting sms destination number" into lmp-mr1-dev 2014-11-07 00:17:43 +00:00
Yohei Yukawa
d1f629f36b am 42be51bd: Merge "Minimize the number of default enabled IMEs part 4" into lmp-mr1-dev automerge: 50ef3d9 
* commit '42be51bd98660b608596e6a8db63735ae552c996':
  Minimize the number of default enabled IMEs part 4
 2014-11-07 00:09:50 +00:00
Jeremy Joslin
93f515f990 am 91fff05b: Merge "Implemented requestNetwork with a PendingIntent." into lmp-mr1-dev automerge: 1a2b99e 
* commit '91fff05ba93b6c78e1744159f97bc0448e22115c':
  Implemented requestNetwork with a PendingIntent.
 2014-11-07 00:06:54 +00:00
Amith Yamasani
f6c8169a68 am 26d8d1d5: Merge "Fix singleUser provider grants" into lmp-mr1-dev automerge: 775d104 
* commit '26d8d1d5cb6553686028948a63c5d3c507f0b40c':
  Fix singleUser provider grants
 2014-11-07 00:06:48 +00:00
Vinod Krishnan
df7ba46332 am c6c5c7d6: am efec89f2: am 1d6d4272: Adding wallpaper animations 
* commit 'c6c5c7d6db61fac9eb3c4637a6d9573a18e43f67':
  Adding wallpaper animations
 2014-11-07 00:06:36 +00:00
Justin Koh
402a360111 am 4ca342cd: am 2d42f484: am b8038d58: Merge "Hide Surface#lockHardwareCanvas DO NOT MERGE" into lmp-sprout-dev 
* commit '4ca342cdba6fb2637415cfeb6e579cc662763daf':
  Hide Surface#lockHardwareCanvas DO NOT MERGE
 2014-11-07 00:05:54 +00:00