Skip to content

Conversation

@dhacker29
Copy link

merge 4.0.3 I think I fixed the conflicts right :D

dhacker29 and others added 30 commits December 17, 2011 01:35
…rameworks/base into ics

Conflicts: FIXED
	core/res/res/values/config.xml
	core/res/res/values/strings.xml
	packages/SystemUI/src/com/android/systemui/recent/RecentsPanelView.java
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	services/java/com/android/server/WifiService.java
	services/sensorservice/SensorDevice.cpp
	telephony/java/com/android/internal/telephony/RIL.java
…ks_base into ics

Conflicts:
	packages/SystemUI/src/com/android/systemui/statusbar/tablet/TabletStatusBar.java
	policy/src/com/android/internal/policy/impl/GlobalActions.java
	services/java/com/android/server/WifiService.java
	services/sensorservice/SensorDevice.cpp
Change-Id: I4cf4356abced3daa9728429e25112b2f5da8799e
Change-Id: Ie5325b3c6cde64be8d36f6afc4e747addb5ce8df
Change-Id: Ib78fff9e32d95a0a112ddd9274b79b3a3aa626b9
Moving average filter for light sensor, support for custom levels, battery stats fix and dim fix.

Optimization: Don't compute the sum of all samples in filter window every run. Instead, keep track of the sum, subtract phased out sample, add new sample and divide new sum by number of valid samples. Massive CPU cycle savings.
Thanks to Jonathan (zenpoy on gmail dot com) for pointing me in the right direction!

Fix: The code for stopping the filter if the sensor has been stable the entire filter window time was only enabled if debug logging was enabled. Oops. CPU cycle savings in steady ambient light.

Tweak light sensor filter

1. Only allow decrease if user permitted it
2. Only perform filter reset on sensor increase and current average is below 1500 ("indoors")
3. Filter reset in 2. means pushing the filter half way towards new sample
4. Filter reset is disabled by default

This change requires commits from CMParts:

5f4026702b67b5d23c9a992f408e3861c90566db
f9238a01e4a4a64cb414dbdada36c97ae2a37db9
0a4b490035c333b3d77e6e59fcc0f7d16d78ebda
5036cc8217daf59aa9f2800bc3fa40e4dd4b3117
b43caaab217848668241681613ce8d54ceda69e9
cc0682a4cc43d0058db8b5195d4d329336f2d3fd

Change-Id: I9c88704484f4a23b3d643597f35b55d74cf36b56
Ported over from CM 7.1 into CM9

Rewrite by cvpcs
Requires configuration settings from CMParts. Will be done when settings app available.

Disabled WiMax button until WiMax support is added back in.

ToDo: Change default color to Cyan to match ICS default color Scheme.
      Make indicator bar smaller?

Requires:
      http://review.cyanogenmod.com/#change,10578    - Light Sensor Information.

Also requires CMSettings for Configuration:
      https://github.com/Pedlar/android_packages_apps_CMSettings

Change-Id: I657f459969c784164730e6b0660db40822d8c491
This commit changes the widget icons to match the ICS default drawables.  I used
as many of the stock icons as possible and made a few custom ones, where missing,
using stock icons as a base. This set includes XHDPI, HDPI and MDPI icons.

The icon olour is the default for ICS where 'on' = white, 20% transparent and
'off' = white, 70% transparent.

Patch set 4 - stat_ring_off and stat_silent now uses same icon
Patch set 5 - stat_vibrate_off uses same icon as _on.  Looks better.
Patch set 6 - media play/pause/next/previous  icons added
Patch set 7 - orientation icons added, removed 2 'broken' icons

This should be all of them now.

Change-Id: I8b90bed6ecd87ef48126452d53f826956d16cff4
Change-Id: I7971c65a712830388bbd81e0412548ce88a0f488
Allow onscreen controls to be re-arranged + show/hide search button

Depends on cmSettings (not merged yet) found at : http://goo.gl/eBnMN

Patchset2 : Minor cleanup.

