Commit Graph

5006 Commits

Author SHA1 Message Date
Danielle Millett
c57b135d56 Merge "Adding info explaining facelock's backup lock" 2011-09-16 17:48:35 -07:00
Eric Fischer
7f1f5f8481 am f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom
* commit 'f4d6c876218124364e0e044426cc86058b20d935':
  Import revised translations.  DO NOT MERGE
2011-09-16 16:27:30 -07:00
Eric Fischer
f4d6c87621 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-16 16:25:25 -07:00
Irfan Sheriff
735f312beb Merge "Update p2p settings UI" 2011-09-16 16:06:53 -07:00
Eric Fischer
51a00cb38f Import revised translations. DO NOT MERGE
Change-Id: Ie7541f00b4b272d6ca840cde6286bcd5d6584ae4
2011-09-16 15:37:26 -07:00
Dianne Hackborn
6967c04fd7 Merge "Fix issue #5320747: Disabling an app that is an active device administrator..." 2011-09-16 13:52:39 -07:00
Dianne Hackborn
5c2b48d4d5 Fix issue #5320747: Disabling an app that is an active device administrator...
...can lead to an unsecure device

Now you can't disable device admins.

Or clear their data.

Or force stop them.

Or uninstall them (though the package manager also prevents uninstalling, might
as well disable this button along with everything else).

Change-Id: I69eefc2342e6f932908e9f5b87d3a601752810a4
2011-09-16 13:36:20 -07:00
Danielle Millett
5bae8739ea Adding info explaining facelock's backup lock
This changes the security picker when selecting a backup lock for facelock
such that it says back up lock and gives a brief description of why it's needed.
This is currently a temporary way to display the info and will need to be changed
for the final release.

Change-Id: I6373f97caec088482d36c65bd210c79238c623cf
2011-09-16 16:01:14 -04:00
Justin Ho
96dc241cea am a9efa2c2: Merge "Updated Settings Launcher icon Bug: 5286988" into ics-factoryrom
* commit 'a9efa2c2eafcd02a15138fc768b0492698e915fa':
  Updated Settings Launcher icon Bug: 5286988
2011-09-16 11:18:09 -07:00
Justin Ho
a9efa2c2ea Merge "Updated Settings Launcher icon Bug: 5286988" into ics-factoryrom 2011-09-16 11:16:41 -07:00
Irfan Sheriff
2592083c1f Update p2p settings UI
- Add self device information on settings
- Add remove group option

Bug: 5332330
Change-Id: I5de4fa1e92a5182e10269fe5c2b78f1f6313fb63
2011-09-16 10:46:58 -07:00
Justin Ho
f3fa276f66 Updated Settings Launcher icon
Bug: 5286988

Change-Id: I9e1a2cf0c00d8f82451aea2edc7d47e8ce49aaf9
2011-09-16 08:52:17 -07:00
Irfan Sheriff
ae226fffad Merge "Fix settings handling of wifi events" 2011-09-15 19:49:17 -07:00
Irfan Sheriff
b1c0e0b1c9 Fix settings handling of wifi events
When wifi events come out, settings has to change the switch state.
Changing switch state causes settings to also enable/disable wifi which
gets into a loop when there is a driver hung event.

Fix to only send framework calls when a user has changed the switch
settings

Bug: 5271322
Change-Id: I0a7d03a3fe0f28622de05981e5f72a9a8814b2d2
2011-09-15 19:11:29 -07:00
Svetoslav Ganov
f506cb958d Merge "Enabled accessibility services settings may end with a separator." into ics-factoryrom 2011-09-15 18:48:55 -07:00
Svetoslav Ganov
efe27bfcdb Enabled accessibility services settings may end with a separator.
SetupWizard was adding a separator after the last service name while
building the enabled accessibility services string. This case was not
handled by the settings. Added code to handle that case since it is
possible to have not well-formed settings backed up.

bug:5098493

