Commit Graph

1799 Commits

Author SHA1 Message Date
Uriel Rodriguez
49eea136f8 am 363b6052: Merge "changed pokeWakelock() callback to take time in milliseconds" into jb-dev
* commit '363b60527ce82b0f56434e70a8124e4d41e2b1e0':
  changed pokeWakelock() callback to take time in milliseconds
2012-05-10 09:24:46 -07:00
Jeff Sharkey
fe9e28cba7 am 6367b166: Merge "Recover from Throwable in FileRotator, dump." into jb-dev
* commit '6367b1669d41f9fe7cd7abe5e05296edecd50f8e':
  Recover from Throwable in FileRotator, dump.
2012-05-10 09:23:59 -07:00
Uriel Rodriguez
363b60527c Merge "changed pokeWakelock() callback to take time in milliseconds" into jb-dev 2012-05-09 16:12:18 -07:00
Uriel Rodriguez
dff307697d changed pokeWakelock() callback to take time in milliseconds
Changed the pokeWakelock() call back to take one argument - the duration to stay awake in ms.  This
change was needed in order to poke the wakelock for the duration of the watchdog timeout.  This
must be done in the service because the duration of the watchdog timeout is unknown at this point.

Moved pokeWakelock() from start() to handleServiceConnected() to make sure that this poke happens
before the poke in the service.  This poke is still needed to account for when devices are rotated.

Change-Id: I19d62df1489514de0588ebb937678358e70ffc95
2012-05-09 19:08:22 -04:00
Jeff Sharkey
6367b1669d Merge "Recover from Throwable in FileRotator, dump." into jb-dev 2012-05-09 14:36:40 -07:00
Jeff Sharkey
6de357e4d1 Recover from Throwable in FileRotator, dump.
In rewriteSingle(), catch Throwable to rollback to backup file,
instead of just IOException. Also add dumpAll() to pack up contents
for later debugging, and use it when encountering bad stats.

Bug: 6467868
Change-Id: Ic8e287cf5a235706811a304a88d71d11d3a79cd4
2012-05-09 13:43:19 -07:00
Kenny Root
7a7d8f182a am bad417df: Merge "Throw RemoteException when MountService is not yet up" into jb-dev
* commit 'bad417df657128a988b23a6b70b4d08633e4ac5a':
  Throw RemoteException when MountService is not yet up
2012-05-09 13:28:54 -07:00
Kenny Root
07ba2ae327 Throw RemoteException when MountService is not yet up
Instead of throwing NullPointerException when getMountService() returns
null, simply throw RemoteException so the code calling getMountService()
can fail gracefully.

Bug: 6461657
Change-Id: Ibefc17de3e0024eb73bbd24914759c0a404f538e
2012-05-09 09:14:30 -07:00
Adam Powell
217477e013 am ea3f8cc7: Merge "Forgive me monkeys, for I have sinned." into jb-dev
* commit 'ea3f8cc71e0bb89840e727e22ba332bae228ac36':
  Forgive me monkeys, for I have sinned.
2012-05-09 01:50:08 -07:00
Adam Powell
cb533917fa am 1705b2a5: Merge "Fix some oddities in ResolverActivity" into jb-dev
* commit '1705b2a5da8f27bf91fb5bd984c212c9476fc605':
  Fix some oddities in ResolverActivity
2012-05-09 01:47:31 -07:00
Kenny Root
83ea86091b am 29bb27ef: Merge "Add encryption parameters to package installation" into jb-dev
* commit '29bb27ef90564a294d506c2ffd546ba21788aeac':
  Add encryption parameters to package installation
2012-05-09 01:45:43 -07:00
Adam Powell
76889f3482 Forgive me monkeys, for I have sinned.
It has been several hours since my last commit.

Fix an obscure bug that could cause call ordering problems while
updating ListAdapter-based MenuPresenters. This would trigger an
inconsistent return value from the adapter's getCount method that
didn't take the expanded menu item into account, resulting in the
infamous ListView "you didn't call notifyDataSetChanged" exception.

Bug 6412318

Change-Id: I6262846d9c2acdb87ff99116ad78ca4a388efa6d
2012-05-08 22:28:36 -07:00
Adam Powell
9bee4664f8 Fix some oddities in ResolverActivity
* Fix layout for small-screen devices in landscape.

* Properly re-enable buttons after restoring instance state.

* Scroll to the currently selected item after restoring instance
  state.

* Smooth scroll to the currently selected item if the user changes
  selection to an item slightly out of view.

* Place grid scroll bar outside the grid's padding.

* Make the current text read a bit more naturally.

Bug 6460135

Change-Id: Ic60330365cdd815e7517f01b36bcdc9d1c857f30
2012-05-08 11:20:27 -07:00
Kenny Root
29bb27ef90 Merge "Add encryption parameters to package installation" into jb-dev 2012-05-07 18:41:27 -07:00
Anonymous Coward
ceb1b0bfae Add encryption parameters to package installation
Change-Id: Ic9f8ab9f8110f08bb3c00725cfce5b8ee7b766f3
2012-05-07 16:34:49 -07:00
Jim Miller
07e1f12350 am a482f942: Merge "Fix 6397736: Fix issue with MultiWaveView in incoming call screen." into jb-dev
* commit 'a482f942dae90211540c856664ca71ba29297309':
  Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
