1768 Commits

Author SHA1 Message Date
Dianne Hackborn
a21e3da559 Fix issue #2967969: Crash rotating screen on "delete account" dialog
- Have PreferenceActivity save and restore its header state.
- Keep track of the current header selection.
- When headers are updated, try to retain the current header selection.

Also fix issue #2995541: Cannot add new contact.  We were not allowing
fragment transactions in some cases.

Change-Id: I4aa4c703ed5f4ecf9f425cd7eeea4740c6360ce9
2010-09-13 22:49:54 -07:00
Dianne Hackborn
e746f03c6c resolved conflicts for merge of 53686433 to master
Change-Id: I27004dc464f5771d3205ae5757c6eccc5b16854d
2010-09-13 16:56:10 -07:00
Dianne Hackborn
53686433a9 am 7e9f4eb2: Track client requests through location manager.
Merge commit '7e9f4eb2608148436cef36c9969bf8a599b39e72' into gingerbread-plus-aosp

* commit '7e9f4eb2608148436cef36c9969bf8a599b39e72':
  Track client requests through location manager.
2010-09-13 14:34:22 -07:00
Dianne Hackborn
7e9f4eb260 Track client requests through location manager.
This fixes a problem where applications could ask the location
manager to do very heavy-weight things (like...  say... update
location every minute), which would get accounted against the
system instead of the application because ultimately it is the
system making the heavy calls (wake locks, etc).

To solve this, we introduce a new class WorkSource representing
the source of some work.  Wake locks and Wifi locks allow you
to set the source to use (but only if you are system code and thus
can get the permission to do so), which is what will be reported
to the battery stats until the actual caller.

For the initial implementation, the location manager keeps track
of all clients requesting periodic updates, and tells its providers
about them as a WorkSource param when setting their min update time.
The network location provider uses this to set the source on the
wake and wifi locks it acquires, when doing work because of the
update period.

This should also be used elsewhere, such as in the GPS provider,
but this is a good start.

Change-Id: I2b6ffafad9e90ecf15d7c502e2db675fd52ae3cf
2010-09-13 14:20:48 -07:00
Eric Fischer
569a57dc01 Merge "Import revised translations." 2010-09-13 10:04:58 -07:00
Adam Powell
cf78b3e510 Add support for custom action views in ActionBar menus
Change-Id: Ic7850bc00fcfe95d805dd6a1b15cb5d413942475
2010-09-12 18:33:44 -07:00
Adam Powell
2a5a53709e Fix broken ActionMode close button styling
Change-Id: I425df1433d43c1b2bd392464ed10142532640f81
2010-09-12 15:51:18 -07:00
Romain Guy
ae44d554b7 Merge "Correct implementation of saveLayer()." 2010-09-12 12:25:13 -07:00
Romain Guy
f607bdc167 Correct implementation of saveLayer().
Change-Id: I5375126636913e0a84f2d6bbd0ebe40d2e4f2763
2010-09-12 12:24:12 -07:00
Romain Guy
0ce6c0f82d am 405f537a: am 89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108'

* commit '405f537a47df7ea0c2ef95fd83dee0142eb0c108':
  Fix the layouting of the checkbox.
2010-09-12 08:47:40 -07:00
Romain Guy
405f537a47 am 89e05fd5: Merge "Fix the layouting of the checkbox."
Merge commit '89e05fd560e3347070a55260b7aaec3db5647442' into gingerbread-plus-aosp

* commit '89e05fd560e3347070a55260b7aaec3db5647442':
  Fix the layouting of the checkbox.
2010-09-12 08:44:37 -07:00
Kristian Monsen
9b3f11408b Merge WebKit at r66666 : Update User Agent string with new webkit version.
Change-Id: Id3f9748b806e58f9a8d79553ceff8859eda7c49f
2010-09-11 12:10:00 +01:00
Amith Yamasani
733cbd58cb SearchView API
Implements the basic requirements for in-app search. More work to be done.
2010-09-10 16:00:12 -07:00
Eric Fischer
dddd6fc7d6 Import revised translations.
Change-Id: Ieef5deb2e93542ac57b3ab5a415654b0f00238c2
2010-09-10 15:38:45 -07:00
Gilles Debunne
1acd520326 am ddea348d: am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread
Merge commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0'

* commit 'ddea348daaa0f72fb0aabb4843f9d6af9457efa0':
  Changed menu and expandedMenu background color to dark.
2010-09-10 15:07:33 -07:00
Gilles Debunne
ddea348daa am e262ab2f: Merge "Changed menu and expandedMenu background color to dark." into gingerbread
Merge commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb' into gingerbread-plus-aosp

* commit 'e262ab2f797eeaf9ad200a1b8479f67641c2aebb':
  Changed menu and expandedMenu background color to dark.
