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

4247 Commits

Author SHA1 Message Date
Amith Yamasani
912f01865a am 68c30860: am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '68c308607b01bafd31c91572a81f4563e2199260':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:46:41 -08:00
Amith Yamasani
68c308607b am 73f24ae1: am 9a147340: Merge "Don\'t update global table when upgrading secondary users\' database." into jb-mr1.1-dev 
* commit '73f24ae1d9992cf70cb05bc319d12478b2c49566':
  Don't update global table when upgrading secondary users' database.
 2012-12-12 11:43:21 -08:00
Amith Yamasani
2d43fabaf7 Don't update global table when upgrading secondary users' database. 
Bug: 7722149
Change-Id: I0c1373cba316b924701136579083274eb6c9b1da
 2012-12-12 09:52:26 -08:00
Jeff Brown
ace7404de8 resolved conflicts for merge of d7337fb9 to master 
Change-Id: I51dedcc5ee521e62ad6101c0b09e4f881b8c4bf0
 2012-12-11 15:21:02 -08:00
Jeff Brown
d7337fb97a am 3781523b: am eaae7d97: Merge "Play a tone when wireless charging begins." into jb-mr1.1-dev 
* commit '3781523becbb2d576761c2701763ff3588294a97':
  Play a tone when wireless charging begins.
 2012-12-11 14:19:41 -08:00
Jeff Brown
84e2756c0f Play a tone when wireless charging begins. 
Only plays a tone if the battery level is below 95% which
is the same heuristic used when determining whether to turn
the screen on.

Use new low battery and wireless charging sounds on Mako.

Bug: 7371658
Change-Id: Ia4527ec398d024ee418a4287e1fcbf0ec83bcc24
 2012-12-11 12:55:03 -08:00
Baligh Uddin
151cb90c60 Merge "Import translations. DO NOT MERGE" 2012-12-10 20:42:38 -08:00
Wink Saville
e2d2877aa4 am 879723dd: am e22217c2: Merge "Telephony: Use IccUtils from uicc package" 
* commit '879723dd2d89238bdd6c9e126e4c7a4418469c84':
  Telephony: Use IccUtils from uicc package
 2012-12-10 15:19:41 -08:00
Wink Saville
879723dd2d am e22217c2: Merge "Telephony: Use IccUtils from uicc package" 
* commit 'e22217c2787b0f4967b357d080d49a7f095b2db9':
  Telephony: Use IccUtils from uicc package
 2012-12-10 14:48:21 -08:00
Alex Yakavenka
5d35fcfc32 Telephony: Use IccUtils from uicc package 
Change-Id: I80204a2f3dc57cac875abeab390bb9db7a636ff7
 2012-12-10 10:35:08 -08:00
Baligh Uddin
c092b8d3cf Import translations. DO NOT MERGE 
Change-Id: Ie6f2c7d8008afc642ca538f48d673333f723c086
Auto-generated-cl: translation import
 2012-12-10 09:33:35 -08:00
Adam Powell
cd252d267b am 524962c8: am ff411ddb: Merge "Framework: Use holo alert drawables" 
* commit '524962c8cf796035f7578515ba48080873d46057':
  Framework: Use holo alert drawables
 2012-12-07 12:24:20 -08:00
Adam Powell
524962c8cf am ff411ddb: Merge "Framework: Use holo alert drawables" 
* commit 'ff411ddb40d250f075bfe8c4940931b27079f5cb':
  Framework: Use holo alert drawables
 2012-12-07 12:21:41 -08:00
Adam Powell
ff411ddb40 Merge "Framework: Use holo alert drawables" 2012-12-07 11:20:08 -08:00
Jianzheng Zhou
dcf03f3972 Refactor getPersistedNetworkPreference 
Optimize for updating mNetworkPreference according to device's networkAttributes
setting from overlay config.xml when connectivityservice start.

Change-Id: I90286332d4f453038f1ddac7dd9d1265d96b4859
Signed-off-by: Jianzheng Zhou <jianzheng.zhou@freescale.com>
 2012-12-06 12:00:04 -08:00
Laurent Tu
87830ae771 am aa3ac463: am dd549bcc: Merge "DO NOT MERGE Protect against NPE in FusionEngine.java." into jb-mr1.1-dev 
* commit 'aa3ac463c99e50e574fb02c4ea5015beedb8debe':
  DO NOT MERGE Protect against NPE in FusionEngine.java.
 2012-12-04 17:49:18 -08:00