Change-Id: I9ab6d9de9d00c45b5673b9247abb96cbf1a9d434
…D Designs)

The camera icon has been moved to the lower quadrant and has been left
hidden in order to keep from interfering with the layout of the lock
screen music controls and layout
(hdpi and midi icons temporary)
Allow onscreen controls to be re-arranged + show/hide search button

Depends on cmSettings (not merged yet) found at : http://goo.gl/eBnMN

This patchset also makes 2 more minor tweaks :

- Changes the visibility for menu button to GONE rather than INVISIBLE
  Personally i like this better because you reclaim the space and get a nice animation
  However if people are opposed to this, its easy to revert back.

- Enabled long press on all buttons

Patchset2 : Minor cleanup.
Patchset3 : Drawables provided by Rick (fitsnugly)
            Remove redundant attributes

Change-Id: I9ab6d9de9d00c45b5673b9247abb96cbf1a9d434
and NT_MODE_CDMA.

Change-Id: Ib98bf8409e6a1481f3196ccd303689e97afd3646
Change-Id: If9fa433510e68b2209158c176f9881f0fe7ccd1b
codenamedroid and others added 27 commits January 11, 2012 23:46
This allows for backlight to decrease when changing to dimmer location
when phone is not connected to a dock.  Previouos setting had reversed.

Change-Id: I3f9e44dec8e3deb9ecb2aeb0f775383bbd7b3d57
Bring changes done in cm7 to ics.
- Vibrate on press
- Show message
- http://review.cyanogenmod.com/#change,5191,patchset=2
…se into ics

Conflicts:
	core/res/res/values/config.xml
Most mkv files having 'lacing' in their audio section to save space.
Android did not handle this properly, sending all frames in the block
with the same time code, which causes stuttery playback.

Change-Id: I4dc76e7c2a53126c7fbdd3628fe7d339d2e3364e
new layout (Whitehawkx/Andrew), add chevron back, and  fix the
lockscreen the on the tablets
I don't understand whats supposed to be soo hard about this. T_T 4.A.M.
…reen layouts

stock 1 = six 2 = eight 3 = eight unhidden
eight targets unhidden layout from ArrTooDeeToo
added chevron back and different positions for the modified layout
…ks_base into ics

Conflicts:
	core/java/android/provider/ContactsContract.java
	core/java/android/provider/Settings.java
	core/java/com/android/internal/app/ShutdownThread.java
	core/res/res/drawable-hdpi/ic_lock_reboot.png
	core/res/res/drawable-hdpi/ic_lock_screenshot.png
	core/res/res/drawable-xhdpi/ic_lock_reboot.png
	core/res/res/drawable-xhdpi/ic_lock_screenshot.png
	core/res/res/values/config.xml
	data/sounds/AllAudio.mk
	packages/SystemUI/res/layout/power_widget_button.xml
	packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerButton.java
	packages/SystemUI/src/com/android/systemui/statusbar/powerwidget/PowerWidget.java
	services/java/com/android/server/PowerManagerService.java
Hashcode pushed a commit that referenced this pull request Jun 1, 2014
Also:
 * add a second history section that logs
 * log mesg as text instead of number
 * dump Sync Status as a table

 Sample log:
Recent Sync History
  #1  : 2012-10-11 15:06:11     USER    0.4s            [email protected]/com.google u0  com.android.calendar                                  com.google.android.calendar
  #2  : 2012-10-11 15:06:11     USER    0.1s            [email protected]/com.google u0  subscribedfeeds                                       android.uid.system:1000
    mesg=parse-error
  zsol#3  : 2012-10-11 15:06:11     USER    0.0s            [email protected]/com.google u0  com.google.android.apps.uploader.PicasaUploadProvider android.uid.system:1000
  #4  : 2012-10-11 15:06:10     USER    0.1s            [email protected]/com.google u0  com.google.android.gms.plus.action                    android.uid.system:1000

