summaryrefslogtreecommitdiffstats
path: root/res
Commit message (Collapse)AuthorAgeFilesLines
* Allow user to see and stop heavy-weight processes.Dianne Hackborn2010-06-241-0/+3
| | | | Change-Id: If5caed3972ab03a54fbf8c459cdfc136e4bdc020
* Show history of battery level.Dianne Hackborn2010-06-117-404/+57
| | | | | | | | | Also clean up to remove dead code for running services and old battery usage UI. Finally some string improvements from Roy. Change-Id: I8765a4c744b92edd1505f14c47fea57b918e5d7b
* New Running Services UI.Dianne Hackborn2010-06-0711-13/+367
| | | | | | | | | | | | | | | | | | | | 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
* am e4c0cd6d: am 365ef4a0: Update strings for backupKenny Root2010-06-031-2/+2
|\ | | | | | | | | | | | | Merge commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86' into kraken * commit 'e4c0cd6d8cfae4b96596b280fcd125564d290a86': Update strings for backup
| * am 365ef4a0: Update strings for backupKenny Root2010-06-031-2/+2
| |\ | | | | | | | | | | | | | | | | | | Merge commit '365ef4a095189573b67573f6750f5891c11b7895' into froyo-plus-aosp * commit '365ef4a095189573b67573f6750f5891c11b7895': Update strings for backup
| | * Update strings for backupKenny Root2010-06-031-2/+2
| | | | | | | | | | | | Change-Id: Icfc39bd1dd0bc38ac5fde300aeb1e8822825d57a
* | | am 273464d5: am aa1f8aee: Clarify backup settingKenny Root2010-06-032-6/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '273464d5a1369a784eebeebaa4a4f8b4371b7699' into kraken * commit '273464d5a1369a784eebeebaa4a4f8b4371b7699': Clarify backup setting
| * | am aa1f8aee: Clarify backup settingKenny Root2010-06-032-6/+9
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385' into froyo-plus-aosp * commit 'aa1f8aeeea1c27fe88270cc8b5df970d9f292385': Clarify backup setting
| | * Clarify backup settingKenny Root2010-06-032-6/+9
| | | | | | | | | | | | Change-Id: Ifb4497e4ea1453b1afbdd08ed08fddb9055b7251
* | | am a4966840: am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-0322-0/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit 'a496684019497395b71c6d460501197a74e21e0e' into kraken * commit 'a496684019497395b71c6d460501197a74e21e0e': Add phase2 authentication settings
| * | am de3e5665: Add phase2 authentication settingsIrfan Sheriff2010-06-0322-0/+35
| |\ \ | | |/ | | | | | | | | | | | | | | | Merge commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1' into froyo-plus-aosp * commit 'de3e56650d3e12b0bdfeb9311b71e0bb3a80ccc1': Add phase2 authentication settings
| | * Add phase2 authentication settingsIrfan Sheriff2010-06-0222-0/+35
| | | | | | | | | | | | | | | Bug: 2734813 Change-Id: Iaf4455577be888f6c78f490b2cc046adef41403e
* | | am 50c7f2d9: merge from open-source masterThe Android Open Source Project2010-05-191-16/+20
|\ \ \ | |/ / | | | | | | | | | | | | | | | Merge commit '50c7f2d92a8100982c49027058fb05069e4a1e2a' into kraken * commit '50c7f2d92a8100982c49027058fb05069e4a1e2a': A button in the master clear information screen was partly hidden.
| * | merge from open-source masterThe Android Open Source Project2010-05-191-16/+20
| |\ \ | | | | | | | | | | | | Change-Id: I5698914cf9093696ad851412a510a99419989d17
| | * | A button in the master clear information screen was partly hidden.Henrik Tuszynski2010-05-181-16/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Fixing Swedish translations of a few texts under "Phone info".Henrik Hall2010-05-111-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Build number * Firmware version Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
* | | | am fcc577b2: am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef' into kraken * commit 'fcc577b2a15c37c1bbed995c27a48594dc43dfef': Fix issue #2694643: Remove/Resolve STOPSHIP
| * | | am f9762a2c: Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | Merge commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624' into froyo-plus-aosp * commit 'f9762a2c39bc4189329c89272bc83ba11c2c9624': Fix issue #2694643: Remove/Resolve STOPSHIP
| | * | Fix issue #2694643: Remove/Resolve STOPSHIPDianne Hackborn2010-05-181-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | *poof* Change-Id: I386473bc6a6cd0d68d1b0a1b4871caef75f1ade8
| * | | am 28b245c0: Import revised translationsKenny Root2010-05-1726-373/+434
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '28b245c01d49b7710d1a918849fe8f159e8f43b5' into froyo-plus-aosp * commit '28b245c01d49b7710d1a918849fe8f159e8f43b5': Import revised translations
| | * | Import revised translationsKenny Root2010-05-1726-373/+434
| | | | | | | | | | | | | | | | Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
* | | | am 482eadea: am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-103-19/+19
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken * commit '482eadeae85a1764b86133172d11364df6ce7227': String change - wifi tether = hotspot
| * | | am e434bfb2: String change - wifi tether = hotspotRobert Greenwalt2010-05-103-19/+19
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp * commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7': String change - wifi tether = hotspot
| | * | String change - wifi tether = hotspotRobert Greenwalt2010-05-083-19/+19
| | | | | | | | | | | | | | | | | | | | bug:2664412 Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
| * | | am 6d409870: Import revised translationsKenny Root2010-04-2940-857/+545
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp * commit '6d409870981361af2f547fba05877e7f405af75a': Import revised translations
| | * | Import revised translationsKenny Root2010-04-2940-857/+545
| | | | | | | | | | | | | | | | Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
* | | | am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyoKenny Root2010-04-2840-684/+816
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken * commit '9fef437e04edd18f6406a49095403a1b71becf58': Import revised translations
| * | | am b3c872bf: Merge "Import revised translations" into froyoKenny Root2010-04-2840-684/+816
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp * commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5': Import revised translations
| | * | Merge "Import revised translations" into froyoKenny Root2010-04-2840-684/+816
| | |\ \
| | | * | Import revised translationsKenny Root2010-04-2840-684/+816
| | | | | | | | | | | | | | | | | | | | Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
* | | | | am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t ↵Amith Yamasani2010-04-271-105/+87
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | relevant for a platform. Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken * commit '567ca0805e884c124e537edc7eac5cecf8d4e202': Fix regression in removing settings that aren't relevant for a platform.
| * | | | am 64ab5338: Fix regression in removing settings that aren\'t relevant for a ↵Amith Yamasani2010-04-271-105/+87
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | platform. Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp * commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e': Fix regression in removing settings that aren't relevant for a platform.
| | * | | Fix regression in removing settings that aren't relevant for a platform.Amith Yamasani2010-04-271-105/+87
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am dd379184: am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-213-21/+16
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7' into kraken * commit 'dd3791844f7172fc9f231e4d7666a8f81f86daa7': Redesign vibration settings.
| * | | am f0746678: Merge "Redesign vibration settings." into froyoDaniel Sandler2010-04-213-21/+16
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit 'f07466782bb25ce4f2738133d0992f3531af28e5' into froyo-plus-aosp * commit 'f07466782bb25ce4f2738133d0992f3531af28e5': Redesign vibration settings.
| | * | Redesign vibration settings.Daniel Sandler2010-04-213-21/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am 9e2810bb: am 19340d21: Merge "Labeled categories to help clarify Sound ↵Daniel Sandler2010-04-212-0/+29
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | prefs." into froyo Merge commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1' into kraken * commit '9e2810bbed6a84b9e6de3464ec855f0b6c241ef1': Labeled categories to help clarify Sound prefs.
| * | | am 19340d21: Merge "Labeled categories to help clarify Sound prefs." into froyoDaniel Sandler2010-04-212-0/+29
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | Merge commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6' into froyo-plus-aosp * commit '19340d213c4bd4428f940a12d82a494f9e7cfaa6': Labeled categories to help clarify Sound prefs.
| | * | Labeled categories to help clarify Sound prefs.Daniel Sandler2010-04-212-0/+29
| | | | | | | | | | | | | | | | | | | | Bug: 2598014 Change-Id: Ia846367fc479345bfd02c10fe1860373719334eb
* | | | am 2c3265af: merge from open-source masterThe Android Open Source Project2010-04-212-0/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40' into kraken * commit '2c3265af7419c35c1084fd5c1e4726abcdd90f40': Display current IP address in advanced Wifi settings screen
| * | | merge from open-source masterThe Android Open Source Project2010-04-212-0/+8
| |\ \ \ | | |/ / | |/| / | | |/ Change-Id: I9d308271306bfcbdc0ef461605f800e5d48334a3
| | * Display current IP address in advanced Wifi settings screenMike Lockwood2010-04-202-0/+8
| | | | | | | | | | | | | | | Change-Id: I47c6eece376e712b73add72057462926f7b2349f Signed-off-by: Mike Lockwood <lockwood@android.com>
| | * am 359b2bcc: Check in translations for new Settings strings. DO NOT MERGEEric Fischer2010-01-2021-65/+207
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | Merge commit '359b2bccd9b96348d4bad949b000c8310ffe9386' into eclair-plus-aosp * commit '359b2bccd9b96348d4bad949b000c8310ffe9386': Check in translations for new Settings strings. DO NOT MERGE
| | | * Check in translations for new Settings strings. DO NOT MERGEEric Fischer2010-01-2021-65/+207
| | | |
* | | | am ee381422: Merge "Import revised translations" into froyoKenny Root2010-04-1523-871/+968
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Merge commit 'ee3814226706eb0600928c573254997c4ac148b9' into kraken * commit 'ee3814226706eb0600928c573254997c4ac148b9': Import revised translations
| * | | Import revised translationsKenny Root2010-04-1423-871/+968
| | | | | | | | | | | | | | | | Change-Id: Ia29e5c15fbd147579185c31d03844ccc5a11032e
* | | | am 91523d60: Fix 2579923: Update language to make consistent with related ↵Jim Miller2010-04-121-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature. Merge commit '91523d601a6569ce9295a5617ca92a24582ff502' into kraken * commit '91523d601a6569ce9295a5617ca92a24582ff502': Fix 2579923: Update language to make consistent with related feature.
| * | | Fix 2579923: Update language to make consistent with related feature.Jim Miller2010-04-121-1/+1
| | | | | | | | | | | | | | | | Change-Id: I2f07b92d717e4661ec3a2c25775fa90ef62caed3
* | | | am 0b326a6f: Merge "Fix 2579923: Make changing lock screen method more ↵Jim Miller2010-04-126-47/+97
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | discoverable." into froyo Merge commit '0b326a6fad8caf250b61cc49b962495202562a5c' into kraken * commit '0b326a6fad8caf250b61cc49b962495202562a5c': Fix 2579923: Make changing lock screen method more discoverable.
| * | | Fix 2579923: Make changing lock screen method more discoverable.Jim Miller2010-04-116-47/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the organization of lock screen security settings to make choosing an alternate unlock method more discoverable. Instead of having to disable the old lock method to use a new one, the user now just has one set/change option in lock settings, with a list of method-specific setting below it. In addition, we ask the user to confirm their old credentials before prompting them to choose a new one, which eliminates one source of confusion. Also, ChooseLockGeneric now shows a UI if quality isn't specified. Any unlock method less secure than minimum specified by DevicePolicyManager (if active) is greyed out. Change-Id: Iecc6f64d4d3368a583f06f8d5fe9655cc3d5bd3b
generated by cgit v1.1 at 2024-10-28 01:01:06 +0000