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
98a798ebd8 Merge "Import revised translations." 2011-11-10 15:03:08 -08:00
The Android Open Source Project
d876ce1997 am 753259c5: Reconcile with ics-mr1-release 
* commit '753259c5bdf922553c22de0ca0d3371073690271':
 2011-11-10 22:38:56 +00:00
The Android Open Source Project
753259c5bd Reconcile with ics-mr1-release 
Change-Id: Id4cfdbf63e6f69740330f68028c82c03d4167aca
 2011-11-10 14:36:34 -08:00
Eric Fischer
1509fa6f31 Import revised translations. 
Change-Id: I21ac7772ba81ac0fb36cf2b82af5eb0bc43292a5
 2011-11-10 14:22:55 -08:00
Amith Yamasani
5d8d1ef1ef am 445e6a15: am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1 
* commit '445e6a15e8432cafbd250022724b1188382f8f9e':
  Potential fix for monkey crash.
 2011-11-10 21:15:02 +00:00
Amith Yamasani
445e6a15e8 am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1 
* commit '6519c610353cdb9ed670913058a1732cf79d6186':
  Potential fix for monkey crash.
 2011-11-10 21:13:08 +00:00
Amith Yamasani
cebc56b606 am 6519c610: Merge "Potential fix for monkey crash." into ics-mr1 
* commit '6519c610353cdb9ed670913058a1732cf79d6186':
  Potential fix for monkey crash.
 2011-11-10 21:12:04 +00:00
Amith Yamasani
6519c61035 Merge "Potential fix for monkey crash." into ics-mr1 2011-11-10 13:09:54 -08:00
Robert Greenwalt
18c01186ae am 19b22190: Merge "Add system prop to work around tether provisioning" 
* commit '19b22190c5e9d24a500749f800262f13207030fe':
  Add system prop to work around tether provisioning
 2011-11-10 18:04:33 +00:00
Robert Greenwalt
19b22190c5 Merge "Add system prop to work around tether provisioning" 2011-11-10 10:02:40 -08:00
Eric Fischer
2d421f45e6 am 802892a6: am ffc1214c: (-s ours) am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit '802892a61397cd062cc658e6033defc75a4cca59':
  Import revised translations.  DO NOT MERGE
 2011-11-10 16:20:35 +00:00
Eric Fischer
802892a613 am ffc1214c: (-s ours) am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'ffc1214ccbd04655a435573f36d550c5c66d78de':
  Import revised translations.  DO NOT MERGE
 2011-11-10 16:15:03 +00:00
Robert Greenwalt
505766cd60 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
 2011-11-09 17:06:41 -08:00
Eric Fischer
ef9ab988ae am ffc1214c: am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'ffc1214ccbd04655a435573f36d550c5c66d78de':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:20:39 +00:00
Eric Fischer
ffc1214ccb am de8cd9e6: (-s ours) Import revised translations. DO NOT MERGE 
* commit 'de8cd9e6f01af9255c1426c009a620bbb9efbd63':
  Import revised translations.  DO NOT MERGE
 2011-11-09 23:18:05 +00:00
Amith Yamasani
236a370c25 am da7b2289: am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1 
* commit 'da7b2289255cdf48851014f87e1c1032094a89f0':
  Remove system tutorial option in Settings->About.
 2011-11-09 21:24:48 +00:00
Jeff Brown
c7bd0e7b40 am 5d549f97: am 81dfecf8: Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 
* commit '5d549f972b6c1b86b33b5d089e24f7b96b7546c8':
  Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662
 2011-11-09 21:24:48 +00:00
Peter Ng
1c1c5084c1 am 6312987d: am 2215abe9: Decreased padding on switches in settings to fix bluetoot 
* commit '6312987da231167647dfc50c37f98ad621f2caf8':
  Decreased padding on switches in settings to fix bluetoot
 2011-11-09 21:24:47 +00:00
Amith Yamasani
b25208d878 am a2ca9269: am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 
* commit 'a2ca9269f2f8a94063489974d6a08fd1e5031482':
  Prevent orphaned fragment on the settings stack.
 2011-11-09 21:24:47 +00:00
Amith Yamasani
da7b228925 am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1 
* commit '2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
  Remove system tutorial option in Settings->About.
 2011-11-09 21:19:23 +00:00
Jeff Brown
5d549f972b 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
 2011-11-09 21:19:23 +00:00
Peter Ng
6312987da2 am 2215abe9: Decreased padding on switches in settings to fix bluetoot 
* commit '2215abe996690ce619170240e0a617ed5a34b2ed':
  Decreased padding on switches in settings to fix bluetoot
 2011-11-09 21:19:22 +00:00
Amith Yamasani
a2ca9269f2 am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 
* commit '2eb32b00775b6e308e1c422856c1046c6c33b54a':
  Prevent orphaned fragment on the settings stack.
 2011-11-09 21:19:22 +00:00
Amith Yamasani
1af528b1ab am 2ad06bbd: Merge "Remove system tutorial option in Settings->About." into ics-mr1 
* commit '2ad06bbd5f7a1b836ad3536e96817d7ec29a2e70':
  Remove system tutorial option in Settings->About.
 2011-11-09 18:59:13 +00:00
