Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
59,840 Commits 3 Branches 0 Tags
e56156eee5ca80f940ae095b5a30b771edbab66f
Commit Graph

19047 Commits

Author SHA1 Message Date
Jeff Sharkey
e56156eee5 am 4f92c9bb: Merge "Sample atomic network stats buckets, full poll." 
* commit '4f92c9bb8d8484fc9a0dfc1549beedbd1ae8bf01':
  Sample atomic network stats buckets, full poll.
 2011-09-19 09:44:06 -07:00
Jeff Sharkey
34c73acf88 Sample atomic network stats buckets, full poll. 
When sampling network stats, always use atomic buckets instead of
interpolating.  Always poll iface and UID together so we distribute
into buckets equally.  Move stale bucket trimming to just before
writing stats.

Bug: 5321340
Change-Id: I78a2226778a79c875f3668336e39ea24a7b4d5c4
 2011-09-18 16:27:21 -07:00
Jeff Sharkey
c57f411211 am ff2aff2a: am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom 
* commit 'ff2aff2ac18daa758e5d51a4fd58976ce5f66d46':
  Collect and persist tethering stats.
 2011-09-18 16:19:42 -07:00
Jeff Sharkey
ff2aff2ac1 am 3d1d57dc: Merge "Collect and persist tethering stats." into ics-factoryrom 
* commit '3d1d57dcdb02ace6af5810bd4ec3f8fad5fc1799':
  Collect and persist tethering stats.
 2011-09-18 16:17:39 -07:00
Jeff Sharkey
3d1d57dcdb Merge "Collect and persist tethering stats." into ics-factoryrom 2011-09-18 16:15:51 -07:00
Adam Powell
e891e7ab87 am d413eb38: Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode" 
* commit 'd413eb3861aae87386d418e9af4875f6f330cd05':
  Fix bug 5333962 - Problems with no action bar/overlay action mode
 2011-09-18 15:40:41 -07:00
Adam Powell
d413eb3861 Merge "Fix bug 5333962 - Problems with no action bar/overlay action mode" 2011-09-18 15:39:05 -07:00
Adam Powell
8ee6d7c20e Fix bug 5333962 - Problems with no action bar/overlay action mode 
Change the standalone action mode window for overlay mode to be of
TYPE_APPLICATION. (This also fixes a bug where overflow menus would
not work properly on these types of action mode bars.)

Set exitFadeDuration on btn_cab_done_holo_* drawables.

Remove no-window-focus override selector states for selectable item
backgrounds to allow proper touch feedback on windows that do not have
focus but that the user can interact with.

Change-Id: Ib504866238708150d21e6183ff7b695869c05d3e
 2011-09-18 15:34:00 -07:00
Mike Lockwood
1e0207674d resolved conflicts for merge of 2f7d7c9b to ics-aah 
Conflicts:
	policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

Change-Id: I851866d74ff9674bfb7ff652d8be65da342273c0
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-09-18 18:25:44 -04:00
Dianne Hackborn
2f7d7c9bdb Merge "Fix issue #5242779: Device not responding to touch on unlock screen" 2011-09-18 14:53:27 -07:00
Dianne Hackborn
38e29a61d0 Fix issue #5242779: Device not responding to touch on unlock screen 
Rework how we decide when it is okay to turn on the screen by having
the policy call back to the power manager when it knows the lock screen
has been drawn.

Change-Id: Ie8f3f72111dcf7f168723e6dce24e0343b4afe5d
 2011-09-18 14:52:52 -07:00
Irfan Sheriff
856877c28d am 04e3bb6d: Merge "Retain DNS information from DHCP request" 
* commit '04e3bb6d32e73a5b7a74186e643458de467ac596':
  Retain DNS information from DHCP request
 2011-09-18 13:33:56 -07:00
Irfan Sheriff
04e3bb6d32 Merge "Retain DNS information from DHCP request" 2011-09-18 13:31:12 -07:00
Jeff Brown
5533184964 am 92061b70: am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom 
* commit '92061b70be48fabd8a1e5fbdbd3021211c820222':
  Can't stop the fling! Bug: 5335420
 2011-09-16 23:32:33 -07:00
Jeff Brown
92061b70be am 79aa4030: Merge "Can\'t stop the fling! Bug: 5335420" into ics-factoryrom 
* commit '79aa40302b643ee6c6227ee354a1b1378e721568':
  Can't stop the fling! Bug: 5335420
 2011-09-16 23:30:52 -07:00
Irfan Sheriff
2c08ede34c Retain DNS information from DHCP request 
DHCP renewal can fail to fill DNS information. In such
a case retain info from DHCP request

Bug: 5314392
Change-Id: I2413f738be7c8c965ef9e7ffbc348e2738aa68b5
 2011-09-16 22:03:09 -07:00