2010-09-10 14:19:50 -07:00
Gilles Debunne
26b16f3946 Changed menu and expandedMenu background color to dark.
Change-Id: I662e635c49a4a80295a2f11ccd9406301ffd831d
2010-09-10 13:51:22 -07:00
Eric Fischer
e7be8e8f6c am b6a007c5: Merge "Import revised translations. DO NOT MERGE" into gingerbread
Merge commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473' into gingerbread-plus-aosp

* commit 'b6a007c5cd7bb02250d4dd573ba89367a010a473':
  Import revised translations.  DO NOT MERGE
2010-09-10 13:21:26 -07:00
Eric Fischer
41c2489ee1 Import revised translations. DO NOT MERGE
Change-Id: Ia93fc0d7ab89ff0ccf09f183ae0c9366ce72f9d0
2010-09-10 13:04:39 -07:00
Adam Powell
bc234a19f4 Clean up action bar styles
Change-Id: Ib19698e08d643994c4416aac29a43e9197bbe1f3
2010-09-10 11:51:10 -07:00
Dianne Hackborn
203e9529c5 resolved conflicts for merge of 62d005ec to master
Change-Id: I552d7adffe70a2bd94113ffb70cdc3e625fca0bd
2010-09-09 23:06:27 -07:00
Dianne Hackborn
62d005ec94 am a7d868d4: Merge "Add toast when an app intercepts the launch of another app." into gingerbread
Merge commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859' into gingerbread-plus-aosp

* commit 'a7d868d4f99dfaf85e13498210aecf1ad8efd859':
  Add toast when an app intercepts the launch of another app.
2010-09-09 21:34:44 -07:00
Dianne Hackborn
0dad364adb Add toast when an app intercepts the launch of another app.
The activity manager looks for cases where one app launches immediately
after another.  If this happens, a brief toast is shown telling the user
when app is actually running and what was originally starting.

Change-Id: If94cf5bd393dd0bc0f09789dae044fde1386c481
2010-09-09 21:25:35 -07:00
Sang-il, Lee
b55df4471e Support MBCS characters in contacts and SMS messages that are stored in SIM cards.
Change-Id: I0438c5748a47512fc2a0e4b89ac85e30e3f5c6de
2010-09-09 13:23:42 -07:00
Mike Lockwood
8624e6399d Merge "Add framework resource to specify case sensitivity of the external storage filesystem" 2010-09-09 08:28:53 -07:00
Mike Lockwood
f73738b78a Add framework resource to specify case sensitivity of the external storage filesystem
Change-Id: I8a433de9188c32214b1f8d6a4490dfe731d68c40
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-09 09:58:24 -04:00
Adam Powell
079fd1c0a3 Make action buttons more style-based
Change-Id: Ia7ef4da8d8004f1b3809b4883aafc541695d235a
2010-09-08 21:40:54 -07:00
Adam Powell
75c923e3ec Merge "Added resources and styles for ActionBar tabs" 2010-09-08 16:14:47 -07:00
Adam Powell
ca259f4081 Added resources and styles for ActionBar tabs
Change-Id: I7ba5502146dec2d71b3e9ff57d90e7b5bd2bc2a0
2010-09-08 16:13:48 -07:00
Jake Hamby
94bf9431e5 am e7578344: am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit 'e75783440a55fb0a5ef75066be94a11898f652f0'

* commit 'e75783440a55fb0a5ef75066be94a11898f652f0':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:38:15 -07:00
Jake Hamby
e75783440a am 5872e9d7: Merge "Allow incoming SMS until internal storage is almost full." into gingerbread
Merge commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78' into gingerbread-plus-aosp

* commit '5872e9d7f31e5a4c5f3d871dba02b6d72a7ada78':
  Allow incoming SMS until internal storage is almost full.
2010-09-08 14:34:31 -07:00
Joe Onorato
de6386b8a6 Merge "move recent apps around, attempting to make it not crash." 2010-09-08 14:30:05 -07:00
Joe Onorato
013cfc1116 move recent apps around, attempting to make it not crash.
I think the problem is some kind of Context mismatch because the resource was in the framework but
referencing an app class.

Change-Id: Ia6b37c9c8be5dddc836331859e779cd80dd32596
2010-09-08 17:27:41 -04:00
Jeff Brown
b380c4d7ed resolved conflicts for merge of a05088c1 to master
Change-Id: I7973f9f28586dec9b9659f8f662f40db7997a521
2010-09-08 13:02:55 -07:00
Jake Hamby
bb37163323 Allow incoming SMS until internal storage is almost full.
Fix for bug 2382830: new incoming SMS should not be rejected when
running low on internal phone storage.

Testing revealed that the /data partition should have at least 256 KiB
available in order to prevent random app crashes (including system apps)
due to SQLite transaction failures. With 256 KiB free, the device should
safely boot without storage full errors. This takes into account the
36-40 KiB that the YAFFS2 filesystem reports as available even after
the partition has been completely filled. I've set the default full
threshold to 1 MiB to provide a generous safety margin.