Change-Id: I8381872037611a7456ca31526c85effdb9949885
2011-09-15 15:26:58 -07:00
Robert Greenwalt
bf118ffba7 Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom 2011-09-15 15:00:29 -07:00
sinikang
cd8b7c3d0b Modify ApnEditor app for new APN schema.
As the telephony db is changed, The ApnEditor app has to be changed also.
As your request, I changed the ListPreference object to read-only CheckBoxPreference object and "The Others" to "Unspecified".This is a pair set with below change-ids.
- https://partner.source.android.com/g/#/c/8515/
- https://partner.source.android.com/g/#/c/8517/
- https://partner.source.android.com/g/#/c/9048/

Change-Id: I2bdd4f3076adfbee0f277ddb59a150e51e45ac9b
bug:4991683
2011-09-15 14:39:25 -07:00
Martijn Coenen
943af0bc69 Remove NFC sharing from Settings.
Bug: 5297151
Change-Id: I64304230296912519aa057a89f139a2242b557e3
2011-09-15 22:31:51 +02:00
The Android Automerger
1a628782a8 merge in ics-release history after reset to master 2011-09-15 06:35:27 -07:00
Freeman Ng
85eeb1c16a Merge "text changes requested by Legal" 2011-09-14 19:11:49 -07:00
Freeman Ng
2347fca3f0 text changes requested by Legal
Change-Id: I7a967c75a20ad58fb45773a08122eae06a8f43c4
2011-09-14 19:07:43 -07:00
Svetoslav Ganov
0be6d21248 Merge "Minor string change according to UX spec" 2011-09-14 16:44:55 -07:00
Gilles Debunne
a0585821c3 Merge "Bug 5092721: Accounts & sync settings, auto sync in overflow menu." 2011-09-14 16:44:10 -07:00
Svetoslav Ganov
eb9478c81f Minor string change according to UX spec
Change-Id: Ia5745deb8221a58386e7775151d4b0a5d74b0005
2011-09-14 16:33:26 -07:00
Danielle Millett
7af3479e0a Merge "Fix 5316440: Fix for facelock setup asking to confirm password twice" 2011-09-14 16:11:37 -07:00
Svetoslav Ganov
e05d63d771 Merge "Polish of the accessibility settings." 2011-09-14 13:35:39 -07:00
Svetoslav Ganov
9b539cc584 Polish of the accessibility settings.
1. Some string changes according to updated UX specs.

2. Explore by touch now shown only if accessibility is on.

3. The one time dialog for installing TalkBack if no services
   are installed was not showing.

bug:5293099
bug:5286578

Change-Id: I633999f798b16e2910d95d541a7c33d1a4f296b9
2011-09-14 12:26:33 -07:00
Danielle Millett
c474a88c2d Fix 5316440: Fix for facelock setup asking to confirm password twice
Change-Id: I6df292b80349a9d20b470d9261ecdca960b5dea5
2011-09-14 14:45:47 -04:00
Amith Yamasani
10d68ff006 Merge "Reduce string length for battery level and charging status." 2011-09-14 11:16:09 -07:00
Amith Yamasani
b1800cad0a Merge "Limit choice of font sizes to Small, Normal, Large and Extra Large." 2011-09-14 11:15:02 -07:00
Gilles Debunne
b59e068d29 Bug 5092721: Accounts & sync settings, auto sync in overflow menu.
Was usually "Make auto-sync an on/off switch in the action bar"

Changed to a check box in the overflow menu as per the comment in the bug.

Change-Id: I5a722ec1c743232c019fe89144a0a9463431747a
2011-09-14 11:10:57 -07:00
The Android Open Source Project
0b316d1a2d Reconcile with gingerbread-mr4-release
Change-Id: Ib35a01f42fec2638707a34469b3a8187560a91f9
2011-09-14 07:23:03 -07:00
The Android Automerger
c234ebc257 merge in ics-release history after reset to master 2011-09-14 06:34:48 -07:00
Jeff Sharkey
a53188fe5a Data usage: precise editing, restrict help, D-pad.
Introduce dialogs for precise editing of network policy warning/limit
values, triggered by click on sweep labels.  Show up to 999MB before
rounding to GB, and round to nearest 5MB value when dragging.  Partial
D-pad navigation around chart controls.  Fix jumping when relayout
during drag, and fix sweep overlap bug.

