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

136739 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Philip Milne
3dc38c1b59 Merge "More on weights in GridLayout" 2014-05-25 04:13:25 +00:00
Philip Milne
dea890fa64 More on weights in GridLayout 
Chance as little as possible from existing. If weights are defined only a
subset of the views in a layout (the normal case) leave the layout of the
remaining views unaffected.

Change-Id: I27473e303c0666930e2fb515b794df96a8b97272
 2014-05-24 21:02:45 -07:00
John Spurlock
b5eb09f677 am 6eb1e4ca: Merge "QuickSettings: Remove default edge effect on scroller." into lmp-preview-dev 
* commit '6eb1e4ca17c7722670c1c374de2a4203b58f6f87':
  QuickSettings: Remove default edge effect on scroller.
 2014-05-24 23:00:19 +00:00
John Spurlock
33a7306cbd Merge "QuickSettings: Remove default edge effect on scroller." into lmp-preview-dev 2014-05-24 22:56:50 +00:00
John Spurlock
17aba4e2ec QuickSettings: Remove default edge effect on scroller. 
Bug:15186962
Change-Id: Ibc6aa8169fedf7b9e145955d652f3af8703cbe54
 2014-05-24 18:53:16 -04:00
Guang Zhu
82d96d5e21 Merge "Revert "Add physical TV input handling to TvInputManagerService"" 2014-05-24 19:03:02 +00:00
Guang Zhu
70aa0c6db3 Revert "Add physical TV input handling to TvInputManagerService" 
Bug: 15197740

This reverts commit c8324a8e70d9f617c92f49e7c0b3e2484d9190fd.

Change-Id: Ie7b5405e929b5903f43188c3445fe9d24ecf92c2
 2014-05-24 19:02:50 +00:00
Craig Mautner
4d22b4a016 Merge "Modify task navigation to return to recent tasks." 2014-05-24 16:48:16 +00:00
Jorim Jaggi
dcefe53e56 am f6e6bf6a: Merge "Fix intercept logic in NotificationPanelView." into lmp-preview-dev 
* commit 'f6e6bf6aa23d8f0825c18bea74a757a5429fe3a8':
  Fix intercept logic in NotificationPanelView.
 2014-05-24 16:07:10 +00:00
Jorim Jaggi
5bfee4986a Merge "Fix intercept logic in NotificationPanelView." into lmp-preview-dev 2014-05-24 16:04:18 +00:00
Wonsik Kim
5d038b9d6f Merge "Add physical TV input handling to TvInputManagerService" 2014-05-24 15:13:47 +00:00
Selim Cinek
a0a580b606 am 0e8614b1: Merge "Notifications where clipped incorrectly in the unlocked shade." into lmp-preview-dev 
* commit '0e8614b1ecd6c6cfe506323c6f6d6bae65804aea':
  Notifications where clipped incorrectly in the unlocked shade.
 2014-05-24 14:56:27 +00:00
Selim Cinek
a08334e506 Merge "Notifications where clipped incorrectly in the unlocked shade." into lmp-preview-dev 2014-05-24 14:53:36 +00:00
Jorim Jaggi
ce50b8199c Fix intercept logic in NotificationPanelView. 
We need to make sure that we only block the disallow intercept
request when interacting with the ScrollView. In the past, we also
blocked the disallow intercept request for the brightness slider, for
example.

Bug: 15169261
Change-Id: I02dd1e399a527509d631fdde54249d57748b20f2
 2014-05-24 16:48:49 +02:00
Selim Cinek
f653dba7cb Notifications where clipped incorrectly in the unlocked shade. 
Previously the notification clipping did not account for the corners
of their rounded rects.

Bug: 15188616
Change-Id: If8ee1ceda0a5a43b4ab9e754804279834f93baa4
 2014-05-24 16:47:06 +02:00
Philip Milne
4885f2f773 More on adding support for weights to GridLayout 
Remove fields that are not needed with view-based allocation.

Change-Id: I23dc75fea47c532ad46e23b7fb14ff8e46c68db1
 2014-05-24 06:14:27 +00:00