For this bug, I changed the DeviceStorageMonitorService demon to send
two new hidden notifications for device storage "full" and "not full",
when the free space falls below the full threshold (default 1 MiB,
but configurable as a system setting), in addition to the existing
storage low/okay notifications sent when the storage crosses the threshold
of 90% full (also configurable).

The SMS code was changed to use these new notifications so that it can
accept messages until the data partition has been filled to the maximum
safe capacity rather than stopping when it hits 90% full. There should
be no negative impact on battery life because the additional check in
the storage polling service should be offset by an optimization to cache
the free threshold values which were previously being computed every time
through the loop.

While testing this change, I discovered that SMSDispatcher was being
instantiated twice, the first time in GSMPhone/CDMAPhone, and the second
time in SimSmsInterfaceManager / RuimSmsInterfaceManager. Changed the code
to pass the original SMSDispatcher to the Sim/RuimSmsInterfaceManager
constructor.

Change-Id: Ie0c6d05294778ab6ee42e0fa01313af96d824c77
2010-09-08 12:37:18 -07:00
Jeff Brown
a05088c18d am 85a31767: Add support for secure views.
Merge commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6' into gingerbread-plus-aosp

* commit '85a3176704b5bfbeece9bd928369fbb76eec7dc6':
  Add support for secure views.
2010-09-08 11:55:24 -07:00
Jeff Brown
85a3176704 Add support for secure views.
Added the MotionEvent.FLAG_WINDOW_IS_OBSCURED flag which is set by the
input manager whenever another visible window is partly or wholly obscured
the target of a touch event so that applications can filter touches
accordingly.

Added a "filterTouchesWhenObscured" attribute to View which can be used to
enable filtering of touches when the view's window is obscured.

Change-Id: I936d9c85013fd2d77fb296a600528d30a29027d2
2010-09-08 11:50:55 -07:00
Chet Haase
a18a86b43e Rename several animation classes
Change-Id: I6a4544875090db485163c8d56de8718f56d267c7
2010-09-08 09:41:21 -07:00
Mike Lockwood
789a47488c Merge "Fix Intent.ACTION_REBOOT" 2010-09-08 06:52:51 -07:00
Mike Lockwood
b8a8a578c2 Fix Intent.ACTION_REBOOT
Turns out this would be useful for automated testing.

Change-Id: Idd5e35a8d4a354447b17a77fe0b606f78df844d0
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-09-08 07:47:03 -04:00
Ying Wang
7d8bb82dca Merge commit 'd348ea6e0ad3fc029a01c214da4ad4b8d856c4f9' into manual-merge
Conflicts:
	core/res/res/values/public.xml

Change-Id: Id80cc50b669d7ea840d28839431126023980e5a1
2010-09-07 18:39:03 -07:00
Joe Onorato
d348ea6e0a am 1f6a21c2: Merge "Expose the TextAppearance.StatusBar.* styles." into gingerbread
Merge commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d' into gingerbread-plus-aosp

* commit '1f6a21c2377f33a754222a34fa98ea1e21a6d27d':
  Expose the TextAppearance.StatusBar.* styles.
2010-09-07 14:46:08 -07:00
Joe Onorato
ccfc1c1ea1 Expose the TextAppearance.StatusBar.* styles.
Change-Id: I6e1e68ab26495290d480f4fb75facedd6cd62908
2010-09-07 17:12:10 -04:00
Eric Fischer
aab7375799 am 745e751b: Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread
Merge commit '745e751b251baa38e94dfce1fe264574d0204cc2' into gingerbread-plus-aosp

* commit '745e751b251baa38e94dfce1fe264574d0204cc2':
  Preserve old translations for changed strings.  DO NOT MERGE
2010-09-07 11:08:19 -07:00
Eric Fischer
745e751b25 Merge "Preserve old translations for changed strings. DO NOT MERGE" into gingerbread 2010-09-07 11:03:26 -07:00
Jim Miller
be988e3a39 Merge "Update RecentApplications to use shared Carousel widget." 2010-09-03 17:58:31 -07:00
Jim Miller
783cb60ddb Update RecentApplications to use shared Carousel widget.
Change-Id: I5ca7389aeca9ee6f03f48317f9d1034f9fb8c1ca
2010-09-03 17:44:57 -07:00
Chet Haase
13cc1207fa Add ability to enable layout transition animations by default from XML
Change-Id: I2b884c83e868f5d22ef85d65ff8ee984633de65e
2010-09-03 16:22:22 -07:00
Eric Fischer
3a94b7c121 Preserve old translations for changed strings. DO NOT MERGE
Change-Id: I64023ad34cba22133fd355ed4d885b3f831c5aa1
2010-09-03 14:55:45 -07:00
Daniel Sandler
44434f002a Don't get stung!
Change-Id: I8211675e619bcc31c991296387513d07ad53ff10
2010-09-03 14:45:45 -04:00