2012-05-07 14:51:19 -07:00
Jim Miller
72b26c1fa2 Fix 6397736: Fix issue with MultiWaveView in incoming call screen.
This fixes a bug where the incoming call screen sometimes had
misplaced icons. The code previously relied on an additional layout
pass that doesn't happen in the incoming call screen in some cases.

Change-Id: If7c39994c1bdadbd3e97f4b9ebb45f68893fd9bd
2012-05-07 14:39:31 -07:00
Jim Miller
8676726dcf am 06e8d664: Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev
* commit '06e8d6647db54aa76dda92a5a785737e66d262de':
  Fix 6397736: Swipe up to search layout fixes
2012-05-07 14:37:39 -07:00
Jim Miller
06e8d6647d Merge "Fix 6397736: Swipe up to search layout fixes" into jb-dev 2012-05-07 14:34:00 -07:00
Jim Miller
354619c1cc Fix 6397736: Swipe up to search layout fixes
This fixes several layout issues on phones and tablets with MultiWaveView.

It adds a new background scrim to be shown behind the MultiWaveView
on the navigation bar.

MultiWaveView is updated to handle gravity constraints which makes layouts
much more flexible across devices.

Change-Id: I64068f4eaa81ef6c464247049117d53432fcacbd
2012-05-06 22:39:18 -07:00
Adam Powell
1e754e8fac am dad52e15: Merge "Better screen size adaptation for ResolverActivity" into jb-dev
* commit 'dad52e1500660c72a4defd1c4d1139cb1f90ac7b':
  Better screen size adaptation for ResolverActivity
2012-05-06 21:01:20 -07:00
Adam Powell
589e6f960d Better screen size adaptation for ResolverActivity
Change-Id: I2c982c0b7c722ca7cad46cc23ac8d161bee3a1ff
2012-05-06 20:53:07 -07:00
Adam Powell
4ffd4b884b am 97621027: Merge "Limit item heights in split action bars" into jb-dev
* commit '9762102794b90d40d69a9a31aa8cd1538f8151f8':
  Limit item heights in split action bars
2012-05-06 20:07:07 -07:00
Adam Powell
367ee32605 Limit item heights in split action bars
Bug 6449422

Overzealous action views should not be able to cause action bars to
take up a huge amount of space.

Fixed text alignment on action buttons

Change-Id: Ic28d6dacdb6933c63b323f5ed6a6cab5d3726938
2012-05-06 19:54:46 -07:00
Adam Powell
f1a15060d0 am b2269d67: Merge "Revisions to ResolverActivity" into jb-dev
* commit 'b2269d67c4786037f93bff396eeb9ff7f003164a':
  Revisions to ResolverActivity
2012-05-06 17:57:11 -07:00
Adam Powell
b2269d67c4 Merge "Revisions to ResolverActivity" into jb-dev 2012-05-06 17:54:48 -07:00
Adam Powell
c587861fe8 Revisions to ResolverActivity
Bug 6428812

Change ResolverActivity to use a grid rather than a list, and present
buttons for "Use Always" and "Just Once". Use large launcher icons
when appropriate.

Change-Id: I177360a727cbc4b401ffbcea83d1b3dac1de5744
2012-05-06 17:52:30 -07:00
Dianne Hackborn
7bedac9417 am 139e5aa1: Fix issue #6404215: New ActionBar auto-hide can conflict with application
* commit '139e5aa1da51b27231ab36344cf2d0dafab23f1e':
  Fix issue #6404215: New ActionBar auto-hide can conflict with application
2012-05-06 12:48:45 -07:00
Dianne Hackborn
139e5aa1da Fix issue #6404215: New ActionBar auto-hide can conflict with application
The action bar now maintains separate states for the things that can
impact its visibility (calls from the app, action mode, system UI) so
that the changes in these won't incorrectly mix together.

Also added a hack to force the status bar to be shown when showing
the action bar for an action mode, when the UI is in a state where
the action bar would be shown with a gap above where the status bar
is.

Change-Id: Ib0950a7f585c5d2c9e77d11b237ba6e150f15ebd
2012-05-06 11:52:05 -07:00
Dianne Hackborn
dbd7131cf4 am e3320e6d: Merge "Fix issue #6444627: New status bar/action bar interaction a bit disjoint" into jb-dev
* commit 'e3320e6d91443450351d49cc2b37477070fb0ce8':
  Fix issue #6444627: New status bar/action bar interaction a bit disjoint
2012-05-05 14:09:56 -07:00
Dianne Hackborn
1cc2bcedb5 Fix issue #6444627: New status bar/action bar interaction a bit disjoint
Make sure action bar animations use same duration as system dock animations.

