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

5287 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
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
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
2eb32b0077 Merge "Prevent orphaned fragment on the settings stack." into ics-mr1 2011-11-08 10:46:46 -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
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
Svetoslav Ganov
1ada233046 Remove install accessibility scripts confirmation dialog title. 
bug:5552414

Change-Id: If5042632123da4388007d4ae98bc26e4cc53da81
 2011-11-07 15:28:20 -08:00
Amith Yamasani
5ba0a0295f Prevent orphaned fragment on the settings stack. 
Remove the AppDetailsFragment from the stack if DataUsage is being destroyed.

Bug: 5572241
Change-Id: Ifb2c9233bf75c8cc7b43eec5ea3f0c0b0ba65ffe
 2011-11-07 15:20:39 -08:00
Danielle Millett
487b16f340 Adding an improve face matching settings option for Face Unlock 
Adding an option which will launch a version of setup where faces
can be added to the current gallery.  It requires the user to first
confirm their password before launching addToSetup.

Patch 3 - Updated for renaming of FackLockTutorial to SetupIntro.
Now it is called every time regardless of it it's showing the tutorial
and a flag is passed in to determine whether or not SetupIntro shows
the tutorial.

Patch 4 - Removed 'Setup Complete' toast at the end of screen lock
setups since it was primarily for Face Unlock and the congratulations
screen removes the need for it.

Change-Id: Idc5f960809d992ec7bbce59ef1e13b95ef7cce45
 2011-11-07 17:29:22 -05:00
Eric Fischer
20d23dc907 am 5b3329d1: am ab300c9d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit '5b3329d188b07e674b8c506b6666a4c535e5540e':
  Import revised translations.  DO NOT MERGE
 2011-11-07 20:45:47 +00:00
Eric Fischer
5b3329d188 am ab300c9d: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'ab300c9d2397bc8805a9dc4fbbfa07db7417fb09':
  Import revised translations.  DO NOT MERGE
 2011-11-07 20:43:30 +00:00
Eric Fischer
ab300c9d23 Merge "Import revised translations. DO NOT MERGE" into ics-mr1 2011-11-07 12:39:20 -08:00
Eric Fischer
3795e49084 Import revised translations. DO NOT MERGE 
Change-Id: I50121e852a98db6c4e0cece356cceba3e3f1ccc1
 2011-11-07 12:27:48 -08:00
The Android Open Source Project
a4c91392d1 am 3c77d9dd: Reconcile with ics-mr1-release 
* commit '3c77d9dd4c53dd34b54dc90d46ef32a8404a679e':
 2011-11-07 16:34:44 +00:00
The Android Open Source Project
3c77d9dd4c Reconcile with ics-mr1-release 
Change-Id: Ibd83ca3b9fbad4cb99a91ef3a80c20f1b777d4f6
 2011-11-07 08:31:58 -08:00
Narayan Kamath
1fbe9134c4 am 8863e398: am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1 
* commit '8863e3989c52a0916fda75db8140051afa135f9a':
  Fix two bug in the TTS settings.
 2011-11-07 15:53:57 +00:00
Narayan Kamath
8863e3989c am 8214d201: Merge "Fix two bug in the TTS settings." into ics-mr1 
* commit '8214d201db04c27ed82265ec46f85a87f1adf179':
  Fix two bug in the TTS settings.
 2011-11-07 15:51:43 +00:00
The Android Automerger
fa6d77bf1b merge in ics-mr1-release history after reset to ics-mr1 2011-11-07 06:46:18 -08:00
Narayan Kamath
8214d201db Merge "Fix two bug in the TTS settings." into ics-mr1 2011-11-07 02:26:29 -08:00
The Android Automerger
70c1e0b82e merge in ics-mr1-release history after reset to ics-mr1 2011-11-06 06:46:46 -08:00
Steven Ross
f67137cf88 am 6bf64b81: am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1 
* commit '6bf64b81c0d5b6a199251d382a766448394c31b2':
  Using same task fixes 5486287
 2011-11-05 19:38:46 +00:00
Irfan Sheriff
50b916bdb4 am 8b14d6b8: am 815c7a04: am 01b32368: Add provisioning checks for BT and USB 
* commit '8b14d6b8c508c049dc0e394299087f191249bcb4':
  Add provisioning checks for BT and USB
 2011-11-05 19:38:45 +00:00
Steven Ross
6bf64b81c0 am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1 
* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76':
  Using same task fixes 5486287
 2011-11-05 19:33:54 +00:00
Irfan Sheriff
8b14d6b8c5 am 815c7a04: am 01b32368: Add provisioning checks for BT and USB 
* commit '815c7a042d58a3e21f71603bfb972a31a79addca':
  Add provisioning checks for BT and USB
 2011-11-05 19:33:44 +00:00
Steven Ross
9c4f31c119 Merge "Using same task fixes 5486287" into ics-mr1 2011-11-04 17:38:11 -07:00
Irfan Sheriff
815c7a042d am 01b32368: Add provisioning checks for BT and USB 
* commit '01b32368fffd944a0265f22db764b689179be94c':
  Add provisioning checks for BT and USB
 2011-11-04 22:48:39 +00:00
Irfan Sheriff
01b32368ff Add provisioning checks for BT and USB 
Bug: 5568752
Change-Id: Ide4f3c0eb19f8e70e301a13d81b76dd6a0516c3a
 2011-11-04 15:12:13 -07:00
Narayan Kamath
fdd94d87de Fix two bug in the TTS settings. 
(a) The TTS API doesn't mandate that unavailable voices should
be set and null, so deal with it correctly.

(b) The android manifest contained a reference to the old
TTS class.

bug:5525023
Change-Id: I1c16dbc75893288e5fa221c73a7284fca7ab25c5
 2011-11-04 16:48:20 +00:00
The Android Open Source Project
2380f40e8e am 76a52670: Reconcile with ics-mr1-release 
* commit '76a52670b63b4a1752c467d4ea9a4331ff4876eb':
  Updated PowerWidget dimens Bug: 5278970
  Update PowerWidget minWidth/minHeight so it reports as 4x1 We may update this value again
  Call setLanguage( ) on the TTS engine before the sample.
  Turn off hardware acceleration to avoid crashes due to driver.
 2011-11-04 15:35:44 +00:00
The Android Open Source Project
76a52670b6 Reconcile with ics-mr1-release 
Change-Id: I01aedb09d551e5c84c4038e4a445868d4bc60d2a
 2011-11-04 08:31:40 -07:00
The Android Open Source Project
2e6d38fee2 am bd5e37bc: am 0ad13892: Reconcile with ics-factoryrom-2-release 
* commit 'bd5e37bc8ca57fd0ef08f8a190c9a97ba69b6f9b':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
 2011-11-04 15:03:08 +00:00
The Android Open Source Project
bd5e37bc8c am 0ad13892: Reconcile with ics-factoryrom-2-release 
* commit '0ad13892c6a0a1d86e0b7dbafd3d4a2c7c82c8d2':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
 2011-11-04 15:01:29 +00:00
The Android Open Source Project
0ad13892c6 Reconcile with ics-factoryrom-2-release 
Change-Id: I1b9c07a111d23bd863d4beb0a31a2ab949e9eae7
 2011-11-04 07:57:21 -07:00
Steven Ross
1999577979 Using same task fixes 5486287 
Change-Id: I8a4cd746bc0a0a8610ef9fe55325049fa3304820
 2011-11-04 10:28:32 -04:00
The Android Automerger
c312ec9bda merge in ics-mr1-release history after reset to ics-mr1 2011-11-03 06:44:50 -07:00