Laurent Tu
e886adbda5 DO NOT MERGE Protect against NPE in FusionEngine.java. 
Cherry-pick of Ic49a069eef47a62fb1e0c6f284a705a62c6ae232

Bug: 7629406
Change-Id: Ia04dba9496b02755678b43e12834e992f63ee45b
 2012-12-04 16:15:24 -08:00
Laurent Tu
e0f1a099e9 Merge "Protect against NPE in FusionEngine.java." 2012-12-04 15:12:37 -08:00
Laurent Tu
161f42619b Protect against NPE in FusionEngine.java. 
Bug: 7629406
Change-Id: Ic49a069eef47a62fb1e0c6f284a705a62c6ae232
 2012-12-04 10:58:43 -08:00
Daniel Sandler
efe89f28cb am 59912d40: am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 
* commit '59912d40babedccb2346d94651f79491cbe5fd8e':
  Reduce false swipe-closed gestures in status bar panels.
 2012-12-04 06:06:32 -08:00
Daniel Sandler
59912d40ba am b8145002: am 9f2532bf: Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 
* commit 'b814500269324bc24de13f974f9564ff176a578f':
  Reduce false swipe-closed gestures in status bar panels.
 2012-12-04 06:03:18 -08:00
Daniel Sandler
9f2532bf12 Merge "Reduce false swipe-closed gestures in status bar panels." into jb-mr1.1-dev 2012-12-04 05:33:16 -08:00
Baligh Uddin
9347e00188 Merge "Import translations. DO NOT MERGE" 2012-12-03 21:21:39 -08:00
Baligh Uddin
4bc2d5dc32 Import translations. DO NOT MERGE 
Change-Id: I2e6f1d3dc2860d6eae64179442d8e7389d364dfa
Auto-generated-cl: translation import
 2012-12-03 10:34:54 -08:00
Daniel Sandler
4d58730ff5 am f80e1711: am 99931d97: am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev 
* commit 'f80e1711ea515c6310a1c31b077cd7c0b36f72a7':
  Show alarm tile for the current user.
 2012-12-03 10:28:18 -08:00
Daniel Sandler
f80e1711ea am 99931d97: am f8748809: Merge "Show alarm tile for the current user." into jb-mr1.1-dev 
* commit '99931d97f7da8460e5d3696069bbb2cbda6b0d2a':
  Show alarm tile for the current user.
 2012-12-03 10:26:18 -08:00
Daniel Sandler
f87488095e Merge "Show alarm tile for the current user." into jb-mr1.1-dev 2012-12-03 10:21:15 -08:00
Daniel Sandler
0f92a8083d Show alarm tile for the current user. 
We were already refreshing the tile on user switch, but we
were only pulling the information (and observing changes)
for the owner.

Bug: 7596329
Change-Id: I33959af405bc79037b5b1321631d993bea65772f
 2012-12-03 12:59:26 -05:00
Daniel Sandler
d92883c904 am e8366528: am 5046ae56: Merge "framework: fix notification icons not animating till ticker is updated" 
* commit 'e83665284a4e661636471de846a2b569754379ef':
  framework: fix notification icons not animating till ticker is updated
 2012-12-03 08:13:47 -08:00
Daniel Sandler
e83665284a am 5046ae56: Merge "framework: fix notification icons not animating till ticker is updated" 
* commit '5046ae56675b5e81bd7160f12709d609d8b4c19c':
  framework: fix notification icons not animating till ticker is updated
 2012-12-03 08:11:37 -08:00
Daniel Sandler
1a65efd63f am 8ea94173: am 56f0d47e: am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 
* commit '8ea94173388bcd1bd0f21b4783f1e214276c1cba':
  Fix rounding error when drawing panel handles.
 2012-12-03 07:09:21 -08:00
Daniel Sandler
8ea9417338 am 56f0d47e: am 025b43cd: Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 
* commit '56f0d47ed86f9eb483db4f464971b2e17743b87d':
  Fix rounding error when drawing panel handles.
 2012-12-03 07:06:22 -08:00
Daniel Sandler
025b43cd51 Merge "Fix rounding error when drawing panel handles." into jb-mr1.1-dev 2012-12-03 07:00:59 -08:00
Daniel Bateman
258384aff2 framework: fix notification icons not animating till ticker is updated 
Fixes Android issue #15657

Change-Id: If3bb8693d99e3415bcf0fa9adadee5c1bdbb990d
 2012-11-30 16:28:54 -08:00
Daniel Sandler
076324ae19 Fix rounding error when drawing panel handles. 
Bug: 7649037
Change-Id: If8d9fa5f3852729207c31c95cfd68ef54ff47d7d
 2012-11-30 16:14:21 -05:00