Jeff Brown
b0c71eb9f5 Can't stop the fling! 
Bug: 5335420

Fixed a bug in VelocityTracker where the output velocity was
not being set to zero when not available.

Added a condition to ensure that the velocity is at least
the minimum fling velocity before continuing.  If not, then
the user is trying to stop the fling and scroll more precisely.

Change-Id: I36634b0c3f7a9a09cf20c33f71d41163a8e33eed
 2011-09-16 21:43:58 -07:00
Jeff Brown
70e4a25904 am daa98fe9: Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924"" 
* commit 'daa98fe9f799fcb3d2fe90e400d9f722d64a5bbe':
  Revert "Forces AsyncTask to use the main looper Bug #5333924"
 2011-09-16 21:05:07 -07:00
Jeff Brown
daa98fe9f7 Merge "Revert "Forces AsyncTask to use the main looper Bug #5333924"" 2011-09-16 21:03:15 -07:00
Jeff Brown
99f801da15 Revert "Forces AsyncTask to use the main looper Bug #5333924" 
This reverts commit 6dafefb0f4

This change is breaking the system on startup with an NPE.  Need to fix that first then resubmit.
 2011-09-16 20:44:06 -07:00
Romain Guy
af45bd56ac am 364a92eb: Merge "Forces AsyncTask to use the main looper Bug #5333924" 
* commit '364a92ebb06de563d2024af24538737d619606ab':
  Forces AsyncTask to use the main looper Bug #5333924
 2011-09-16 16:51:59 -07:00
Romain Guy
364a92ebb0 Merge "Forces AsyncTask to use the main looper Bug #5333924" 2011-09-16 16:50:22 -07:00
Romain Guy
269009084c am db0216c6: Merge "Clarify documentation of AdapterView.OnItemSelectedListener Bug #5331587" 
* commit 'db0216c6cc67e4145021d001e0786ebd1338f4a9':
  Clarify documentation of AdapterView.OnItemSelectedListener Bug #5331587
 2011-09-16 16:21:51 -07:00
Romain Guy
f18c8ddd0f Clarify documentation of AdapterView.OnItemSelectedListener 
Bug #5331587

Change-Id: Ic3d6aca573639d6cae3abb45bfe821f5fd31f1bc
 2011-09-16 16:16:36 -07:00
Jeff Sharkey
cdd02c5d76 Collect and persist tethering stats. 
Use new "gettetherstats" netd command to retrieve statistics for
active tethering connections.  Keep tethering poll events separate
from UID poll, even though they end up same historical structures.

Bug: 5244846
Change-Id: Ia0c5165f6712c12b51586f86c331a2aad4ad6afb
 2011-09-16 16:05:51 -07:00
Romain Guy
6dafefb0f4 Forces AsyncTask to use the main looper 
Bug #5333924

This might break applications trying to use AsyncTask on a looper
that is not the main thread, but such apps would already have
issues (AsyncTask has a single static handler and attempting to
use AsyncTask outside of the main thread would likely result
in weird threading issues in other parts of the app.)

Change-Id: Ibbf480627fc7b91326a27d4f5e5af49e8c5b5115
 2011-09-16 16:00:59 -07:00
Jeff Sharkey
685ead559e am 7c963167: Merge "Fix "am profile" when run on system_server." 
* commit '7c963167288d1fb186a98b1232aa2ac571e9ff09':
  Fix "am profile" when run on system_server.
 2011-09-16 15:12:49 -07:00
Jeff Sharkey
7c96316728 Merge "Fix "am profile" when run on system_server." 2011-09-16 15:11:06 -07:00
John Reck
2e5b2925df am 2582890b: Merge "Don\'t switch to handle drag mode when starting selection" 
* commit '2582890b2b5201566b4cba068ba3cfd77a3747e8':
  Don't switch to handle drag mode when starting selection
 2011-09-16 14:25:55 -07:00
John Reck
2582890b2b Merge "Don't switch to handle drag mode when starting selection" 2011-09-16 14:24:33 -07:00
Adam Powell
0ffc530b49 am 0dcb3a6d: Merge "Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls." 
* commit '0dcb3a6deacf40af243b99dbf62b9a9173f1d8b5':
  Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow calls.
 2011-09-16 13:46:56 -07:00
John Reck
c99e447ea7 Don't switch to handle drag mode when starting selection 
Bug: 5327408

Change-Id: Ibda37b1a661d9cdc80a86bc16488178b69fac4a2
 2011-09-16 13:23:43 -07:00
John Reck
41d6bfb279 Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom 2011-09-16 13:21:31 -07:00
Adam Powell
4b86788003 Bug 5244365 - Prevent views from receiving multiple onAttachedToWindow 
calls.

If a View is added to a ViewGroup during the ViewGroup's
onAttachedToWindow method, the child can receive two calls to
onAttachedToWindow. Guard against this.

