OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoImplement poweroff function in Settings menu ics-x86
Jackson Hsu [Thu, 29 Dec 2011 02:13:03 +0000 (10:13 +0800)]
Implement poweroff function in Settings menu

Bugzilla 8729 13343

Add "Power Off" layout under "About tablet" in Settings menu. System can
shutdown when you touch "ok", otherwise back to home screen.

Change-Id: I1c572dca93203e02dd829247d20806a43966e64f
Signed-off-by: Jackson Hsu <jacksonx.hsu@intel.com>
11 years agoadd Spanish layout for Spain
Chih-Wei Huang [Thu, 6 Sep 2012 05:14:06 +0000 (13:14 +0800)]
add Spanish layout for Spain

11 years agoadd Japanese keyboard layout
Kinneko [Mon, 9 Jul 2012 03:30:10 +0000 (11:30 +0800)]
add Japanese keyboard layout

11 years agoadd Italian keyboard layout
Stefan Seidel [Thu, 28 Jun 2012 19:29:17 +0000 (21:29 +0200)]
add Italian keyboard layout

11 years ago[2/2] change hardware keyboard layout on the fly
Stefan Seidel [Tue, 26 Jun 2012 20:02:58 +0000 (22:02 +0200)]
[2/2] change hardware keyboard layout on the fly

This change will allow reconfiguration of the layout of the hardware keyboard.
These are the UI changes.

