Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,977 Commits 1 Branch 0 Tags
8ccddfd8d4fb7e80bb6d45c0bfcafcd52e8af53a
Commit Graph

2006 Commits

Author SHA1 Message Date
Jeff Hamilton
8ccddfd8d4 am a1b6fdf4: am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom 
* commit 'a1b6fdf4738e0d0aec4eb389316a7c354fe37c00':
  Add strings for translation.
 2011-09-22 10:43:03 -07:00
Jeff Hamilton
a1b6fdf473 am 4a2aabc4: Merge "Add strings for translation." into ics-factoryrom 
* commit '4a2aabc4d739ded949daa721adfce55fed2be2b6':
  Add strings for translation.
 2011-09-22 10:41:34 -07:00
Jeff Hamilton
4a2aabc4d7 Merge "Add strings for translation." into ics-factoryrom 2011-09-22 10:40:23 -07:00
Jeff Hamilton
7c430090c9 Add strings for translation. 2011-09-22 12:35:54 -05:00
Amith Yamasani
8a73ef8434 am 7e911169: am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 
* commit '7e9111695d42b6d794a5a9beb422b6727c6f6559':
  Move "Pulse notification light" to Display settings.
 2011-09-20 17:01:51 -07:00
Amith Yamasani
7e9111695d am bce7b69a: Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 
* commit 'bce7b69a27731ae9a58dbfa8f446c3b93d1f1cc6':
  Move "Pulse notification light" to Display settings.
 2011-09-20 16:58:52 -07:00
Amith Yamasani
bce7b69a27 Merge "Move "Pulse notification light" to Display settings." into ics-factoryrom 2011-09-20 16:57:32 -07:00
Freeman Ng
d60e977d84 am d6b8856b: am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom 
* commit 'd6b8856bc1152994ddfb8055ac6a1c292b0dda61':
  adjust char limit for translations
 2011-09-20 16:25:45 -07:00
Eric Fischer
f85b8b1a17 Merge "Import revised translations. DO NOT MERGE" into ics-factoryrom 2011-09-20 15:37:04 -07:00
Freeman Ng
d6b8856bc1 am 01b20096: Merge "adjust char limit for translations" into ics-factoryrom 
* commit '01b2009608a1ce58711efac4541f4acad62e038c':
  adjust char limit for translations
 2011-09-20 15:36:33 -07:00
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
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
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
8cb280ddff Change title in the setting for "Speech" category 
Bug: 5049218
Change-Id: I42a6726600459b9ff3f3ab25118f1c7896f705a8
 2011-09-20 17:58:45 +01: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
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
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
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
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
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
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
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
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
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