OSDN Git Service
Amith Yamasani [Fri, 2 Dec 2011 21:44:15 +0000 (13:44 -0800)]
am
fa81de9b: Merge "Potential fix for NPE in Running services." into ics-mr1
* commit '
fa81de9b9c561a73216f16b2fd62c6f2042b8090':
Potential fix for NPE in Running services.
Gilles Debunne [Fri, 2 Dec 2011 21:44:13 +0000 (13:44 -0800)]
am
1663522e: Merge "Fixed layout for "Available Devices" in Bluetooth" into ics-mr1
* commit '
1663522e1a835ac69f58d7764aebe935c679c288':
Fixed layout for "Available Devices" in Bluetooth
Amith Yamasani [Fri, 2 Dec 2011 18:40:55 +0000 (10:40 -0800)]
Merge "Potential fix for NPE in Running services." 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
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
The Android Open Source Project [Fri, 2 Dec 2011 15:53:39 +0000 (07:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie822c5e13c07e37c068402fd3b96bc588d528e62
Irfan Sheriff [Fri, 2 Dec 2011 01:23:41 +0000 (17:23 -0800)]
Merge "Add wifi direct settings UI"
Jim Miller [Fri, 2 Dec 2011 00:34:17 +0000 (16:34 -0800)]
am
8266d1aa: Merge "Fix
5636798: Watch for SIM state changes in IccSettings." into ics-mr1
* commit '
8266d1aa6b930a60be38fa5cbfe987f7e8280f70':
Fix
5636798: Watch for SIM state changes in IccSettings.
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
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
Steven Ross [Thu, 1 Dec 2011 04:48:23 +0000 (20:48 -0800)]
Merge "Allowing FaceUnlock with a PIN fixes
5467194"
Daniel Sandler [Thu, 1 Dec 2011 04:00:25 +0000 (20:00 -0800)]
am
e9b79e3a: (-s ours) Merge "Pulling screen savers for now. DO NOT MERGE." into ics-mr1
* commit '
e9b79e3aade7c51dee8ec9ef263c53c166a591c6':
Pulling screen savers for now. DO NOT MERGE.
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
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
Amith Yamasani [Thu, 1 Dec 2011 03:08:33 +0000 (19:08 -0800)]
am
95b26e1a: Merge "Overhaul vibrate and silent settings to match hard keys." into ics-mr1
* commit '
95b26e1a4ae1d3bbef8811202e8aec3772f3bbe5':
Overhaul vibrate and silent settings to match hard keys.
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
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
Steven Ross [Fri, 11 Nov 2011 18:35:09 +0000 (13:35 -0500)]
Allowing FaceUnlock with a PIN fixes
5467194
We need to allow FaceUnlock if the backup lock supports encryption (PIN).
This requires changing the way the minimum encryption quality is enforced
to allow FaceUnlock as long as the backup lock is a PIN, as FaceUnlock
is considered a lower security than the minimum for encrypted drives.
This change adds some complexity to upgradeQualityForEncryption because it's
used in two places: once to grey out selections that aren't sufficient
security level, and second to force the user to use a higher security level.
This still increases the minimum security level,
but makes an exception for FaceUnlock if it's allowed without encryption.
This uses a MutableBoolean to provide a mutable boolean capability.
We could instead write a custom one or use some other type of mutable
boolean if it exists.
In CryptKeeperSettings, using getKeyguardStoredPasswordQuality directly instead
of getActivePasswordQuality is simpler, but this uses a more complex approach
with a minor tweak as jaggies suggested it and it is clear about the
biometric exception being made.
Change-Id: Ia2645d6bd98857c79c6a9be45eda98087bfe517a
The Android Open Source Project [Wed, 30 Nov 2011 20:56:18 +0000 (12:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Idbff6b6c73a4e5c68769504f39b47239df431476
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
Daniel Sandler [Wed, 30 Nov 2011 18:50:54 +0000 (10:50 -0800)]
am
a6ff69ed: Merge "Show screen saver toggle on tablets." into ics-mr1
* commit '
a6ff69ede0fa9868464a1a7059cad8fb3838c5ab':
Show screen saver toggle on tablets.
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
Daniel Sandler [Wed, 30 Nov 2011 02:18:29 +0000 (18:18 -0800)]
Merge "Show screen saver toggle on tablets." into ics-mr1
Irfan Sheriff [Mon, 28 Nov 2011 23:10:35 +0000 (15:10 -0800)]
Add wifi direct settings UI
- Use switch for toggling
- Follow string and UI suggestions from UX folks
The goal is to keep the interaction minimal - PBC is used when possible and keypad/display
are used only if really necessary
Bug:
5332330
Change-Id: I83e91ad3a393c143e70f1f2b6a842b95eacde404
Eric Fischer [Tue, 29 Nov 2011 21:32:41 +0000 (13:32 -0800)]
am
21b5d18b: (-s ours) Import revised translations. DO NOT MERGE
* commit '
21b5d18bcbb15ce2571aab8b60a7aca8971ef7a7':
Import 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
Daniel Sandler [Tue, 29 Nov 2011 21:10:41 +0000 (16:10 -0500)]
Show screen saver toggle on tablets.
Bug:
5669263
Change-Id: I16ca00ff96b17cc367c4f6fa4260da5a08480ac0
Eric Fischer [Tue, 29 Nov 2011 19:19:18 +0000 (11:19 -0800)]
Import revised translations.
Change-Id: I057d4f0cafa5d08e4048e4fd437e69a023f5edb7
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
The Android Open Source Project [Tue, 22 Nov 2011 21:26:28 +0000 (13:26 -0800)]
Reconcile with ics-mr1-release
Change-Id: I078f0b904d665abe2050b986b952bc714a706019
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
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
Freeman Ng [Tue, 22 Nov 2011 05:08:31 +0000 (21:08 -0800)]
am
2fa017f8: Merge "fix datetime layout for phones and remove orientation locking" into ics-mr1
* commit '
2fa017f874d20a5b037ebe57f3fc0c53964080bc':
fix datetime layout for phones and remove orientation locking
Eric Fischer [Tue, 22 Nov 2011 05:08:01 +0000 (21:08 -0800)]
am
2e2c4990: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
2e2c49901f103c148696caffcc451bf0def90d06':
Import revised translations. DO NOT MERGE
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
Eric Fischer [Mon, 21 Nov 2011 23:23:37 +0000 (15:23 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Mon, 21 Nov 2011 23:02:49 +0000 (15:02 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: Ibf7154e471cba15745a917bffe4cf49f2f01aebb
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
Daniel Sandler [Sun, 20 Nov 2011 04:46:41 +0000 (20:46 -0800)]
am
6f0ea441: Settings changes for Android Dreams (now Screen Candy).
* commit '
6f0ea441e465a0af646f8952f820a92f6902c8d9':
Settings changes for Android Dreams (now Screen Candy).
The Android Open Source Project [Fri, 18 Nov 2011 23:43:40 +0000 (15:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I9295aacf40f2ad4c8a2bd6fff1a5366b0519448c
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
Daniel Sandler [Thu, 17 Nov 2011 19:46:24 +0000 (11:46 -0800)]
am
cee089b1: Merge "Show desk dock apps as screen savers." into ics-mr1
* commit '
cee089b1526e27b9b96dbeb9549199b0f8a78c9b':
Show desk dock apps as screen savers.
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
Eric Fischer [Thu, 17 Nov 2011 13:45:39 +0000 (05:45 -0800)]
am
bae10f7b: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1
* commit '
bae10f7b3b5f3e5e860e5f0ca91f045a41a023c3':
Import revised translations. DO NOT MERGE
Freeman Ng [Thu, 17 Nov 2011 13:45:36 +0000 (05:45 -0800)]
am
fd2daf6a: Merge "fix npe when launching datetime settings for phone setup wizard" into ics-mr1
* commit '
fd2daf6a716006ba0b0243c523e440999610076a':
fix npe when launching datetime settings for phone setup wizard
The Android Open Source Project [Thu, 17 Nov 2011 12:08:35 +0000 (04:08 -0800)]
am
0d59935d: am
c90961d4: Reconcile with ics-factoryrom-2-release
* commit '
0d59935d301cc782cca03bda32f4f98e7a294b08':
Daniel Sandler [Thu, 17 Nov 2011 06:36:06 +0000 (22:36 -0800)]
Merge "Show desk dock apps as screen savers." into ics-mr1
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
Eric Fischer [Wed, 16 Nov 2011 18:51:14 +0000 (10:51 -0800)]
Merge "Import revised translations. DO NOT MERGE" 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
Eric Fischer [Wed, 16 Nov 2011 18:29:48 +0000 (10:29 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I1f162a86ad9c165c72d5b3086a4c7a66aa9435f9
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':
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
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
Eric Fischer [Wed, 16 Nov 2011 02:25:19 +0000 (18:25 -0800)]
am
ceb05aca: Merge commit \'
1b7268e\' into kjsdkljsdfkljsdljsdf
* commit '
ceb05aca64adde816c3611f44242c77753ecf9f6':
Import revised translations. DO NOT MERGE
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
Eric Fischer [Wed, 16 Nov 2011 00:52:30 +0000 (16:52 -0800)]
Merge commit '
1b7268e' into kjsdkljsdfkljsdljsdf
Amith Yamasani [Tue, 15 Nov 2011 21:29:01 +0000 (13:29 -0800)]
am
b08c1102: Merge "Kill the Switch on top-right after exiting Accounts & sync." into ics-mr1
* commit '
b08c11028776bab44e2b919edc3a7bbc8f9308e6':
Kill the Switch on top-right after exiting Accounts & sync.
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
Danielle Millett [Tue, 15 Nov 2011 21:11:07 +0000 (13:11 -0800)]
am
11c2641c: (-s ours) am
6f3b1bb1: DO NOT MERGE Cherry picking from MR0 cl 147215
* commit '
11c2641cebe18a9baf1c084bfdd778e51db3ae93':
DO NOT MERGE Cherry picking from MR0 cl 147215
Amith Yamasani [Tue, 15 Nov 2011 21:07:16 +0000 (13:07 -0800)]
am
cd76b687: Merge "Dismiss dialogs properly on closing." into ics-mr1
* commit '
cd76b687ad4945c9e3bec5231144354a15d498f7':
Dismiss dialogs properly on closing.
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
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
Amith Yamasani [Tue, 15 Nov 2011 18:12:32 +0000 (10:12 -0800)]
Merge "Dismiss dialogs properly on closing." into 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
Jim Miller [Tue, 15 Nov 2011 00:18:42 +0000 (16:18 -0800)]
am
9e2e2420: Fix
5579440: Add transport control view to tablet unlock screens
* commit '
9e2e24202d3405175f086419477d208264dfd580':
Fix
5579440: Add transport control view to tablet unlock screens
Amith Yamasani [Tue, 15 Nov 2011 00:18:40 +0000 (16:18 -0800)]
am
af925284: Add compatibility aliases for shortcuts added to home screen in gingerbread.
* commit '
af9252849fd94c1f2859c56a4010900ea38a607e':
Add compatibility aliases for shortcuts added to home screen in gingerbread.
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
Eric Fischer [Mon, 14 Nov 2011 23:09:10 +0000 (15:09 -0800)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
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
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
Eric Fischer [Mon, 14 Nov 2011 21:33:52 +0000 (13:33 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9
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
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
Jeff Sharkey [Fri, 11 Nov 2011 15:31:17 +0000 (15:31 +0000)]
am
4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1
* commit '
4b94e073854b72205f12ff268211a51d634fbc8f':
Data usage label width, locking, Wi-Fi fixes.
Jeff Sharkey [Fri, 11 Nov 2011 02:10:34 +0000 (18:10 -0800)]
Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1
Jeff Sharkey [Fri, 11 Nov 2011 01:17:24 +0000 (17:17 -0800)]
Data usage label width, locking, Wi-Fi fixes.
Avoid wrapping sweep labels when underlying string is long, and avoid
showing blank "^1" sweep labels. Only offer "restrict data" when
mobile networks are present. Add locking around UidDetailProvider.
Move to isNetworkSupported() for consistency.
Bug:
5492495,
5471602,
5439402,
5373465
Change-Id: I79f5938d45ffbb4c2c242106424a466042a26c1c
Eric Fischer [Thu, 10 Nov 2011 23:03:08 +0000 (15:03 -0800)]
Merge "Import revised translations."
The Android Open Source Project [Thu, 10 Nov 2011 22:36:34 +0000 (14:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id4cfdbf63e6f69740330f68028c82c03d4167aca
Eric Fischer [Thu, 10 Nov 2011 22:22:55 +0000 (14:22 -0800)]
Import revised translations.
Change-Id: I21ac7772ba81ac0fb36cf2b82af5eb0bc43292a5
Amith Yamasani [Thu, 10 Nov 2011 21:13:08 +0000 (21:13 +0000)]
am
6519c610: Merge "Potential fix for monkey crash." into ics-mr1
* commit '
6519c610353cdb9ed670913058a1732cf79d6186':
Potential fix for monkey crash.
Amith Yamasani [Thu, 10 Nov 2011 21:09:54 +0000 (13:09 -0800)]
Merge "Potential fix for monkey crash." into ics-mr1
Robert Greenwalt [Thu, 10 Nov 2011 18:02:40 +0000 (10:02 -0800)]
Merge "Add system prop to work around tether provisioning"
Eric Fischer [Thu, 10 Nov 2011 16:15:03 +0000 (16:15 +0000)]
am
ffc1214c: (-s ours) am
de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE
* commit '
ffc1214ccbd04655a435573f36d550c5c66d78de':
Import revised translations. DO NOT MERGE
Robert Greenwalt [Wed, 9 Nov 2011 23:03:14 +0000 (15:03 -0800)]
Add system prop to work around tether provisioning
Set net.tethering.noprovisioning to something non-empty to avoid the provisioning check.
bug:
5445277
Change-Id: I048bffe2c11d80d79e8065f7fbe6cfb6db87da85
Eric Fischer [Wed, 9 Nov 2011 23:18:05 +0000 (23:18 +0000)]
am
de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE
* commit '
de8cd9e6f01af9255c1426c009a620bbb9efbd63':
Import revised translations. DO NOT MERGE
Amith Yamasani [Wed, 9 Nov 2011 21:19:23 +0000 (21:19 +0000)]
am
2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1
* commit '
2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
Remove system tutorial option in Settings->About.
Jeff Brown [Wed, 9 Nov 2011 21:19:23 +0000 (21:19 +0000)]
am
81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662" into ics-mr1
* commit '
81dfecf8ba6a603fd8974640517966c3a8930be3':
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662
Peter Ng [Wed, 9 Nov 2011 21:19:22 +0000 (21:19 +0000)]
am
2215abe9: Decreased padding on switches in settings to fix bluetoot
* commit '
2215abe996690ce619170240e0a617ed5a34b2ed':
Decreased padding on switches in settings to fix bluetoot
Amith Yamasani [Wed, 9 Nov 2011 21:19:22 +0000 (21:19 +0000)]
am
2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1
* commit '
2eb32b00775b6e308e1c422856c1046c6c33b54a':
Prevent orphaned fragment on the settings stack.
Danielle Millett [Wed, 9 Nov 2011 17:52:31 +0000 (17:52 +0000)]
am
179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1
* commit '
179b32869c4476a30b0c933fb73a1a8e258ce11c':
Adding an improve face matching settings option for Face Unlock
The Android Automerger [Wed, 9 Nov 2011 14:47:54 +0000 (06:47 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Greenwalt [Wed, 9 Nov 2011 14:34:21 +0000 (14:34 +0000)]
am
322da591: Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1
* commit '
322da5917467f9b7b100c35f7c24bee5c9bc3909':
Wimax : 4G settings menu and 4G MAC address.
Eric Fischer [Wed, 9 Nov 2011 01:42:11 +0000 (17:42 -0800)]
Import revised translations. DO NOT MERGE
Change-Id: I57c6d5fdf39f880dab16d5db78bc6673d74090a9
Amith Yamasani [Wed, 9 Nov 2011 01:30:23 +0000 (17:30 -0800)]
Merge "Remove system tutorial option in Settings->About." into ics-mr1
Jeff Brown [Wed, 9 Nov 2011 01:22:02 +0000 (17:22 -0800)]
Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug:
5569662" into ics-mr1
Peter Ng [Wed, 9 Nov 2011 00:14:20 +0000 (16:14 -0800)]
Decreased padding on switches in settings to fix bluetoot
Bug:
5525612
Change-Id: Id93e4aae8b1e36614383a09266ce6c3f715404ab
Amith Yamasani [Tue, 8 Nov 2011 21:56:08 +0000 (13:56 -0800)]
Potential fix for monkey crash.
The tab was being changed by a "keypress" after the fragment was
destroyed. Disable the widget until a resume.
Bug:
5157399
Change-Id: Ic1515255052eaea01f71c133d8570f25d65351b2
Jeff Brown [Tue, 8 Nov 2011 22:21:53 +0000 (14:21 -0800)]
Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK.
Bug:
5569662
Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba
Amith Yamasani [Tue, 8 Nov 2011 19:08:28 +0000 (11:08 -0800)]
Remove system tutorial option in Settings->About.
It was being activated by third party IMEs that have tutorials. Remove
the code permanently, since we don't support the system tutorial flow
anymore.
Bug:
5425836
Change-Id: I691b8d48309b3dd3a25c9994334dc4692a70e482