Commit Graph

1584 Commits

Author SHA1 Message Date
Jim Miller
91fd9a9772 Merge "Fix 3197205: Minor edits to device policy admin strings and documentation" 2011-02-16 17:49:17 -08:00
Jim Miller
6b85768058 Fix 3197205: Minor edits to device policy admin strings and documentation
Change-Id: I3788772c375b916752cd8a98ff5d3751448e4334
2011-02-16 16:27:41 -08:00
Andy Stadler
b84133740a am 04ddff69: am b1835085: Merge "@hide DPM global proxy settings" into honeycomb
* commit '04ddff6905a72d0d39d791eaba33546fb66b15a6':
  @hide DPM global proxy settings
2011-02-16 12:22:57 -08:00
Andy Stadler
d26727273d @hide DPM global proxy settings
They don't work as advertised, so remove from SDK.

Bug: 3460938

Change-Id: I87f80ebf38b228a4085630f1c2526c1d86b93dd7
2011-02-16 10:53:33 -08:00
Scott Main
55cdc0c904 am 0ab1b326: am 13033ea5: docs: fix misc broken links
* commit '0ab1b326c72afb2bd7798462fcdd8e5d3b440fd2':
  docs: fix misc broken links
2011-02-15 20:15:00 -08:00
Scott Main
13033ea527 docs: fix misc broken links
Change-Id: Id7d0ee36398aca452ceb2c3d15982397f58a06c6
2011-02-15 16:00:37 -08:00
Daisuke Miyakawa
5c40f3fcc9 Fix typo.
Change-Id: I32bbe182d51d5fe0289c8939fbadb57336ddd98a
2011-02-15 13:24:36 -08:00
Vasu Nori
f9e8523e62 bug:3425749 send notification for completed download
Change-Id: Ib46df5eaa9316fe0fc843fee1e4597e22768f4a8
2011-02-10 16:54:03 -08:00
Adam Powell
a1ea2c8457 Merge "Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called before first layout" 2011-02-08 16:32:54 -08:00
Adam Powell
50efbed668 Fix bug 3345948 - ActionBar.show()/hide() shouldn't animate if called
before first layout

Enable/disable the action bar show/hide animation as part of the
activity/dialog lifecycle. This allows apps to set action bar
visibility state as the activity first becomes visible or returns to
visibility without the associated animation.

Change-Id: I85ff9268d2cb2c8fcd3364dd275597fe90529224
2011-02-08 16:24:15 -08:00
Scott Main
121370d25c am 3c565377: am b508d6e2: Merge "docs: fix links to revised fundamentals documents" into honeycomb
* commit '3c5653773d6b48f27aa52d746a7a6f8728d5ba36':
  docs: fix links to revised fundamentals documents
2011-02-08 15:06:54 -08:00
Scott Main
7aee61f5a9 docs: fix links to revised fundamentals documents
Change-Id: Ie2a660cce1d00f924c9fde5c6a00776307e5e1c7
2011-02-08 11:37:44 -08:00
Daniel Sandler
32cd1d5053 resolved conflicts for merge of 31796297 to master
Change-Id: Ice632b3378f8f67c186245fdb63b022ade864ba1
2011-02-07 16:12:16 -05:00
Daniel Sandler
4ad2547fe0 Merge "Ongoing notification for GPS use." into honeycomb 2011-02-03 20:49:10 -08:00
Daniel Sandler
e40451a89d Ongoing notification for GPS use.
This change improves upon the notification priority API
introduced in change I9e738cc4, allowing privileged clients
to set the priority of a notification when posting it
directly to INotificationManager. StatusBarTest is updated
to test this new feature.

The new LocationController in SystemUI uses this facility to
post a high-priority ongoing notification whenever GPS is in
use (replacing the functionality of the legacy GPS status
bar icon).

Also happens to fix http://b/3325472 (adding a log message
when notifications are dropped because of a missing icon).

Bug: 3412807

Change-Id: I523016ffa53bf979be98ddc4a2deb55a6270c68a
2011-02-03 21:11:46 -05:00
Vasu Nori
1b67231483 am 9ec496b4: am e1cbd0a8: Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
* commit '9ec496b484305defa6cbb691b85836ace8b73a02':
  Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
2011-02-03 18:08:44 -08:00
Vasu Nori
e1cbd0a85f Revert "Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb"
This reverts commit 6bc710f769, reversing
changes made to 7ba35f5ab3.
2011-02-03 12:20:31 -08:00
Vasu Nori
b73fb5401e am 99e8e047: am 6bc710f7: Merge "bug:3414192 new API to designate a download to be OTA update" into honeycomb
* commit '99e8e0470249ce145003cc1eabc5ae391af34a06':
  bug:3414192 new API to designate a download to be OTA update