Recent Sync History Extras
  #1  : 2012-10-11 15:06:11     USER   [email protected]/com.google u0  com.android.calendar                                  Bundle[{[email protected], force=true, ignore_settings=true, ignore_backoff=true}]
  #2  : 2012-10-11 15:06:11     USER   [email protected]/com.google u0  subscribedfeeds                                       Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]
  zsol#3  : 2012-10-11 15:06:11     USER   [email protected]/com.google u0  com.google.android.apps.uploader.PicasaUploadProvider Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]
  #4  : 2012-10-11 15:06:10     USER   [email protected]/com.google u0  com.google.android.gms.plus.action                    Bundle[{ignore_backoff=true, force=true, ignore_settings=true}]

Sync Status
Account [email protected] u0 com.google
=======================================================================
Authority                                           Syncable  Enabled  Delay  Loc  Poll  Per  Serv  User  Tot  Time  Last Sync            Periodic
-------------------------------------------------------------------------------------------------------------------------------------------------------------
com.google.android.apps.currents                    1         true            0    2     1    2     1     6    0:35  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:40  2012-10-13 14:58:13
com.google.android.music.MusicContent               1         true            0    0     1    2     1     4    0:09  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:18  2012-10-13 14:58:13
com.google.android.gms.plus.action                  1         true            0    0     1    1     1     3    0:00  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:15  2012-10-13 14:58:13
com.google.android.apps.magazines                   1         true            0    1     1    2     1     5    0:14  PERIODIC SUCCESS     86400
                                                                                                                     2012-10-12 14:59:00  2012-10-13 14:58:13

Change-Id: Iffeb825e4b4f6217940a39b0dd71e06856f08f3f
Hashcode pushed a commit that referenced this pull request Jun 1, 2014
… secondary users

There are two things going on here:

(1) In secondary users, some times theme information such as whether
the window is full screen opaque was not being retrieved, so the window
manager didn't know that it could hide the windows behind the app.
This would just be a performance problem, except that:

(2) There appear to be a number of applications that declare that they
are full screen opaque, when in fact they are not.  Instead they are
using window surfaces with an alpha channel, and setting some pixels
in their window to a non-opaque alpha level.  This will allow you to
see whatever is behind the app.  If the system happens to completely
remove the windows behind the app, and somebody is filling the frame
buffer with black, then you will see what the app intends -- those
parts of its UI blended with black.  If one of those cases doesn't
hold (and though we have never guaranteed they would, in practice this
is generally what happens), then you will see something else.

At any rate, if nothing else than for performance reasons, we need to
fix issue #1.

It turns out what is happening here is that the AttributeCache used
by the activity manager and window manager to retreive theme and other
information about applications has not yet been updated for multi-user.

One of the things we retrieve from this is the theme information telling
the window manager whether an application's window should be treated
as full screen opaque, allowing it to hide any windows behind it.  In
the current implementation, the AttributeCache always retrieves this
information about the application as the primary user (user 0).

So, if you have an application that is installed on a secondary user but
not installed on the primary user, when the AttributeCache tries to retrieve
the requested information for it, then from the perspective of the primary user
it considers the application not installed, and is not able to retrieve that
info.

The change here makes AttributeCache multi-user aware, keeping all of its
data separately per-user, and requiring that callers now provide the user
they want to retrieve information for.  Activity manager and window manager
are updated to be able to pass in the user when needed.  This required some
fiddling of the window manager to have that information available -- in
particular it needs to be associated with the AppWindowToken.

Change-Id: I4b50b4b3a41bab9d4689e61f3584778e451343c8
Hashcode pushed a commit that referenced this pull request Nov 6, 2014
…ounters

an int[] return type.

There are two such instances:

1. "private int[] mRules" within RelativeLayout LayoutParams.
2. "public int[] getLocationOnScreen" in View.

When I added #2, we noticed missing annotated fields/methods in Hierarchy
Viewer, but #1 also caused the same issue (mainly not exporting
alignWithParent field)

Bug: 16844914
Change-Id: I0d83a4391aa0565897cd7f0523995c97b7a4976d
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.