Change-Id: Ie294d134177207499a05cc93db8f4b859f07ed0c
2012-05-04 18:59:02 -07:00
Jeff Sharkey
3ddb4f80e5 am c065a8af: Merge "Begin collecting xtables iface counters." into jb-dev
* commit 'c065a8af1561544f1557e3f5036e45a4be4a6d7e':
  Begin collecting xtables iface counters.
2012-05-04 12:54:46 -07:00
Jeff Sharkey
c065a8af15 Merge "Begin collecting xtables iface counters." into jb-dev 2012-05-04 12:53:02 -07:00
Adam Powell
e43a4e9017 am f27ba974: Merge "JB API cleanup; ActionMode and View docs" into jb-dev
* commit 'f27ba974d5af68baf071282de65a22ca6e59244c':
  JB API cleanup; ActionMode and View docs
2012-05-03 11:00:20 -07:00
Adam Powell
f27ba974d5 Merge "JB API cleanup; ActionMode and View docs" into jb-dev 2012-05-03 10:58:48 -07:00
Adam Powell
785c447b2b JB API cleanup; ActionMode and View docs
Bugs 6435315, 6434937

Add ActionMode#getTitleOptionalHint() and extend documentation for
View#hasTransientState/setHasTransientState

Change-Id: I2049fb79864c33b34e3bbd13df32861e308c99ad
2012-05-02 21:27:15 -07:00
Jeff Sharkey
5924a7dc53 am 3b5a7089: Merge "Support full 32 bits for socket tags." into jb-dev
* commit '3b5a7089c7d08042f8ff62e50eb76fc8f6cb80c8':
  Support full 32 bits for socket tags.
2012-05-02 19:39:45 -07:00
Jeff Sharkey
3b5a7089c7 Merge "Support full 32 bits for socket tags." into jb-dev 2012-05-02 19:37:29 -07:00
Jeff Sharkey
2d6c580262 Support full 32 bits for socket tags.
Bug: 5321184
Change-Id: Iadb3a4ad541ef012cea35b70ad440eca4c879f42
2012-05-02 16:01:14 -07:00
Adam Powell
020d53224c am fbbdbc2d: Merge "Fix setting action bar home-as-up from AB style" into jb-dev
* commit 'fbbdbc2d2326e96ce31950baccddd2f295fe594c':
  Fix setting action bar home-as-up from AB style
2012-05-02 15:44:45 -07:00
Adam Powell
d40423a7ad Fix setting action bar home-as-up from AB style
Bug 6427860

Change-Id: I0052417a2c97560ade768509781b27b5e064660d
2012-05-02 14:06:03 -07:00
Adam Cohen
9edbb23577 am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev
* commit 'dfed49a2852e9336e212f6934dcddec7dd743c26':
  Changing app widget "extras" to "options" and another small API Review issue
2012-05-02 11:08:17 -07:00
Adam Cohen
d2097ebacf Changing app widget "extras" to "options" and another small API Review issue
-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
2012-05-02 09:32:42 -07:00
Jeff Sharkey
e8914c3627 Begin collecting xtables iface counters.
Add method to parse new iface_stat_fmt proc stats, or return null
when kernel support is unavailable. Add test and remove older, unused
parsing code. Create new "xt" recorder to persist the new xtables
counters when available.

Add SSID support to NetworkIdentity to fix policy tests.

Bug: 6422414
Change-Id: I77f70e9acb79a559ab626f3af5c4f3599801ed43
2012-05-01 21:04:26 -07:00
Jean-Baptiste Queru
2d28f53514 am 31ab51a3: am 2066f7d9: Merge "Prevent empty overflow popup when there are no overflow items."
* commit '31ab51a369ab57c82d0271115ba31b3b20ce6e6b':
  Prevent empty overflow popup when there are no overflow items.
2012-05-01 06:47:21 -07:00
Jean-Baptiste Queru
5e4f01f02d am f59d2912: am bfe71c35: Merge "statistics from some cpus don\'t fit"
* commit 'f59d2912354a6be6f6181ec945f6f657a5469fb8':
  statistics from some cpus don't fit
2012-05-01 06:47:15 -07:00
Jean-Baptiste Queru
2066f7d986 Merge "Prevent empty overflow popup when there are no overflow items." 2012-05-01 05:52:12 -07:00
Dianne Hackborn
414d50bce6 Merge "Fix issue #6234928: android.app.IntentReceiverLeaked:" into jb-dev 2012-04-30 18:29:20 -07:00
Dianne Hackborn
d44713a63d Fix issue #6234928: android.app.IntentReceiverLeaked:
Activity com.android.internal.app.ChooserActivity has leaked IntentReceiver

Change-Id: I02488931d8c02ecbe0c6fc2f7ce708a9dc406f67
2012-04-30 16:34:46 -07:00
Dianne Hackborn
5c58de3a52 Add system insets to windows.
This will be used to determine which parts of a window a completely
hidden by system UI elements (status bar, nav bar, system bar) so
that they can be clipped out from rendering.

Change-Id: I2c6c6ac67dbdfeed82d2c089ef806fb483165bd9
2012-04-30 12:11:43 -07:00