Parts of this code were inspired by the work of Christopher-Eyk Hrabia
(https://github.com/cehberlin).

12 years agoMerge commit 'android-4.0.4_r1.1' into ics-x86
Chih-Wei Huang [Thu, 5 Apr 2012 10:01:44 +0000 (18:01 +0800)]
Merge commit 'android-4.0.4_r1.1' into ics-x86

Conflicts:
res/values-zu/arrays.xml

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 28 Feb 2012 23:15:44 +0000 (15:15 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoDon't crash if there's no bluetooth functionality (such as in an emulator) do not...
Amith Yamasani [Tue, 28 Feb 2012 01:09:37 +0000 (17:09 -0800)]
Don't crash if there's no bluetooth functionality (such as in an emulator) do not merge.

Bug: 6079494

(cherry picked from commit 5fb53f36cb77c3d924b3fe5c305ce7d082ecdfb8)

Change-Id: Ia0d3a638f93c7c7923ce6e85f3555af0aeda96f9

12 years agoadd 'Never time out' to screen timeout of display settings
Chih-Wei Huang [Sun, 26 Feb 2012 16:54:59 +0000 (00:54 +0800)]
add 'Never time out' to screen timeout of display settings

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 14 Feb 2012 22:17:08 +0000 (14:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 9 Feb 2012 03:08:43 +0000 (19:08 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5cc127e96d61d678d51daf4515bbbda0e9068382

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 2 Feb 2012 20:54:15 +0000 (12:54 -0800)]
Import translations. DO NOT MERGE

Change-Id: Icbeee105c69fdde9ca3b07350a48318bdc3d9d3a

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 21 Jan 2012 00:13:29 +0000 (16:13 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1
Justin Ho [Fri, 20 Jan 2012 22:40:04 +0000 (14:40 -0800)]
Merge "Fix a pseudo race condition in TtsEngineSettingsFragment." into ics-mr1

12 years agoFix a pseudo race condition in TtsEngineSettingsFragment.
Narayan Kamath [Fri, 20 Jan 2012 17:52:02 +0000 (17:52 +0000)]
Fix a pseudo race condition in TtsEngineSettingsFragment.

The issue is that Fragment.setVoiceDataDetails can
be called before Fragment.getView. We guard against this
issue. No thread visibility issues here because both functions
are called on the UI thread.

bug:5884355
Change-Id: Iad91b91c58b04dcb9f34f6b5ff8752f2e8295423

12 years agoLocale string comparisons must ignore case.
Narayan Kamath [Fri, 20 Jan 2012 17:31:03 +0000 (17:31 +0000)]
Locale string comparisons must ignore case.

The spec does not specify case sensitivity and support
for 3 letter locales is currently poor.

bug:5885830
Change-Id: I1b8f582bd19b1b0aed220036c5f17904478dba46

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 12 Jan 2012 00:29:50 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1
Jim Miller [Tue, 10 Jan 2012 18:28:31 +0000 (10:28 -0800)]
Merge "Fix 4560303: Add setting to lock later when power button pressed" into ics-mr1

12 years agoDon't allow wifi tethering when running monkeys.
Amith Yamasani [Mon, 9 Jan 2012 22:52:58 +0000 (14:52 -0800)]
Don't allow wifi tethering when running monkeys.

Bug: 5607825

Remove the wifi access point settings and wifi tethering checkbox when
monkeys are running.

Change-Id: I64b930ddb791013a08c178561fe29130f1f0e4b8

12 years agoFix 4560303: Add setting to lock later when power button pressed
Jim Miller [Sat, 7 Jan 2012 02:28:09 +0000 (18:28 -0800)]
Fix 4560303: Add setting to lock later when power button pressed

This adds a feature to delay locking the device when the power button
is pressed.  This fixes a use case where the user wants to turn off
the display (e.g. to save power) but doesn't want to lock the device.

Change-Id: I711a81c3e79f7accdc1d9cb217b7806a0b8fcf63

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 7 Jan 2012 00:32:49 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Android OS battery usage overstated by screen on time" into ics-mr1
Todd Poynor [Thu, 5 Jan 2012 19:21:08 +0000 (11:21 -0800)]
Merge "Android OS battery usage overstated by screen on time" into ics-mr1

12 years agoAndroid OS battery usage overstated by screen on time
Todd Poynor [Sat, 17 Dec 2011 00:02:51 +0000 (16:02 -0800)]
Android OS battery usage overstated by screen on time

Change-Id: Icbc4b3ecf91bdbb90da3ee0cf1c68bec953d0177
Signed-off-by: Todd Poynor <toddpoynor@google.com>
12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 21 Dec 2011 01:27:42 +0000 (17:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoDon't enable SIM PIN Lock menu if SIM is not available
Kazuhiro Ondo [Fri, 16 Dec 2011 21:34:13 +0000 (15:34 -0600)]
Don't enable SIM PIN Lock menu if SIM is not available

Bug: 5774681
Change-Id: I1edd1447ff83ab8cf9e8a1eb8fbd85ef0becdce7

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 14 Dec 2011 00:04:02 +0000 (16:04 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 13 Dec 2011 18:04:17 +0000 (10:04 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: I2dddd2b4c95c27f47c2299500fc893dd6475e3fe

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 13 Dec 2011 06:09:28 +0000 (22:09 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 12 Dec 2011 19:00:08 +0000 (11:00 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I451a0d68abfcf34dd3b601fed87111ce9c5f2aa8

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 9 Dec 2011 01:36:03 +0000 (17:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoAdd Sprint update menu
Meng Hu [Sun, 27 Nov 2011 05:06:40 +0000 (23:06 -0600)]
Add Sprint update menu

Adds the conditionally used xml ui definition and removes it at runtime when it's not
wanted.  Ported from GB.

bug:5237167
Change-Id: I89a67e1033ddc7099563732e839c08fbadb4fd75

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Thu, 8 Dec 2011 19:09:58 +0000 (11:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 8 Dec 2011 18:36:13 +0000 (10:36 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: If9d9c2cd72682251e2743543c8f6ee36b2c2da2a

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Thu, 8 Dec 2011 18:26:01 +0000 (10:26 -0800)]
Reconcile with ics-mr0-release

Change-Id: I0924e5f898c11034b62b991876bac7e53dd0eebc

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 8 Dec 2011 15:01:43 +0000 (07:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings

Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542

12 years agoMerge "VpnSettings: add support for server certificates." into ics-mr1
Chia-chi Yeh [Wed, 7 Dec 2011 20:26:52 +0000 (12:26 -0800)]
Merge "VpnSettings: add support for server certificates." into ics-mr1

12 years agoam fec195d7: Fix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 20:20:27 +0000 (12:20 -0800)]
am fec195d7: Fix NPE in advanced settings

* commit 'fec195d7564b489fcdd814d066cfbf6af702132b':
  Fix NPE in advanced settings

12 years agoFix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings

Bug: 5723974
Change-Id: Ia0ad05c88f92b6c4b4d87f8565b9a6076cbf7542

12 years agoFix NPE in advanced settings
Irfan Sheriff [Wed, 7 Dec 2011 19:40:49 +0000 (11:40 -0800)]
Fix NPE in advanced settings

Bug: 5723974
Change-Id: I9904b6adb2b51f1511f932ef7cba8f6558417061

12 years agoReconcile with ics-mr0-release
The Android Open Source Project [Wed, 7 Dec 2011 15:25:12 +0000 (07:25 -0800)]
Reconcile with ics-mr0-release

Change-Id: I6c179ffa896fe24988d4e43c9bce91d7499d2010

12 years agoVpnSettings: add support for server certificates.
Chia-chi Yeh [Wed, 7 Dec 2011 01:51:01 +0000 (17:51 -0800)]
VpnSettings: add support for server certificates.

Bug: 5714397
Change-Id: I5ce13e244fba554bec31c4935571b09127b9270a

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 7 Dec 2011 00:54:59 +0000 (16:54 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoRemove watchdog setting for poor network avoidance
Irfan Sheriff [Tue, 6 Dec 2011 19:21:49 +0000 (11:21 -0800)]
Remove watchdog setting for poor network avoidance

Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2

12 years agoam d03c1511: Remove watchdog setting for poor network avoidance
Irfan Sheriff [Tue, 6 Dec 2011 19:37:04 +0000 (11:37 -0800)]
am d03c1511: Remove watchdog setting for poor network avoidance

* commit 'd03c15119d404d282ccc5fba257a6ca76962769c':
  Remove watchdog setting for poor network avoidance

12 years agoRemove watchdog setting for poor network avoidance
Irfan Sheriff [Tue, 6 Dec 2011 19:21:49 +0000 (11:21 -0800)]
Remove watchdog setting for poor network avoidance

Change-Id: I3b0bf26ea73b909055d6cde8b18ff8c26922a7d2

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:37:36 +0000 (10:37 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Tue, 6 Dec 2011 18:37:09 +0000 (10:37 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 6 Dec 2011 18:29:45 +0000 (10:29 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I404eb6f56dab47491c3440f412722d29bca3c32e

12 years agoAdding a system preference whether to speak passwords in accessibility mode (settings).
Svetoslav Ganov [Mon, 5 Dec 2011 20:54:53 +0000 (12:54 -0800)]
Adding a system preference whether to speak passwords in accessibility mode (settings).

By default we do not speak passwords if the user has no headset. However,
many users find this too restrictive and would like a way to enable
password announcement. While we cannot speak the passwords all the time
,to avoid leaking them, we expose a preference so each user can choose
the option that best works for him/her.

bug:5712607

Change-Id: I1a6e95c392c18dc8d7406b1cef49705756b31254

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sat, 3 Dec 2011 00:21:56 +0000 (16:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Thu, 1 Dec 2011 17:57:29 +0000 (09:57 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I8d5ff4f5f728e3c00b63a81740b707d9ac14fb32

12 years agoMerge "Set the same vibrate settings for ringer and notifications." into ics-mr1
Amith Yamasani [Fri, 2 Dec 2011 18:43:58 +0000 (10:43 -0800)]
Merge "Set the same vibrate settings for ringer and notifications." into ics-mr1

12 years agoMerge "Potential fix for NPE in Running services." into ics-mr1
Amith Yamasani [Fri, 2 Dec 2011 18:40:55 +0000 (10:40 -0800)]
Merge "Potential fix for NPE in Running services." into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Fri, 2 Dec 2011 18:26:02 +0000 (10:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1
Gilles Debunne [Fri, 2 Dec 2011 18:22:25 +0000 (10:22 -0800)]
Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1

12 years agoPotential fix for NPE in Running services.
Amith Yamasani [Fri, 2 Dec 2011 18:15:27 +0000 (10:15 -0800)]
Potential fix for NPE in Running services.

Bug: 5698270

Loop was removing items from the list being iterated.

Change-Id: I39e98c554b2fe6024381afbe79b737b812e78f08

12 years agoMerge "Fix 5636798: Watch for SIM state changes in IccSettings." into ics-mr1
Jim Miller [Fri, 2 Dec 2011 00:30:59 +0000 (16:30 -0800)]
Merge "Fix 5636798: Watch for SIM state changes in IccSettings." into ics-mr1

12 years agoSet the same vibrate settings for ringer and notifications.
Amith Yamasani [Thu, 1 Dec 2011 23:32:35 +0000 (15:32 -0800)]
Set the same vibrate settings for ringer and notifications.

Bug: 5586083
Change-Id: I113488d9d7b9c5bafdd30f69f4002c5f4a2f89a7

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 1 Dec 2011 14:46:50 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1
Daniel Sandler [Thu, 1 Dec 2011 03:56:33 +0000 (19:56 -0800)]
Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1

12 years agoFix 5636798: Watch for SIM state changes in IccSettings.
Jim Miller [Thu, 1 Dec 2011 03:16:31 +0000 (19:16 -0800)]
Fix 5636798: Watch for SIM state changes in IccSettings.

This fixes a bug where the SIM enable checkbox was showing the
wrong state.   The code now registers for state changes and updates
the checkbox state appropriately.

Change-Id: Icd4f040140e9f71e75e288968ee7ae616dfd08ce

12 years agoMerge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
Amith Yamasani [Thu, 1 Dec 2011 03:04:33 +0000 (19:04 -0800)]
Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1

12 years agoOverhaul vibrate and silent settings to match hard keys.
Amith Yamasani [Wed, 30 Nov 2011 00:38:14 +0000 (16:38 -0800)]
Overhaul vibrate and silent settings to match hard keys.

We go back to the old style of toggling between Mute/Vibrate/Normal.
There is an addition of a checkbox to indicate Vibrate on ring/notif.

Icons in volume dialogs are no longer touchable.

Bug: 5586083

This simplifies the logic in SoundSettings quite a bit, since there's a 1-1 mapping
with ringer mode.

Don't disable volume sliders when muted, so you can go to zero and back up by sliding
your finger. This is because the icons are not clickable anymore.

Change-Id: Ia7ce7e1bf108419eb107f03b7720101efe1598b1

12 years agoPulling screen savers for now. DO NOT MERGE.
Daniel Sandler [Wed, 30 Nov 2011 19:09:47 +0000 (14:09 -0500)]
Pulling screen savers for now. DO NOT MERGE.

Bug: 5689684
Change-Id: Ida6f23484c91d1cde539fc4a64e467970fa1fdb3

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 30 Nov 2011 14:46:56 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Show screen saver toggle on tablets." into ics-mr1
Daniel Sandler [Wed, 30 Nov 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Show screen saver toggle on tablets." into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Tue, 29 Nov 2011 21:18:54 +0000 (13:18 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: Ia5368f1dffbd304e7b95d91f2a64acdc76381fa6

12 years agoShow screen saver toggle on tablets.
Daniel Sandler [Tue, 29 Nov 2011 21:10:41 +0000 (16:10 -0500)]
Show screen saver toggle on tablets.

Bug: 5669263
Change-Id: I16ca00ff96b17cc367c4f6fa4260da5a08480ac0

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 28 Nov 2011 20:23:11 +0000 (12:23 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 22 Nov 2011 19:57:00 +0000 (11:57 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoFixed layout for "Available Devices" in Bluetooth
Gilles Debunne [Mon, 21 Nov 2011 18:46:39 +0000 (19:46 +0100)]
Fixed layout for "Available Devices" in Bluetooth

Bug 5646340.

'Title' and 'scanning' text are on the same line as a PreferenceCategory.
The first one has a 0dp width, compensated by a 1 weight.

When scanning is not displayed, it should be GONE rather than INVISIBLE
to let the title take the whole space.

When both are visible, they should split the space, or else, with long
texts in foreign languages, scanning takes the whole space, leaving the
title with an almost 0 width that generates a very high text because
of wrapping.

Distributing size among the two texts to accomodate for such cases.

Changed padding and alignment to get reasonnable results for Slovenian
language (i.e. very long text), when both title and scanning are displayed.

Strangely, the right scanning alignment is not enforced, although I checked
it is correctly set on the TextView. Not investigating further now since it
may not be desired by UX anyway.

Change-Id: I6b4c6fcbc350d3664749f58eee34ec0867720626

12 years agoMerge "fix datetime layout for phones and remove orientation locking" into ics-mr1
Freeman Ng [Tue, 22 Nov 2011 00:05:45 +0000 (16:05 -0800)]
Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 23:23:37 +0000 (15:23 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 21 Nov 2011 23:02:49 +0000 (15:02 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: Ibf7154e471cba15745a917bffe4cf49f2f01aebb

12 years agofix datetime layout for phones and remove orientation locking
Freeman Ng [Mon, 21 Nov 2011 21:07:08 +0000 (13:07 -0800)]
fix datetime layout for phones and remove orientation locking

The first fixes the bug, the second was something I noticed
while debugging. We're no longer locking setup wizard orientation
for anything screen size, and so no activities it calls needs
to do that any more, either.

bug: 5642402
Change-Id: I5911223112a19841f6b4754a70148f28a753f736

12 years agoSettings changes for Android Dreams (now Screen Candy).
Daniel Sandler [Thu, 17 Nov 2011 18:44:51 +0000 (10:44 -0800)]
Settings changes for Android Dreams (now Screen Candy).

- new preference design
- remove candy-specific timeout
- use new settings keys

Requires Change I31f31b3

Bug: 5591015
Change-Id: I45cb6ea5c68f9932c6d4e65e2b219331d48a62d6

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Thu, 17 Nov 2011 14:47:21 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoMerge "Show desk dock apps as screen savers." into ics-mr1
Daniel Sandler [Thu, 17 Nov 2011 06:36:06 +0000 (22:36 -0800)]
Merge "Show desk dock apps as screen savers." into ics-mr1

12 years agoShow desk dock apps as screen savers.
Daniel Sandler [Wed, 16 Nov 2011 23:31:23 +0000 (15:31 -0800)]
Show desk dock apps as screen savers.

Now that docking launches the screen saver instead of a dock
app, we offer those apps as screen savers to allow them to
continue functioning as they did before. As a bonus, users
without docks can now use dock apps!

Bug: 5591015
Change-Id: Ifc138ab4c0bdffa1bbd7afe8b3ad730ec971aa34

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 16 Nov 2011 18:51:14 +0000 (10:51 -0800)]
Merge "Import revised translations.  DO NOT MERGE" into ics-mr1

12 years agoMerge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1
Freeman Ng [Wed, 16 Nov 2011 18:44:46 +0000 (10:44 -0800)]
Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Wed, 16 Nov 2011 18:29:48 +0000 (10:29 -0800)]
Import revised translations.  DO NOT MERGE

Change-Id: I1f162a86ad9c165c72d5b3086a4c7a66aa9435f9

12 years agoam c90961d4: Reconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 17:36:10 +0000 (09:36 -0800)]
am c90961d4: Reconcile with ics-factoryrom-2-release

* commit 'c90961d43102563b540d719e637905570f9856e4':

12 years agoReconcile with ics-factoryrom-2-release
The Android Open Source Project [Wed, 16 Nov 2011 16:56:44 +0000 (08:56 -0800)]
Reconcile with ics-factoryrom-2-release

Change-Id: Ie2cc2f5f8339562f612278346ebd1d0aae763607

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Wed, 16 Nov 2011 14:47:01 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agofix npe when launching datetime settings for phone setup wizard
Freeman Ng [Tue, 15 Nov 2011 23:59:45 +0000 (15:59 -0800)]
fix npe when launching datetime settings for phone setup wizard

also slightly "modernized" the UI while I was in there by removing
the button bar and button icon

bug: 5517928
Change-Id: I502d56780d7c3bd474fc5120a0b306def3c04dd4

12 years agoMerge commit '1b7268e' into kjsdkljsdfkljsdljsdf
Eric Fischer [Wed, 16 Nov 2011 00:52:30 +0000 (16:52 -0800)]
Merge commit '1b7268e' into kjsdkljsdfkljsdljsdf

12 years agoMerge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1
Amith Yamasani [Tue, 15 Nov 2011 21:25:25 +0000 (13:25 -0800)]
Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1

12 years agoKill the Switch on top-right after exiting Accounts & sync.
Amith Yamasani [Mon, 14 Nov 2011 23:15:38 +0000 (15:15 -0800)]
Kill the Switch on top-right after exiting Accounts & sync.

Bug: 5564377  - Bluetooth screen showing a Switch that doesn't follow
the bluetooth setting.

This seems to have been the Switch in Accounts & sync being set as a
custom view for the Settings activity and not removed on changing
fragments.

Change-Id: I4575a769fbf5482048dbc4e912c6b6f782f505a0

12 years agoam 6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215
Danielle Millett [Tue, 15 Nov 2011 20:16:57 +0000 (12:16 -0800)]
am 6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215

* commit '6f3b1bb1d73e9b321144bec7faeaceb9d7c5caf8':
  DO NOT MERGE Cherry picking from MR0 cl 147215

12 years agoMerge "Dismiss dialogs properly on closing." into ics-mr1
Amith Yamasani [Tue, 15 Nov 2011 18:12:32 +0000 (10:12 -0800)]
Merge "Dismiss dialogs properly on closing." into ics-mr1

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Tue, 15 Nov 2011 14:46:41 +0000 (06:46 -0800)]
merge in ics-mr1-release history after reset to ics-mr1

12 years agoDismiss dialogs properly on closing.
Amith Yamasani [Fri, 11 Nov 2011 21:25:07 +0000 (13:25 -0800)]
Dismiss dialogs properly on closing.

Also make the invisible activity truly invisible (was
showing a blue line behind the dialog).

Bug: 5572140
Change-Id: I67b31f0682f189c7075011e0dd0660b0fbc543d9

12 years agoMerge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Mon, 14 Nov 2011 23:09:10 +0000 (15:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0

12 years agoFix 5579440: Add transport control view to tablet unlock screens
Jim Miller [Sat, 12 Nov 2011 03:25:50 +0000 (19:25 -0800)]
Fix 5579440: Add transport control view to tablet unlock screens

The AM/PM indicator is no longer used in lockscreen.  This propagates
the change to the cryptkeeper.

Change-Id: Iecd99f6439b5f898443e7d5c37984f7cd7607ce5

12 years agoDO NOT MERGE Cherry picking from MR0 cl 147215
Danielle Millett [Wed, 2 Nov 2011 15:12:21 +0000 (11:12 -0400)]
DO NOT MERGE Cherry picking from MR0 cl 147215

Adding an improve face matching settings option for Face Unlock

Adding an option which will launch a version of setup where faces
can be added to the current gallery.  It requires the user to first
confirm their password before launching addToSetup.

Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.

Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.

Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45

12 years agoImport revised translations. DO NOT MERGE
Eric Fischer [Mon, 14 Nov 2011 21:33:52 +0000 (13:33 -0800)]
Import revised translations. DO NOT MERGE

Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9

12 years agoAdd compatibility aliases for shortcuts added to home screen in gingerbread.
Amith Yamasani [Thu, 10 Nov 2011 23:28:59 +0000 (15:28 -0800)]
Add compatibility aliases for shortcuts added to home screen in gingerbread.

Bug: 5016573
Change-Id: I1898b2f51216354829acca11e73186465f25ec32

12 years agomerge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Sun, 13 Nov 2011 14:47:26 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1