Commit Graph

666 Commits

Author SHA1 Message Date
Eric Fischer
4d9d75a424 Import revised translations. DO NOT MERGE
Change-Id: Ic83849d97650cec0560d847a962756c53d65ea78
2010-08-04 10:45:20 -07:00
Dianne Hackborn
508fedc410 Improvements to manage apps / running services:
- Running services now keeps a single data structure to make
  switching through the UI a lot faster.
- Display text when there are no apps.
- Fix deadlock.
- Add new preference entry to view manage apps for storage use.
- Etc.

Change-Id: I0f5babf407ed7e84169f59584ddcb6cd0e9d67d9
2010-07-28 17:41:08 -07:00
Dianne Hackborn
49f4ba4adc Various small UI cleanup in settings.
- Remove title bar in various places where it is not useful.
- Tighten up some text to avoid spilling across lines.
- Remove strong wording about turning off GPS to save battery.

Change-Id: Ieed9f8f3a3cf6a892a49362677594b447a266925
2010-07-24 17:51:23 -07:00
Dianne Hackborn
9db5ee35d5 Add facility to disable system packages.
Change-Id: I762c76993e0f88d255dfc04acbea6c6adea7103d
2010-07-24 16:55:22 -07:00
Dianne Hackborn
cbaf6ceb8e Add battery history details activity.
Adds a full-screen version of the battery history visualization,
which you can get to by tapping on the battery history chart in
the summary screen.

Change-Id: Ibca5ef3d0883ff6ffa80b6ddca3c8ac838c85842
2010-07-24 13:37:04 -07:00
Irfan Sheriff
15fe0e4795 Merge "Allow soft AP settings config before bring up" into gingerbread 2010-06-25 19:50:14 -07:00
Dianne Hackborn
c01b0c83fc Allow user to see and stop heavy-weight processes.
Change-Id: If5caed3972ab03a54fbf8c459cdfc136e4bdc020
2010-06-24 12:38:33 -07:00
Irfan Sheriff
bb480bbb92 Allow soft AP settings config before bring up
Bug: 2538623
Change-Id: I4b927deb0e4981c164744b85e5c85c3fc95a31eb
2010-06-24 12:04:36 -07:00
Dianne Hackborn
ea38e67853 Show history of battery level.
Also clean up to remove dead code for running services and old
battery usage UI.

Finally some string improvements from Roy.

Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
2010-06-11 12:46:21 -07:00
Dianne Hackborn
728ac35373 New Running Services UI.
This introduces a simplified (thanks, dsandler!) UI for Running Services,
collapsing the groups of apps and processes into single lines.  Tapping
on a line moves to a new activity showing details on that group, where the
stop functionality is now available.

This UI is now also integrated into Manage Applications, as the Running
tab.  You no longer get a really confusing, misleading, scary list of
every package that appears to be laying around for some reason.

The code was also re-organized, to put everything related to Manage
Applications and Running Services under its own package.

There is still some clean-up -- some performance improvements (such as
not re-computing the world when we switch to the details view), and if
this looks good then eradicating the old running services UI.

Change-Id: I3fc059c18060600742cab5b455d11ff74bf45ae3
2010-06-07 12:33:53 -07:00
Kenny Root
2486572bd6 am e4c0cd6d: am 365ef4a0: Update strings for backup
Merge commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken

* commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86':
  Update strings for backup
2010-06-03 17:09:28 -07:00
Kenny Root
e4c0cd6d8c am 365ef4a0: Update strings for backup
Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp

* commit '365ef4a095189573b67573f6750f5891c11b7895':
  Update strings for backup
2010-06-03 17:05:06 -07:00
Kenny Root
365ef4a095 Update strings for backup
Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
2010-06-03 16:42:00 -07:00
Kenny Root
a262b5d1a0 am 273464d5: am aa1f8aee: Clarify backup setting
Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken

* commit '273464d5a1369a784eebeebaa4a4f8b4371b7699':
  Clarify backup setting
2010-06-03 15:07:14 -07:00
Kenny Root
273464d5a1 am aa1f8aee: Clarify backup setting
Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp

* commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385':
  Clarify backup setting
2010-06-03 15:02:13 -07:00
Kenny Root
aa1f8aeeea Clarify backup setting
Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
2010-06-03 13:42:12 -07:00
Irfan Sheriff
ca61c25578 am a4966840: am de3e5665: Add phase2 authentication settings
Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken

* commit 'a496684019497395b71c6d460501197a74e21e0e':
  Add phase2 authentication settings
2010-06-03 11:14:40 -07:00
Irfan Sheriff
a496684019 am de3e5665: Add phase2 authentication settings
Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp

* commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1':
  Add phase2 authentication settings
2010-06-03 11:13:21 -07:00
Irfan Sheriff
de3e56650d Add phase2 authentication settings
Bug: 2734813
Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
2010-06-02 16:31:20 -07:00
The Android Open Source Project
b6c756d521 am 50c7f2d9: merge from open-source master
Merge commit '50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken

* commit '50c7f2d92a8100982c49027058fb05069e4a1e2a':
  A button in the master clear information screen was partly hidden.
2010-05-19 09:14:10 -07:00
The Android Open Source Project
50c7f2d92a merge from open-source master
Change-Id: I5698914cf9093696ad851412a510a99419989d17
2010-05-19 08:30:08 -07:00
Dianne Hackborn
3f253cf2d7 am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken

* commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef':
  Fix issue #2694643: Remove/Resolve STOPSHIP
2010-05-18 15:28:29 -07:00
Dianne Hackborn
fcc577b2a1 am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIP
Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp

* commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624':
  Fix issue #2694643: Remove/Resolve STOPSHIP
2010-05-18 15:26:17 -07:00
Dianne Hackborn
f9762a2c39 Fix issue #2694643: Remove/Resolve STOPSHIP
*poof*

Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
2010-05-18 15:22:32 -07:00
Henrik Tuszynski
de6007cbf8 A button in the master clear information screen was partly hidden.
The master reset button was partially hidden in landscape mode.
This change nests the current layout in a ScrollView making the
layout scrollable.

Change-Id: I2f7b8a222e3a25930b134314640b1c765b964254
2010-05-18 09:25:05 +02:00
Kenny Root
7a4cff13c9 am 28b245c0: Import revised translations
Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp

* commit '28b245c01d49b7710d1a918849fe8f159e8f43b5':
  Import revised translations
2010-05-17 11:45:04 -07:00
Kenny Root
28b245c01d Import revised translations
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Henrik Hall
a7ece710fe Fixing Swedish translations of a few texts under "Phone info".
* Build number
* Firmware version

Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
2010-05-11 13:38:44 -07:00
Robert Greenwalt
ddde146f8d am 482eadea: am e434bfb2: String change - wifi tether = hotspot
Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken

* commit '482eadeae85a1764b86133172d11364df6ce7227':
  String change - wifi tether = hotspot
2010-05-10 10:16:29 -07:00
Robert Greenwalt
482eadeae8 am e434bfb2: String change - wifi tether = hotspot
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp

* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
  String change - wifi tether = hotspot
2010-05-10 10:14:36 -07:00
Robert Greenwalt
e434bfb216 String change - wifi tether = hotspot
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Kenny Root
a359fb77d4 am 6d409870: Import revised translations
Merge commit '6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp

* commit '6d409870981361af2f547fba05877e7f405af75a':
  Import revised translations
2010-04-29 16:03:30 -07:00
Kenny Root
6d40987098 Import revised translations
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
2010-04-29 16:01:54 -07:00
Kenny Root
19b4bdca55 am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo
Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken

* commit '9fef437e04edd18f6406a49095403a1b71becf58':
  Import revised translations
2010-04-28 09:47:07 -07:00
Kenny Root
9fef437e04 am b3c872bf: Merge "Import revised translations" into froyo
Merge commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp

* commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5':
  Import revised translations