2011-02-02 17:15:16 -08:00
Vasu Nori
72725ebcad bug:3414192 new API to designate a download to be OTA update
Change-Id: Iae2f6185e130324ad956f594e78b1d8b2176c808
2011-02-02 15:08:49 -08:00
Brian Muramatsu
e776768b26 am 0872e36c: am 1d696fa4: Merge "Fix Incorrect Times in TimePickerDialog" into honeycomb
* commit '0872e36ccb0926fe1fb04a0bc6593f9c167dacbc':
  Fix Incorrect Times in TimePickerDialog
2011-02-01 18:13:24 -08:00
Brian Muramatsu
87879e8ef9 Fix Incorrect Times in TimePickerDialog
Bug 3414311

TimePicker#setCurrentHour subtracts 12 from the given hour if
is24HourView returns false. TimePickerDialog calls setCurrentHour before
setIs24HourView, so the 12 will always be substracted from the time.
Reorder the statements so that TimePickerDialog sets is24HourView,
before setting the hour and time.

Change-Id: Ib997397b04dbdd767e67806aea7614426019e938
2011-02-01 17:56:29 -08:00
Dianne Hackborn
cc322207cc am 97510f6a: am 260c3c77: Fix issue #3381489: IllegalStateException: attempt to re-open...
* commit '97510f6abda493119cbf7db84064291a7edacfc0':
  Fix issue #3381489: IllegalStateException: attempt to re-open...
2011-01-30 18:08:12 -08:00
Dianne Hackborn
260c3c77d9 Fix issue #3381489: IllegalStateException: attempt to re-open...
...an already-closed object: android.database.sqlite.SQLiteQuery

It turns out there is a state we are missing -- the loader is
still needed, but in the inactive list.  In this case the loader
needs to continue holding on to its current data, and not deliver
any new data (which would result in it releasing its old data).

This introduces the new state to Loader, and uses it in
AsyncTaskLoader so all subclasses of that should get the new
correct behavior.

A further improvement would be to unregister CursorLoader's
content listener when going in to this state, but that can
wait for later.

Change-Id: I6d30173b94f8e30b5be31d018accd328cc3388ec
2011-01-30 17:58:49 -08:00
The Android Open Source Project
b2abd8c424 Mass merge from gingerbread - do not merge
Change-Id: I45dc3596bf4211d8f91c64f2d1d00588878df629
2011-01-30 12:40:38 -08:00
Joe Onorato
5be5f51c2e am 7f51171a: am a0f2cdb5: Merge "999" into honeycomb
* commit '7f51171ab3afebe9e9695c0991c579bc959a180d':
  999
2011-01-28 18:52:26 -08:00
Joe Onorato
7f51171ab3 am a0f2cdb5: Merge "999" into honeycomb
* commit 'a0f2cdb50720b0a1960e5342b376867b2c9ad1df':
  999
2011-01-28 18:50:03 -08:00
Joe Onorato
c6925ca684 999
Bug: 3403177
Change-Id: Ib53098f364bb15249f27f89127e0d2a4daf81d6a
2011-01-28 18:46:20 -08:00
Joe Onorato
bafa3a31f5 am d6874a10: am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* commit 'd6874a105ee584b1dc60aae2f2af7c78ee875114':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:45:51 -08:00
Joe Onorato
d6874a105e am cfd0bafd: Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* commit 'cfd0bafdebf1fccd3f5a0baed5cad8a539546e9b':
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:43:22 -08:00
Joe Onorato
cfd0bafdeb Merge changes Iaa7bc042,Icc312fc9,I50ba06ed into honeycomb
* changes:
  Make keyguard also ask to turn the back button off, now that it is controlled separately.
  Allow independent control of the back and the other navigation buttons.
  Allow the status bar disable flags to be used as View's system ui visibility fields.
2011-01-28 13:40:45 -08:00
Dianne Hackborn
f2a8b3c450 am 8691b724: am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb
* commit '8691b7243d40d5ef0ab94b8d5f204635d36bf1c4':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
2011-01-28 12:48:15 -08:00
Dianne Hackborn
8691b7243d am 10e4148b: Merge "Fix issue #3291173: Problem report for NewsRoom - RSS News Reader" into honeycomb
* commit '10e4148b62c9bfed945c1bcea9dd5eea2a17b0d0':
  Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
2011-01-28 12:46:51 -08:00
Dianne Hackborn
420829ef78 Fix issue #3291173: Problem report for NewsRoom - RSS News Reader
The framework had started using the LayoutInflator's factory
for itself, which breaks apps that want to use it.  Add a hack for
the framework to insert its own private factory.

Also fix a deadlock in the system process.

Change-Id: Iaf80186a5d7e4029faf89e968e184abdaabe514a
2011-01-28 12:21:54 -08:00
Dianne Hackborn
e579b34752 am 6a11185b: am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb
* commit '6a11185b9293151cb3c12c296cf989ea0e7cb898':
  Fix issue #3398767: Need translucent holo theme