Philip Milne
9505480ee3 More on weighted space distribution in GridLayout 
This CL changes the weight distribution algorithm to act on views rather
than rows/columns. This is a more general mechanism that is simpler to
define.

Change-Id: Ifa5adbe0b0a9a9ae271616321385f8e926aba054
 2014-05-23 19:50:40 -07:00
Ruben Brunk
c371be303b Merge "camera2: Remove CameraAccessException throw for vendor tag setup." 2014-05-24 02:03:51 +00:00
Craig Mautner
df6523f270 Modify task navigation to return to recent tasks. 
Tasks launched from the recent task list will now return to the list
when they are finished. Also tasks that are launched from the
notification panel and services will now return to the list,
provided that the launcher is not front and center when they are
launched.

Fixes bug 14464114.

Change-Id: Ic0d3731fc7248d1eaa80e5ee399753d80e80c979
 2014-05-23 19:03:00 -07:00
Ruben Brunk
b6a781066e camera2: Remove CameraAccessException throw for vendor tag setup. 
Bug: 15108304
Change-Id: Ieeb3f4b7b8bda9fc0ea1a3fc13be21668a0bbafd
 2014-05-23 18:47:15 -07:00
Craig Mautner
dbcd3aa22a Merge "Improve DocCentric documentation." 2014-05-24 00:46:51 +00:00
Dianne Hackborn
b861179fca am b7a1d1e4: Merge "Fix issue #15195464: battery history says wakelock held when it\'s not" into lmp-preview-dev 
* commit 'b7a1d1e4ed6ea26512d1e1f34fa264a639c91819':
  Fix issue #15195464: battery history says wakelock held when it's not
 2014-05-24 00:38:08 +00:00
Dianne Hackborn
a82c9be2f7 Merge "Fix issue #15195464: battery history says wakelock held when it's not" into lmp-preview-dev 2014-05-24 00:35:55 +00:00
Ruben Brunk
94ecb5506a am a7c97c55: Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 
* commit 'a7c97c552a280ed3a2ff3535a5085f8601f45820':
  camera2: Move DngCreator to hardware/camera2.
 2014-05-24 00:30:06 +00:00
Ruben Brunk
0bfa56e766 Merge "camera2: Move DngCreator to hardware/camera2." into lmp-preview-dev 2014-05-24 00:25:59 +00:00
Alan Viverette
2449be1a73 am f0016cab: Merge "Revert small / medium / large text sizes" into lmp-preview-dev 
* commit 'f0016cabf7ca8b23251e9e6044f6d5373e6d1bf2':
  Revert small / medium / large text sizes
 2014-05-24 00:17:06 +00:00
Dianne Hackborn
536456f2d4 Fix issue #15195464: battery history says wakelock held when it's not 
Simplify full wake lock logging, so wake_lock_in is a completely
separate event from wake_lock and provides the full real raw log
of wake lock events.

Also attempt to address issue #15018750 (Incorrect wakelock reporting)
by no longer being complicated and rolling up previous state in to a
new history slice.

Bug: 15195464
Bug: 15018750
Change-Id: I32154bdfc2f07113be969f9db5503b2f2807a427
 2014-05-23 17:16:26 -07:00
Alan Viverette
13c8cdfb1d Merge "Revert small / medium / large text sizes" into lmp-preview-dev 2014-05-24 00:15:15 +00:00
Alan Viverette
c86917197a Revert small / medium / large text sizes 
Also moves a few Quantum styles over to styles_quantum.xml.

BUG: 13769331
Change-Id: Ia83efacf98a2bd8a0f1e5783d34fac77ea1b5949
 2014-05-23 17:07:04 -07:00
Craig Mautner
94d643a1c2 Merge "Check for null" 2014-05-23 23:26:03 +00:00
Chris Craik
2425efab83 am dcdd43b6: (-s ours) Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev 
* commit 'dcdd43b62eacb2988b5621456b941d47500e830c':
  DO NOT MERGE Inspect SkShader to determine hw shader.
 2014-05-23 23:25:27 +00:00
