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

5345 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeff Sharkey
8083eaffbe am 4b94e073: Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 
* commit '4b94e073854b72205f12ff268211a51d634fbc8f':
  Data usage label width, locking, Wi-Fi fixes.
 2011-11-11 11:49:54 -08:00
Jeff Sharkey
4b94e07385 Merge "Data usage label width, locking, Wi-Fi fixes." into ics-mr1 2011-11-10 18:10:34 -08:00
Jeff Sharkey
bdf98e84ab Data usage label width, locking, Wi-Fi fixes. 
Avoid wrapping sweep labels when underlying string is long, and avoid
showing blank "^1" sweep labels.  Only offer "restrict data" when
mobile networks are present.  Add locking around UidDetailProvider.

Move to isNetworkSupported() for consistency.

Bug: 5492495, 5471602, 5439402, 5373465
Change-Id: I79f5938d45ffbb4c2c242106424a466042a26c1c
 2011-11-10 17:17:24 -08: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
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
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
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
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
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
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
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
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
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
Steven Ross
68953fba71 am 9c4f31c1: Merge "Using same task fixes 5486287" into ics-mr1 
* commit '9c4f31c1190a8b5b2ac9911aa291d57040280a76':
  Using same task fixes 5486287
 2011-11-05 00:39:35 +00:00
Steven Ross
9c4f31c119 Merge "Using same task fixes 5486287" into ics-mr1 2011-11-04 17:38:11 -07:00
Irfan Sheriff
27dda6637c am 815c7a04: am 01b32368: Add provisioning checks for BT and USB 
* commit '815c7a042d58a3e21f71603bfb972a31a79addca':
  Add provisioning checks for BT and USB
 2011-11-04 22:49:53 +00: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
930b650f0e 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 14:59:39 +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
Daniel Sandler
f11106e1a9 am f53c3602: Bring back Android Dreams. 
* commit 'f53c3602f92d623f03e941c1d590a4720578cf5e':
  Bring back Android Dreams.
 2011-11-03 10:58:31 +00:00
The Android Automerger
850cb95af3 Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0" 
This reverts commit 1b4f5d7435, reversing
changes made to 19d9a3d284.
 2011-11-02 20:58:19 -07:00
The Android Automerger
ae076c958c Revert "Merge "Fix WPS pin input UI" into ics-mr0" 
This reverts commit 19d9a3d284, reversing
changes made to 480b2e4406.
 2011-11-02 20:58:10 -07:00
The Android Automerger
5b5561197a merge in ics-factoryrom-2-release history after reset to ics-mr0 2011-11-02 20:53:25 -07:00
Daniel Sandler
f53c3602f9 Bring back Android Dreams. 
Bug: 5121105
Change-Id: I29ddee7e4a83a01844cdb735de14c02dcbf3086c
 2011-11-02 23:30:27 -04:00
Eric Fischer
0c160ecda8 am 00f68e0d: am 553a2bda: (-s ours) Import revised translations. DO NOT MERGE 
* commit '00f68e0d749649f28607623aa163e9d1cd6fd96e':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:07:29 +00:00
Eric Fischer
00f68e0d74 am 553a2bda: (-s ours) Import revised translations. DO NOT MERGE 
* commit '553a2bda178d246e99bce744fefa2a5765c6cb04':
  Import revised translations.  DO NOT MERGE
 2011-11-03 00:04:17 +00:00
Eric Fischer
553a2bda17 Import revised translations. DO NOT MERGE 
Change-Id: I845d6b903ad4314b9aa61ea9ee03d7248164330a
 2011-11-02 15:19:25 -07:00
The Android Open Source Project
a01be79927 am 2fd22409: Reconcile with ics-factoryrom-2-release 
* commit '2fd224095660d28dca0291a118db08f8cf29fd0d':
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
  Revert "Merge "Fix WPS pin input UI" into ics-mr0"
  Revert "Merge "Fix ACTION_NFCSHARING_SETTINGS. Add ACTION_NFC_SETTINGS." into ics-mr0"
 2011-11-02 17:56:47 +00:00
The Android Open Source Project
2fd2240956 Reconcile with ics-factoryrom-2-release 
Change-Id: Iea3f36179ad20263df6dbf71a5f4fefc7a931704
 2011-11-02 10:53:29 -07:00