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

5541 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
1b7268ef5c Merge "Import revised translations. DO NOT MERGE" into ics-mr0 2011-11-14 15:09:10 -08:00
Jim Miller
9e2e24202d Fix 5579440: Add transport control view to tablet unlock screens 
The AM/PM indicator is no longer used in lockscreen.  This propagates
the change to the cryptkeeper.

Change-Id: Iecd99f6439b5f898443e7d5c37984f7cd7607ce5
 2011-11-14 14:08:47 -08:00
Danielle Millett
6f3b1bb1d7 DO NOT MERGE Cherry picking from MR0 cl 147215 
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-14 16:40:40 -05:00
Eric Fischer
bf0e6d138e Import revised translations. DO NOT MERGE 
Change-Id: I3c719179477fda49580dbc58f79443a4e5c25cc9
 2011-11-14 13:33:52 -08:00
Amith Yamasani
af9252849f Add compatibility aliases for shortcuts added to home screen in gingerbread. 
Bug: 5016573
Change-Id: I1898b2f51216354829acca11e73186465f25ec32
 2011-11-14 11:51:36 -08:00
The Android Automerger
0c89a0839f merge in ics-mr1-release history after reset to ics-mr1 2011-11-13 06:47:26 -08:00
Jeff Sharkey
c32178b6da 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 15:31:17 +00: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
Eric Fischer
98a798ebd8 Merge "Import revised translations." 2011-11-10 15:03:08 -08: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
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
6519c61035 Merge "Potential fix for monkey crash." into ics-mr1 2011-11-10 13:09:54 -08:00
Robert Greenwalt
19b22190c5 Merge "Add system prop to work around tether provisioning" 2011-11-10 10:02:40 -08: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
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
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
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
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
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
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
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
3c77d9dd4c Reconcile with ics-mr1-release 
Change-Id: Ibd83ca3b9fbad4cb99a91ef3a80c20f1b777d4f6
 2011-11-07 08:31:58 -08: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