2011-01-27 22:50:45 -08:00
Dianne Hackborn
6a11185b92 am c8c3021a: Merge "Fix issue #3398767: Need translucent holo theme" into honeycomb
* commit 'c8c3021ac3b5ca2315148d5dae143b53b7d68a60':
  Fix issue #3398767: Need translucent holo theme
2011-01-27 22:48:32 -08:00
Joe Onorato
6478adc6b4 Allow independent control of the back and the other navigation buttons.
Bug: 3363046
Change-Id: Icc312fc9ffbf2f584dc541489c9769b07ed50315
2011-01-27 21:41:30 -08:00
Joe Onorato
7bb8eeb90c Allow the status bar disable flags to be used as View's system ui visibility fields.
Bug: 3363046
Change-Id: I50ba06ed9a4d2f5d0e0c807437aea9900f44fee9
2011-01-27 21:41:24 -08:00
Dianne Hackborn
e79b55482e Fix issue #3398767: Need translucent holo theme
Change-Id: I2ce87798ff58315cb96968ab06e5a52da9f35ef8
2011-01-27 15:18:46 -08:00
Jeff Hamilton
fb69e0c0ff resolved conflicts for merge of 0716ea14 to honeycomb-merge
Change-Id: I8f5e40c83a470e81910cd07f11fe683bb6f96421
2011-01-27 12:29:27 -06:00
Jeff Hamilton
7ef536ad2e resolved conflicts for merge of 52d3203e to honeycomb-merge
Change-Id: Icb56943bc4cd6a93e4e2ff13fd2be6e5b7ca161b
2011-01-26 23:26:16 -06:00
Kenny Root
d01d1dd7d5 am 1f8e2f99: am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
* commit '1f8e2f99585040b3904f1b6863000d9d208eda02':
  Add API for preferred Launcher icon size and density
2011-01-26 21:19:59 -08:00
Kenny Root
1f8e2f9958 am 5d506fa7: Merge "Add API for preferred Launcher icon size and density" into honeycomb
* commit '5d506fa7274e8ba84e348e11c22729b58802f796':
  Add API for preferred Launcher icon size and density
2011-01-26 21:15:28 -08:00
Kenny Root
5ef44b7566 Add API for preferred Launcher icon size and density
Applications that create an icon for launcher to use couldn't determine
which size or density the icon should be created.

Bug: 3224340
Change-Id: Iee96113a4092696a9bd18eecbd2593b38f952a16
2011-01-26 19:43:27 -08:00
Scott Main
c42eb2cce7 am d2b87091: am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the
* commit 'd2b87091cc30c575496eb78ebea88297da775359':
  Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
2011-01-26 19:08:55 -08:00
Scott Main
d2b87091cc am 0f2e2b8b: Merge "Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it\'s not a good location and the info is avilable in the dev guide, but also added some of the info to the R
* commit '0f2e2b8b82c7b589bcc603ce57f8ff3d1c947784':
  Update package descriptions with editorial revisions. Notably, this removes exessive info about resources from the content package, because it's not a good location and the info is avilable in the dev guide, but also added some of the info to the Resources class description.
2011-01-26 17:09:21 -08:00
Scott Main
f4f05b8f24 Update package descriptions with editorial revisions.
Notably, this removes exessive info about resources
from the content package, because it's not a good location
and the info is avilable in the dev guide, but also
added some of the info to the Resources class description.

Change-Id: Ie78af26c9cec66314deb98e53078f48e16c08e70
2011-01-26 14:58:19 -08:00
Dianne Hackborn
17d7cbc14c am a58552e0: am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb
* commit 'a58552e03de2f24aef735e94fcfab12a0078a3b3':
  Argh forget to include my final part of the change.
2011-01-25 16:20:16 -08:00
Dianne Hackborn
a58552e03d am f95bd0fe: Merge "Argh forget to include my final part of the change." into honeycomb
* commit 'f95bd0feb57f1503be7c08083c0a4d22286256e8':
  Argh forget to include my final part of the change.
2011-01-25 15:25:39 -08:00
Dianne Hackborn
f812fee071 Argh forget to include my final part of the change.
Change-Id: I1e2711e1ecde0350047f1edef9a59947ff5749eb
2011-01-25 14:54:29 -08:00
Dianne Hackborn
1a728e30ef am a2909773: am 4426f643: Merge "Fix issue #3385839: Fragment.onCreateView is passing in activity..." into honeycomb
* commit 'a29097731254975fdeba8702f3167ef2d14bcdc7':
  Fix issue #3385839: Fragment.onCreateView is passing in activity...
2011-01-25 14:10:42 -08:00