PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,178 Commits 1 Branch 0 Tags
fe342db0b0c6d7da0abc01d7fe0b6ac12fdcb44c
Commit Graph

5178 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Lockwood
239c225994 am ed9d4618: Fix race condition in MTP/PTP checkbox updating 
* commit 'ed9d461818780a6c38a081030a55983ea0883fa6':
  Fix race condition in MTP/PTP checkbox updating
 2011-09-18 15:30:52 -07:00
Mike Lockwood
ed9d461818 Fix race condition in MTP/PTP checkbox updating 
UsbManager.getDefaultFunction() might not return the updated state immediately
after changing the USB configuration, so do not rely on it for updating
after a checkbox has been clicked.

Change-Id: I5ae8d46854f24403cda2c62e006c742dcd257d1d
Bug: 5334777

Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-09-18 17:52:54 -04:00
Jeff Sharkey
a83a24f48a Surface tethering stats in data usage. 
Bug: 5244846
Change-Id: Ib4ac03ab634278714576a66ef8d6fdbc6d15c82a
 2011-09-16 18:28:39 -07:00
Danielle Millett
375909a823 am c57b135d: Merge "Adding info explaining facelock\'s backup lock" 
* commit 'c57b135d560c2b23631083dde86b74463c036085':
  Adding info explaining facelock's backup lock
 2011-09-16 17:51:40 -07:00
Danielle Millett
c57b135d56 Merge "Adding info explaining facelock's backup lock" 2011-09-16 17:48:35 -07:00
Eric Fischer
e22b4babd7 am 7f1f5f84: (-s ours) am f4d6c876: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 
* commit '7f1f5f8481ecb2203940d10664800cd3062aad1a':
  Import revised translations.  DO NOT MERGE
 2011-09-16 16:29:12 -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
20ddc7e0f9 am 735f312b: Merge "Update p2p settings UI" 
* commit '735f312beb39fd45b8cce0544042487968a30e18':
  Update p2p settings UI
 2011-09-16 16:08:39 -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
62f1b9f99a am 6967c04f: Merge "Fix issue #5320747: Disabling an app that is an active device administrator..." 
* commit '6967c04fd77023368514329c1213fba60f5a9b5a':
  Fix issue #5320747: Disabling an app that is an active device administrator...
 2011-09-16 13:54:11 -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
c8de24913a am 96dc241c: am a9efa2c2: Merge "Updated Settings Launcher icon Bug: 5286988" into ics-factoryrom 
* commit '96dc241cea60f90ab6fd20faeb60d9d4dec0d45f':
  Updated Settings Launcher icon Bug: 5286988
 2011-09-16 11:20:01 -07: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
8213f3736a am ae226fff: Merge "Fix settings handling of wifi events" 
* commit 'ae226fffadc5029e8de73248cb58ea8baf3a228e':
  Fix settings handling of wifi events
 2011-09-15 19:51:29 -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
892c6f8fee am f506cb95: Merge "Enabled accessibility services settings may end with a separator." into ics-factoryrom 
* commit 'f506cb958d924527607eb766979ab5af752b41ca':
  Enabled accessibility services settings may end with a separator.
 2011-09-15 18:54:59 -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
Robert Greenwalt
4baf0ba106 am bf118ffb: Merge "Modify ApnEditor app for new APN schema." into ics-factoryrom 
* commit 'bf118ffba7986dd3df41b68418edaf55f9432464':
  Modify ApnEditor app for new APN schema.
 2011-09-15 16:23:51 -07:00
Martijn Coenen
d52b7a74a5 am 943af0bc: Remove NFC sharing from Settings. 
* commit '943af0bc69048d827c3dd1b92daeaa2cf1b77145':
  Remove NFC sharing from Settings.
 2011-09-15 16:23:49 -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
Freeman Ng
17490f469a am 85eeb1c1: Merge "text changes requested by Legal" 
* commit '85eeb1c16a43eda16b8948e3ba966871ae6b73fa':
  text changes requested by Legal
 2011-09-14 19:14:49 -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
0a866ff173 am 0be6d212: Merge "Minor string change according to UX spec" 
* commit '0be6d21248be4ccc774138ae05583b23011ef2c4':
  Minor string change according to UX spec
 2011-09-14 16:47:37 -07:00
Gilles Debunne
aa53a184b1 am a0585821: Merge "Bug 5092721: Accounts & sync settings, auto sync in overflow menu." 
* commit 'a0585821c3f822b77dc371fd5072787721a5759d':
  Bug 5092721: Accounts & sync settings, auto sync in overflow menu.
 2011-09-14 16:45:55 -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
a418fe6231 am 7af3479e: Merge "Fix 5316440: Fix for facelock setup asking to confirm password twice" 
* commit '7af3479e0a7bbdd622d7a1f2c5dc9ceac7cac89e':
  Fix 5316440: Fix for facelock setup asking to confirm password twice
 2011-09-14 16:12:55 -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
ec91eedf3d am e05d63d7: Merge "Polish of the accessibility settings." 
* commit 'e05d63d771accf2a7f04839e03525fed3b39324a':
  Polish of the accessibility settings.
 2011-09-14 13:37:43 -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
bfb522a500 am 10d68ff0: Merge "Reduce string length for battery level and charging status." 
* commit '10d68ff00620f2bb3644d0e4895afc56f4dd3e6c':
  Reduce string length for battery level and charging status.
 2011-09-14 11:18:59 -07:00
Amith Yamasani
05b41aeb87 am b1800cad: Merge "Limit choice of font sizes to Small, Normal, Large and Extra Large." 
* commit 'b1800cad0a9a2790695e72684a3eae8ae4894acc':
  Limit choice of font sizes to Small, Normal, Large and Extra Large.
 2011-09-14 11:16:59 -07: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