PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,319 Commits 1 Branch 0 Tags
6ebbd30e18ca514ca9ee87ffa428c55c9fd92a8c
Commit Graph

6319 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
513fd05c38 Import revised translations. DO NOT MERGE 
Change-Id: I9f4fbeded8f7d068d70fb1ed29b414d1cc9e4d11
 2011-09-20 15:24:00 -07:00
Freeman Ng
f471c4ece8 adjust char limit for translations 
bug: 5348039
Change-Id: I2c7153b3b8281398644a9a0ebdb1a4921af4f261
 2011-09-20 15:18:05 -07:00
Amith Yamasani
5faffefa63 Merge "Allow shortcuts to Tethering and Data usage screens." 2011-09-20 15:13:35 -07:00
Amith Yamasani
883d850ede Move "Pulse notification light" to Display settings. 
Bug: 5242350
Change-Id: I91cb23ca8f49c1c053710031b0316b10d55fbab4
 2011-09-20 14:41:03 -07:00
Eric Fischer
c4caeeb994 am 367bb497: Merge "Import revised translations." 
* commit '367bb497be57bb4504daf2f9f11ee004348be6d8':
  Import revised translations.
 2011-09-20 14:16:19 -07:00
Luca Zanolin
fc8bad9f17 am c8caf47c: Merge "Change title in the setting for "Speech" category" 
* commit 'c8caf47c7ab8897a9416ad9df188bbc760a99461':
  Change title in the setting for "Speech" category
 2011-09-20 14:15:30 -07:00
The Android Open Source Project
3d67a17861 am dea226fe: Reconcile with ics-factoryrom-release 
* commit 'dea226fec748105535cc32b008a031b127734e3b':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-20 14:14:38 -07:00
Svetoslav Ganov
232d031a13 Accessibility settings get into state not allowing to enable accessibility. 
If the setting for enabled accessibility serivces contains a service that
is not installed on the device the system gets into a state that does not
allow enabling accessibility. This state is not recoverable.

bug:5343351

Change-Id: I6127ae00f7a16b190cfe43b68b8e71d49b10911e
 2011-09-20 12:16:13 -07:00
Eric Fischer
367bb497be Merge "Import revised translations." 2011-09-20 11:02:16 -07:00
Eric Fischer
24c4fb1567 Import revised translations. 
Change-Id: Id6474f106ab35f9f0b9c799f3d9c3888868c6f58
 2011-09-20 10:37:57 -07:00
Luca Zanolin
c8caf47c7a Merge "Change title in the setting for "Speech" category" 2011-09-20 10:03:42 -07:00
Luca Zanolin
8cb280ddff Change title in the setting for "Speech" category 
Bug: 5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
 2011-09-20 17:58:45 +01:00
The Android Open Source Project
dea226fec7 Reconcile with ics-factoryrom-release 
Change-Id: Id11b3b3373d00ebc6afce94f21ca1b6edfcfca42
 2011-09-20 07:43:27 -07:00
The Android Automerger
4291be2992 merge in ics-release history after reset to master 2011-09-20 07:01:10 -07:00
The Android Automerger
255a44f376 merge in ics-factoryrom-release history after reset to ics-factoryrom 2011-09-20 06:28:47 -07:00
Ben Komalo
9333637ca7 am b2e4a5aa: am 69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom 
* commit 'b2e4a5aac00fbb5a6796a70841cde76711e52fd0':
  Mark Settings as a "core" app.
 2011-09-19 16:58:39 -07:00
Ben Komalo
b2e4a5aac0 am 69dfd425: Merge "Mark Settings as a "core" app." into ics-factoryrom 
* commit '69dfd42520ccea4556a860b483e264a229293fa2':
  Mark Settings as a "core" app.
 2011-09-19 16:55:51 -07:00
Ben Komalo
69dfd42520 Merge "Mark Settings as a "core" app." into ics-factoryrom 2011-09-19 16:52:32 -07:00
Wink Saville
fdc0217ef7 Add Button to *#*#INFO#*#* for ims registration. 
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired

Bug: 5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
 2011-09-19 16:38:56 -07:00
Wink Saville
82650a18a6 am 37dceac5: am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. 
* commit '37dceac57199c4ce135b8eb060ad22d9d697a2c5':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-19 15:06:31 -07:00
Wink Saville
37dceac571 am 1e596f30: Add Button to *#*#INFO#*#* for ims registration. 
* commit '1e596f303520d211aebc87dfc0c08108efe80921':
  Add Button to *#*#INFO#*#* for ims registration.
 2011-09-19 15:02:02 -07:00
Ben Komalo
b08172eec6 Mark Settings as a "core" app. 
This ensures settings is still loaded when the framework loads in a
minified state (e.g. while encrypting the device).

Bug: 5031399
Change-Id: I8c1c7331eb34c192abb18b9a77426f2e028baccb
 2011-09-19 14:27:13 -07:00
Wink Saville
1e596f3035 Add Button to *#*#INFO#*#* for ims registration. 
For testing add a button to toggle SystemProperty
persist.radio.imsregrequired

Bug: 5337311
Change-Id: Id2d8ffa4c67992245d80b0ccafb6ed719fa749cc
 2011-09-19 14:24:39 -07:00
Amith Yamasani
7836e4ad7b Allow shortcuts to Tethering and Data usage screens. 
Bug: 5290301
Change-Id: Id271fd33a54adb38ce3312d4a03fd6f4a05394e8
 2011-09-19 13:25:52 -07:00
The Android Automerger
e8d780dd80 merge in ics-release history after reset to master 2011-09-19 07:00:42 -07:00
Jeff Sharkey
c8657d38fc am 3361663e: am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom 
* commit '3361663e37154b19316179e05955f05887d9ddc4':
  Surface tethering stats in data usage.
 2011-09-18 16:19:39 -07:00
Jeff Sharkey
3361663e37 am 2ae88521: Merge "Surface tethering stats in data usage." into ics-factoryrom 
* commit '2ae885210ef04d2533a2fc121a7f2b8770efa7e4':
  Surface tethering stats in data usage.
 2011-09-18 16:17:37 -07:00
Jeff Sharkey
2ae885210e Merge "Surface tethering stats in data usage." into ics-factoryrom 2011-09-18 16:15:53 -07:00
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
The Android Automerger
e69dbe2b24 merge in ics-release history after reset to master 2011-09-18 07:01:23 -07: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