Jeff Brown
48c1d78c2f 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
 2011-11-09 18:58:59 +00:00
Danielle Millett
8a7cd212e6 am 8de5cf51: am 179b3286: Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 
* commit '8de5cf5126c7ac1cae93b391af889b0c4fb249a9':
  Adding an improve face matching settings option for Face Unlock
 2011-11-09 17:53:46 +00:00
Danielle Millett
8de5cf5126 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
 2011-11-09 17:52:31 +00:00
The Android Automerger
7b05de8974 merge in ics-mr1-release history after reset to ics-mr1 2011-11-09 06:47:54 -08:00
Peter Ng
0938154d2d am 2215abe9: Decreased padding on switches in settings to fix bluetoot 
* commit '2215abe996690ce619170240e0a617ed5a34b2ed':
  Decreased padding on switches in settings to fix bluetoot
 2011-11-09 14:37:42 +00:00
Robert Greenwalt
79691fc177 am d476dd09: am 322da591: Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 
* commit 'd476dd09a2930516ef3cb1f745d53a06616813a4':
  Wimax : 4G settings menu and 4G MAC address.
 2011-11-09 14:37:22 +00:00
Amith Yamasani
a10af7c23a am 2eb32b00: Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 
* commit '2eb32b00775b6e308e1c422856c1046c6c33b54a':
  Prevent orphaned fragment on the settings stack.
 2011-11-09 14:36:54 +00:00
Robert Greenwalt
d476dd09a2 am 322da591: Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 
* commit '322da5917467f9b7b100c35f7c24bee5c9bc3909':
  Wimax : 4G settings menu and 4G MAC address.
 2011-11-09 14:34:21 +00:00
Eric Fischer
de8cd9e6f0 Import revised translations. DO NOT MERGE 
Change-Id: I57c6d5fdf39f880dab16d5db78bc6673d74090a9
 2011-11-08 17:42:11 -08:00
Amith Yamasani
2ad06bbd5f Merge "Remove system tutorial option in Settings->About." into ics-mr1 2011-11-08 17:30:23 -08:00
Jeff Brown
81dfecf8ba Merge "Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. Bug: 5569662" into ics-mr1 2011-11-08 17:22:02 -08:00
Peter Ng
2215abe996 Decreased padding on switches in settings to fix bluetoot 
Bug: 5525612
Change-Id: Id93e4aae8b1e36614383a09266ce6c3f715404ab
 2011-11-08 16:14:20 -08:00
Amith Yamasani
39dd54bee0 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
 2011-11-08 15:22:09 -08:00
Jeff Brown
b8dd637887 Handle EXTRA_DOCK_STATE_LE_DESK and HE_DESK. 
Bug: 5569662

Change-Id: Ib2a96a27239228123ed53bd0c03ca412bb4357ba
 2011-11-08 14:32:29 -08:00
Amith Yamasani
75a51aa6d2 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
 2011-11-08 11:08:28 -08:00
Amith Yamasani
2eb32b0077 Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 2011-11-08 10:46:46 -08:00
Danielle Millett
498116df1d 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
 2011-11-08 18:28:19 +00:00
Jason Simmons
f75335564e resolved conflicts for merge of 322da591 to ics-aah 
Change-Id: I4cd3301cf448761b2585c16f83787f6f2c9007b9
 2011-11-08 10:23:15 -08:00
Danielle Millett
179b32869c Merge "Adding an improve face matching settings option for Face Unlock" into ics-mr1 2011-11-08 10:03:17 -08:00
Robert Greenwalt
322da59174 Merge "Wimax : 4G settings menu and 4G MAC address." into ics-mr1 2011-11-08 10:01:30 -08:00
The Android Automerger
d2fb44f628 merge in ics-mr1-release history after reset to ics-mr1 2011-11-08 06:46:34 -08:00
tk.mun
7c5c16565e Wimax : 4G settings menu and 4G MAC address. 
1. Show the 4G menu.
2. Show the 4G MAC address
3. Execute 4G setting apk.

Change-Id: I14adc4775d35afe3398ddba4fd91c739011a06fa
Signed-off-by: tk.mun <tk.mun@samsung.com>
bug:5486930
 2011-11-07 17:16:18 -08:00
Svetoslav Ganov
5261bfff68 am 02214dc7: Merge "Accessibility - text formatting for service screen should use medium text." 
* commit '02214dc7e3df25504f11bfdf88f8d3534a57fcc7':
  Accessibility - text formatting for service screen should use medium text.
 2011-11-08 00:39:55 +00:00
Svetoslav Ganov
b5101d644e am 1ada2330: Remove install accessibility scripts confirmation dialog title. 
* commit '1ada233046f012feeee2cebee02ab4c83599a8b2':
  Remove install accessibility scripts confirmation dialog title.
 2011-11-08 00:39:44 +00:00
Svetoslav Ganov
02214dc7e3 Merge "Accessibility - text formatting for service screen should use medium text." 2011-11-07 16:00:02 -08:00
Svetoslav Ganov
d98b66a030 Accessibility - text formatting for service screen should use medium text. 
bug:5382357

Change-Id: I5168f64f51870b130b1ddcdd3bfedd4db91b9fbd
 2011-11-07 15:59:11 -08:00