When restricting data without limited networks, show dialog help to
guide user towards network limit.  When reloading chart data, try
restoring to nearest cycle.

Bug: 5289641, 5111701, 5226078
Change-Id: Ic59dee6496c480a64dc56f8534acf4d81b50bca7
2011-09-13 20:24:14 -07:00
Irfan Sheriff
ec10578884 Update new API in debug settings
Bug: 5247957
Change-Id: I594e55a928a2870cb153b042df74a2b354bee073
2011-09-13 16:03:08 -07:00
Amith Yamasani
8bd3e09aac Limit choice of font sizes to Small, Normal, Large and Extra Large.
Bug: 5248351

Scales are 0.85x, 1.0x 1.15x and 1.3x

Change-Id: I784f64d7b0c52e1fd6b26ff4b4df7a9b23f23fe0
2011-09-13 14:49:49 -07:00
Amith Yamasani
ecd7b8a77e Reduce string length for battery level and charging status.
Bug: 5269660

Turn off suggestions and spell checking for Owner Info
Bug: 5281173

Change-Id: I7c4830e700bb52581504e222376cc912d2f345fc
2011-09-13 13:40:27 -07:00
Danielle Millett
b81ce47a2b Merge "Fixed bug where facelock wasn't set correctly for pattern tutorial" 2011-09-13 10:57:49 -07:00
Danielle Millett
b4b8ae7fe1 Fixed bug where facelock wasn't set correctly for pattern tutorial
Change-Id: Id3c47cd2985c8565aec1255c0d08451443f7540c
2011-09-13 13:41:26 -04:00
Narayan Kamath
52b2745e85 Remove some unnecessary setLanguage() calls.
This prevents QUEUE_FLUSH from working as intented since
there is a (blocking) setLanguage() call that waits for
the previous synthesis to complete before flushing the queue.

bug:5288327
Change-Id: I00467f0ac1584863ae27bfc076b8413e29e5379b
2011-09-13 14:38:20 +01:00
The Android Automerger
19fa16ba82 merge in ics-release history after reset to master 2011-09-13 06:34:46 -07:00
satok
88b75f740a Tweak ime settings
Bug: 5282046
Change-Id: I8ef3913fc46c00288ac13fbc2a2d447efd531382
2011-09-13 14:46:56 +09:00
The Android Automerger
a36690ebff keep history after reconcile of gingerbread-release 2011-09-12 17:16:36 -07:00
Jeff Sharkey
c6df12c1ee Merge "Data usage performance, bugfixes." 2011-09-12 16:59:30 -07:00
Amith Yamasani
c27508b767 Merge "Use a new config flag to decide if notification led pulsing can be turned on/off." 2011-09-12 16:48:07 -07:00
Jeff Brown
754af8aede Merge "Fix crash in APN settings. Bug: 4968921" 2011-09-12 16:27:11 -07:00
Jeff Sharkey
b98c55bd09 Data usage performance, bugfixes.
Optimize launch times by removing unneeded extra work, including
reloading data and tightening chart invalidation.  Fix invalidation
storm when sweeps overlap.  Move chart history into loader instead of
blocking main thread.

Disable "Split 4G" mode until telephony support is ready, and combine
any existing split policies.

Async loading of application details.  Remove alpha transitions to
speed up on some hardware.  Hide menus in detail mode.  Delay kicking
off force-poll.  Fix inset padding on large devices.

Bug: 5284321, 5273918, 5263056
Change-Id: I746d79c05e2a6ea97bbdbdc5d807e208328d1373
2011-09-12 15:48:24 -07:00
Svetoslav Ganov
2ab804e681 Merge "Fixed tutorial to read instructions after hover events." 2011-09-12 15:31:46 -07:00
Ben Komalo
3fe9b9c948 Merge "Don't try to talk to vold mid-encryption." 2011-09-12 15:28:23 -07:00