2010-04-28 09:34:05 -07:00
Kenny Root
b3c872bf58 Merge "Import revised translations" into froyo 2010-04-28 09:23:34 -07:00
Kenny Root
eab62faea7 Import revised translations
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
2010-04-28 09:20:52 -07:00
Amith Yamasani
e62451789f am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken

* commit '567ca0805e884c124e537edc7eac5cecf8d4e202':
  Fix regression in removing settings that aren't relevant for a platform.
2010-04-27 15:09:49 -07:00
Amith Yamasani
567ca0805e am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp

* commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
  Fix regression in removing settings that aren't relevant for a platform.
2010-04-27 15:08:20 -07:00
Amith Yamasani
64ab5338cb Fix regression in removing settings that aren't relevant for a platform.
Bug: 2630695

The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.

Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.

Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
2010-04-27 13:35:12 -07:00
Daniel Sandler
a9523ed0fb am dd379184: am f0746678: Merge "Redesign vibration settings." into froyo
Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken

* commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7':
  Redesign vibration settings.
2010-04-21 18:19:34 -07:00
Daniel Sandler
94440bd999 am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken

* commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1':
  Labeled categories to help clarify Sound prefs.
2010-04-21 18:19:31 -07:00
Daniel Sandler
dd3791844f am f0746678: Merge "Redesign vibration settings." into froyo
Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp

* commit 'f07466782bb25ce4f2738133d0992f3531af28e5':
  Redesign vibration settings.
2010-04-21 18:15:40 -07:00
Daniel Sandler
9e2810bbed am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyo
Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp

* commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6':
  Labeled categories to help clarify Sound prefs.
2010-04-21 18:15:38 -07:00
Daniel Sandler
2c917847f5 Redesign vibration settings.
Under the hood there remain three axes:
 1. Are we in silent mode now?      | RINGER_MODE_{VIBRATE,SILENT}
 2. Do we vibrate in silent mode?   | VIBRATE_IN_SILENT == 1
 3. Do calls vibrate:     | getVibrateSetting(VIBRATE_TYPE_RINGER)
    - always              |    == VIBRATE_SETTING_ON
    - never               |    == VIBRATE_SETTING_OFF
    - only in silent      |    == VIBRATE_SETTING_ONLY_SILENT

We now expose this to the user much more simply by
collapsing (2) and (3) above, and discarding states that
don't make sense:
  - VIBRATE_SETTING_OFF + VIBRATE_IN_SILENT
  - VIBRATE_SETTING_ONLY_SILENT + !VIBRATE_IN_SILENT

Now we offer the user four choices:

    Phone vibrate:
    * "Never"
        --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_OFF
    * "Always"
        --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ON
    * "Only in silent mode"
        --> VIBRATE_IN_SILENT=1, VIBRATE_SETTING_ONLY_SILENT
    * "Only when not in silent mode"
        --> VIBRATE_IN_SILENT=0, VIBRATE_SETTING_ON

This should make it easier to choose exactly the behavior
the user wants as well as avoid nonsensical combinations of
settings.

Bug: 2598014
Change-Id: I9244d25ec97a3e2b572b71b521049debd22fa4e0
2010-04-21 15:29:34 -04:00
The Android Open Source Project
1795d18f81 am 2c3265af: merge from open-source master
Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken

* commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40':
  Display current IP address in advanced Wifi settings screen
2010-04-21 09:51:01 -07:00
The Android Open Source Project
2c3265af74 merge from open-source master
Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
2010-04-21 09:46:57 -07:00
Daniel Sandler
8ad849ca26 Labeled categories to help clarify Sound prefs.
Bug: 2598014
Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
2010-04-21 08:52:59 -04:00
Mike Lockwood
68b8069862 Display current IP address in advanced Wifi settings screen
Change-Id: I47c6eece376e712b73add72057462926f7b2349f
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-04-20 13:52:38 -04:00
Kenny Root
9789ca7df0 am ee381422: Merge "Import revised translations" into froyo
Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken

* commit 'ee3814226706eb0600928c573254997c4ac148b9':
  Import revised translations
2010-04-15 06:43:16 -07:00