Daniel Sandler
6f7654d665 Reduce false swipe-closed gestures in status bar panels. 
VelocityTracker is a powerful tool---too powerful, in this
case, because many devices (I'm looking at you, Nexus 7)
have touchscreens that report total garbage on takeoff and
landing.

PanelView now uses its own incredibly crude velocity tracker
called FlingTracker, which implements a short sliding window
of the last 8 motion events (7 intervals) over which touch
velocity is averaged. There's also a little bias toward more
recent touch events so that the overall velocity of small
circular gestures will tend to favor the exit tangent.

The end result is a primitive low-pass filter on touch
velocity that should help us avoid situations where one (or
even two!) stray MotionEvents at the end of a gesture won't
invalidate the overall thrust.

Bug: 7422342
Change-Id: Idae38d1957727e400493324af4eee357ba5baa27
 2012-11-30 15:28:38 -05:00
Daniel Sandler
a2eb969726 am 590e0e5b: am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 
* commit '590e0e5b8dbc1f9d9bef69d675b158d6a36ac073':
  Suppress quick settings if setup has not been completed.
 2012-11-30 10:14:29 -08:00
Daniel Sandler
590e0e5b8d am 5dde83c4: am 0a6620e8: Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 
* commit '5dde83c4d1e9b3c39f0dbba07421a7dcf678a4cf':
  Suppress quick settings if setup has not been completed.
 2012-11-30 10:09:16 -08:00
Daniel Sandler
0a6620e861 Merge "Suppress quick settings if setup has not been completed." into jb-mr1.1-dev 2012-11-30 10:05:01 -08:00
Daniel Sandler
9e3efb9155 am d1b73fc1: am 71988c81: am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 
* commit 'd1b73fc17ca222cc627c932625efe9c3c1ad3b0c':
  Only show "charging" if the battery is really charging.
 2012-11-30 07:34:53 -08:00
Daniel Sandler
d1b73fc17c am 71988c81: am 386165a3: Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 
* commit '71988c81a3ae9d372c1eb2991f509a8c5c83f08c':
  Only show "charging" if the battery is really charging.
 2012-11-30 07:32:24 -08:00
Daniel Sandler
386165a3ae Merge "Only show "charging" if the battery is really charging." into jb-mr1.1-dev 2012-11-30 07:27:36 -08:00
Baligh Uddin
ad29ea0491 Merge "Import translations. DO NOT MERGE" 2012-11-29 21:14:18 -08:00
Daniel Sandler
7d77752754 am e196eb76: am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit 'e196eb76428976df1bf5ee75ff81bdaa30d796b6':
  Flush the clock format when the locale changes.
 2012-11-29 14:33:30 -08:00
Dianne Hackborn
42e06c8d6b am 5007dea9: am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit '5007dea96e357e11316f5c9a4aea1123ba9dd4c1':
  Cleaner initial boot.
 2012-11-29 14:32:49 -08:00
Dianne Hackborn
36893b16ce am 221d59f7: am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit '221d59f723584d316ea225bdaf1bc75cbfd7a794':
  Quiet down a lot of logging.
 2012-11-29 14:32:25 -08:00
Daniel Sandler
e196eb7642 am a8a63dd7: am 154e2d7d: Merge "Flush the clock format when the locale changes." into jb-mr1.1-dev 
* commit 'a8a63dd7d9d49930b70371319b5712aed17a9c4c':
  Flush the clock format when the locale changes.
 2012-11-29 14:28:07 -08:00
Dianne Hackborn
5007dea96e am bac91ebd: am 860d0cd4: Merge "Cleaner initial boot." into jb-mr1.1-dev 
* commit 'bac91ebdd0ae310a6b92a8b4bb91613025238356':
  Cleaner initial boot.
 2012-11-29 14:26:37 -08:00
Dianne Hackborn
221d59f723 am afdd978c: am 68e0da7e: Merge "Quiet down a lot of logging." into jb-mr1.1-dev 
* commit 'afdd978ccd8d45ac789873dd4cf0ab0dd3f46d20':
  Quiet down a lot of logging.
 2012-11-29 14:25:40 -08:00
Daniel Sandler
a8ef3b044e Suppress quick settings if setup has not been completed. 
The button was already hidden, but there are lots of other
ways to get into QS that should check for USER_SETUP.

Bug: 7638795
Change-Id: Ib6c48fc02e833670768e7dc76e25c38097b88c18
 2012-11-29 16:22:37 -05:00