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

6199 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
cd05bf5eff am ab300c9d: Merge "Import revised translations. DO NOT MERGE" into ics-mr1 
* commit 'ab300c9d2397bc8805a9dc4fbbfa07db7417fb09':
  Import revised translations.  DO NOT MERGE
 2011-11-07 20:41:35 +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
76afb65d3e 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 10:27:53 +00: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