Chris Craik
cd3a824548 Merge "DO NOT MERGE Inspect SkShader to determine hw shader." into lmp-preview-dev 2014-05-23 23:21:49 +00:00
Christopher Tate
6000a6c663 Merge "Run the task manager service at startup" 2014-05-23 23:18:13 +00:00
Christopher Tate
8f64f80888 Run the task manager service at startup 
Also moves most of it into android.app.task rather than android.content.

Bug 14993295
Bug 14997851

Change-Id: I9b5738d026ea2526cdfbc96d0239c74687c51611
 2014-05-23 16:07:45 -07:00
Zhijun He
2f6da3e739 am 0eb2fa3c: Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 
* commit '0eb2fa3cf88d037f645555e3a1c4644cdf0a67c9':
  Camera2: Mark the under-specified tags for FUTURE
 2014-05-23 22:48:08 +00:00
Zhijun He
c1631fd890 Merge "Camera2: Mark the under-specified tags for FUTURE" into lmp-preview-dev 2014-05-23 22:44:33 +00:00
Christopher Tate
792d52a59b am 55b23ac2: (-s ours) Merge "DO NOT MERGE - Don\'t crash uninstalling updates to system apps" into lmp-preview-dev 
* commit '55b23ac23d27bbab5c1aa5688e5eb9e13d92e7d3':
  DO NOT MERGE - Don't crash uninstalling updates to system apps
 2014-05-23 22:38:51 +00:00
Craig Mautner
deec695253 Merge "Add code for persisting tasks and activities to disk" 2014-05-23 22:37:20 +00:00
Christopher Tate
ec41d7abab Merge "DO NOT MERGE - Don't crash uninstalling updates to system apps" into lmp-preview-dev 2014-05-23 22:36:12 +00:00
Craig Mautner
2d74ce309f Improve DocCentric documentation. 
Fixes bug 15025461.

Change-Id: I34cc13105072cf054f125a7963294165258fec0e
 2014-05-23 15:34:48 -07:00
Alan Viverette
9c32f25eb6 am 106210a7: Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 
* commit '106210a703563cfb11c23ab80d8f29b990df7ec5':
  Handle hybrid themes correctly in Drawable cache
 2014-05-23 22:33:51 +00:00
Alan Viverette
0b723fdbaa Merge "Handle hybrid themes correctly in Drawable cache" into lmp-preview-dev 2014-05-23 22:30:42 +00:00
Glenn Kasten
e01043797d Merge "Remove android.media.AudioFormat default constructor" 2014-05-23 22:14:17 +00:00
Scott Main
387f87f517 am c138c822: am e5c9c92c: am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'c138c822072386c66ad0c32ac5f1fb5d0bfb23c7':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 22:01:24 +00:00
Scott Main
c138c82207 am e5c9c92c: am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'e5c9c92c23196269ccf50024f76f84779b821c32':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:57:57 +00:00
Alan Viverette
70929a3cb5 am 89425f4f: Merge "Fix selection handle offsets" into lmp-preview-dev 
* commit '89425f4f4bc05f64988ca5fceb0fd5d2e370f499':
  Fix selection handle offsets
 2014-05-23 21:56:46 +00:00
Scott Main
e5c9c92c23 am a4c95869: am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit 'a4c95869ed2727ecc471e218b204657b7eaf8b5c':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:52:43 +00:00
Alan Viverette
7a57c01aac Merge "Fix selection handle offsets" into lmp-preview-dev 2014-05-23 21:52:40 +00:00
Eric Laurent
6b02c898f5 am 5231cb4b: am b928b7c2: am ba64d298: Merge "AudioService: fix cross deadlock in VolumeStreamState" 
* commit '5231cb4bfbdd20200555f263ee73b439e33d1ec0':
  AudioService: fix cross deadlock in VolumeStreamState
 2014-05-23 21:49:41 +00:00
Scott Main
a4c95869ed am 1f1bb9d0: Merge "add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav." into klp-docs 
* commit '1f1bb9d06830552269c68bf3bd1e7184f1a7bb9d':
  add style to community page to adapt to the new sticky nav styles. basically override the new style to use the previous style because this page does not use sticky nav.
 2014-05-23 21:49:15 +00:00