Change-Id: I845d0cb2c9172071eee1eadc6bc2dd282ee0ef43
 2011-09-16 13:01:01 -07:00
Fred Quintana
3d5759b527 Merge "Add a generic account chooser/add account flow for apps." into ics-factoryrom 2011-09-16 12:13:30 -07:00
John Reck
e668b03ac7 DO NOT MERGE Fix text selection drawing on SW 
Bug: 5312770
 Helps if you actually draw stuff...
 Cherry pick from master

Change-Id: Iae4e7fbd2dc6a5306e8ca8735580e1f2eb50f276
 2011-09-16 11:50:11 -07:00
John Reck
26ed05119e am 5dd1916c: Merge "Fix text selection drawing on SW" 
* commit '5dd1916c247f27284e4af8be5125633fddae6452':
  Fix text selection drawing on SW
 2011-09-16 10:41:11 -07:00
John Reck
5dd1916c24 Merge "Fix text selection drawing on SW" 2011-09-16 10:39:16 -07:00
Mark Brophy
8784fde879 am 1d8cac89: Merge "Fix typo in SearchManager javadoc." 
* commit '1d8cac89aa19fd34c22fff5f0678959f6b10aea7':
  Fix typo in SearchManager javadoc.
 2011-09-16 05:51:11 -07:00
Mark Brophy
1d8cac89aa Merge "Fix typo in SearchManager javadoc." 2011-09-16 05:47:49 -07:00
Mark Brophy
de2ba4c868 Fix typo in SearchManager javadoc. 
Change-Id: I40e1879779e51414f9a5b937209b9decbfb11693
 2011-09-16 12:27:20 +01:00
Kenny Root
c11bc8d224 Be more forgiving in parsing verifier IDs 
RFC 4648's Base32 is made to be forgiving for users doing manual entry
of the digits. For this reason we want to be able to parse lowercase
letters as uppercase and number 0 (zero) as letter O along with number
1 (one) as letter I.

Cherry-pick into ics-factoryrom

Change-Id: I149d8e947ff8b36305c1e61d8a1d80ff0b317cda
 2011-09-15 21:04:57 -07:00
Fred Quintana
1121bb5e6f Add a generic account chooser/add account flow for apps. 
The activity is launched as follows:
  Account account1 = new Account("account1@gmail.com", "com.google")
  Account account2 = new Account("account2@gmail.com", "com.google")
  ArrayList<Account> accounts = new ArrayList<Account>();
  accounts.add(account1);
  accounts.add(account2);
  String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
  Bundle addAccountOptions = null;
  Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
    accountTypes, addAccountOptions);
  startActivityForResult(intent, 0);

Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
 2011-09-15 17:40:43 -07:00
Dianne Hackborn
59153f31c7 am 5adea623: Merge "Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation" 
* commit '5adea623ee62d811a7772fcd7a6dcea223d0c00d':
  Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation
 2011-09-15 17:11:39 -07:00
Dianne Hackborn
5adea623ee Merge "Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation" 2011-09-15 17:09:01 -07:00
Jeff Sharkey
3ad9d00cff Fix "am profile" when run on system_server. 
Split profiler controls into separate object, since system server
doesn't have an AppBindData.

Bug: 5327365
Change-Id: I613170cd94e0d4930dee049d0fe6c19124f13d65
 2011-09-15 16:54:47 -07:00
Fred Quintana
9d286aaf9a am 569584be: Merge "Add a generic account chooser/add account flow for apps." 
* commit '569584be0e51ca6aceb53aa81b5ecac23d1ca55b':
  Add a generic account chooser/add account flow for apps.
 2011-09-15 16:47:52 -07:00
Fred Quintana
569584be0e Merge "Add a generic account chooser/add account flow for apps." 2011-09-15 16:44:53 -07:00
Fred Quintana
89e063113c Add a generic account chooser/add account flow for apps. 
The activity is launched as follows:
  Account account1 = new Account("account1@gmail.com", "com.google")
  Account account2 = new Account("account2@gmail.com", "com.google")
  ArrayList<Account> accounts = new ArrayList<Account>();
  accounts.add(account1);
  accounts.add(account2);
  String[] accountTypes = new String[]{"com.google", "com.android.exchange"};
  Bundle addAccountOptions = null;
  Intent intent = AccountManager.newChooseAccountIntent(account1, accounts,
    accountTypes, addAccountOptions);
  startActivityForResult(intent, 0);

Change-Id: I05a467bdc3552a2e39397b0182879351f4324389
 2011-09-15 16:39:50 -07:00
Dianne Hackborn
4f59f8be0e Fix issue #5300880: setSystemUiVisibility() always triggers a surface reallocation 
Change-Id: Ia0a9d8acba6b62ef095e4c615099466c52eec8e4
 2011-09-15 15:27:59 -07:00