PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
4,235 Commits 1 Branch 0 Tags
ac48d0281f723b33968c5c0b0b4db99da38c5e12
Commit Graph

2073 Commits

Author SHA1 Message Date
Freeman Ng
4412e88e83 fix breakage caused by recent automerge 
Change-Id: Ifb4c8428f5ebc728146da848cb0319626854c667
 2011-06-08 14:34:23 -07:00
Freeman Ng
3a5764a4bf resolved conflicts for merge of ab48c22e to master 
Change-Id: Ia69df4acb1eed7d728e310e4fde3f75a520377a0
 2011-06-08 13:33:42 -07:00
satok
2e2eb63ff6 Merge "Use getDisplayName for the name of InputMethodSubtype" 2011-06-08 04:09:14 -07:00
satok
f0ae329740 Use getDisplayName for the name of InputMethodSubtype 
Change-Id: I9ad7790bc36ff2950e0238cae8ce3b785bb8eaa1
 2011-06-08 18:44:52 +09:00
Freeman Ng
0a24ca3b18 am 6beb924e: am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2 
* commit '6beb924ec2b147d259cd3438f56cd88691fc57e5':
  add options to lock suw wifi setup orientation into portrait or landscape
 2011-06-07 18:20:19 -07:00
Gilles Debunne
94129ad9a2 am 62634b30: am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog always shown 
* commit '62634b309ab6c352a37c4d79d50fc78ab806304f':
  Bug 4539424: confirmation dialog always shown
 2011-06-07 17:17:56 -07:00
Irfan Sheriff
4a1b8898c7 am f448c32d: Merge "Fix UI settings display issues" into honeycomb-LTE 
* commit 'f448c32d9b4718e657fd4811f43d8df0f9d921af':
  Fix UI settings display issues
 2011-06-07 13:58:28 -07:00
Irfan Sheriff
f448c32d9b Merge "Fix UI settings display issues" into honeycomb-LTE 2011-06-07 13:54:53 -07:00
Freeman Ng
ab48c22e7d am c47e9a1d: am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 
* commit 'c47e9a1d65dad04f778973b2898acf96c48b8914':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
 2011-06-07 13:16:13 -07:00
Freeman Ng
c47e9a1d65 am 0fd7736b: Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 
* commit '0fd7736b7153c1a304d7c6098ecf1223052f56d5':
  use prefs-style layout for setup wizard date/time settings on non-xlarge screens
 2011-06-07 12:58:06 -07:00
Freeman Ng
0fd7736b71 Merge "use prefs-style layout for setup wizard date/time settings on non-xlarge screens" into honeycomb-mr2 2011-06-07 12:53:41 -07:00
Irfan Sheriff
317e0aa530 Fix UI settings display issues 
- Update access points to reflect the latest IP configuration
- Show IP list for static IP networks

Bug: 4391449
Change-Id: If8fb6fe8bdca9d6e635b1b12927c17e1661f200c
 2011-06-07 12:28:26 -07:00
Freeman Ng
6beb924ec2 am 351367bb: am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2 
* commit '351367bbd830646ddeed49227ab37442479556f9':
  add options to lock suw wifi setup orientation into portrait or landscape
 2011-06-07 11:51:23 -07:00
Freeman Ng
351367bbd8 am f368d4dc: Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2 
* commit 'f368d4dc525f79b09bd1e36b96d0ec5b179a1e8c':
  add options to lock suw wifi setup orientation into portrait or landscape
 2011-06-07 11:48:33 -07:00
Freeman Ng
f368d4dc52 Merge "add options to lock suw wifi setup orientation into portrait or landscape" into honeycomb-mr2 2011-06-07 11:46:02 -07:00
Marco Nelissen
adcbf72c80 am 079e30cd: resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp 
* commit '079e30cd2a09388ba9ad2149a66de86be4f3a7ac':
  Allow alternate string to be used for min_number
 2011-06-07 11:15:26 -07:00
Gilles Debunne
19a5d81ed4 am cfe26919: am 533b7b53: am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2 
* commit 'cfe26919abcd3c466f40b437d084311bf025d449':
  Used space visible in SD Card bar graph
 2011-06-07 11:14:41 -07:00
Gilles Debunne
986897e770 am b7e7a8cb: am 2a9dfc5c: am 99da1a22: Always show unmount confirmation dialog 
* commit 'b7e7a8cb9cfa8b6fb7cd6b6d10913a00c45967f9':
  Always show unmount confirmation dialog
 2011-06-07 11:14:31 -07:00
Gilles Debunne
62634b309a am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog always shown 
* commit '440ca97483553d2656b90001beabe76d38773544':
  Bug 4539424: confirmation dialog always shown
 2011-06-06 18:18:31 -07:00
Gilles Debunne
440ca97483 am 8f1bd8a7: Bug 4539424: confirmation dialog always shown 
* commit '8f1bd8a7526edf49196430be214acb54e66a63ee':
  Bug 4539424: confirmation dialog always shown
 2011-06-06 17:14:03 -07:00
Marco Nelissen
079e30cd2a resolved conflicts for merge of 531bed61 to honeycomb-plus-aosp 
Change-Id: I28154c6feb563712eeda3e1176d62c7d2a28eff8
 2011-06-06 16:29:34 -07:00
Freeman Ng
f54fec5939 add options to lock suw wifi setup orientation into portrait or landscape 
bug: 4522454
Change-Id: I30ba3d4b5d0e4949ed6744cc9f0f68306fec9ce8
 2011-06-06 16:27:55 -07:00
Gilles Debunne
8f1bd8a752 Bug 4539424: confirmation dialog always shown 
Change-Id: Id1e2a52a07255e2c98cbd0e8151a82d7a2612517
 2011-06-06 15:48:08 -07:00
Gilles Debunne
cfe26919ab am 533b7b53: am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2 
* commit '533b7b53bcff1a682f295398293878f85ec419e3':
  Used space visible in SD Card bar graph
 2011-06-06 15:22:53 -07:00
Gilles Debunne
b7e7a8cb9c am 2a9dfc5c: am 99da1a22: Always show unmount confirmation dialog 
* commit '2a9dfc5c0c8cd75a5eac7a75fda7e25e5ce9f27f':
  Always show unmount confirmation dialog
 2011-06-06 15:22:51 -07:00
Gilles Debunne
533b7b53bc am 90599cdf: Merge "Used space visible in SD Card bar graph" into honeycomb-mr2 
* commit '90599cdfe8ff528b34e3578333c5eea83cf3b293':
  Used space visible in SD Card bar graph
 2011-06-06 15:18:37 -07:00
Gilles Debunne
2a9dfc5c0c am 99da1a22: Always show unmount confirmation dialog 
* commit '99da1a22a35eed631a757ccbf1bac1d7af74124d':
  Always show unmount confirmation dialog
 2011-06-06 15:18:35 -07:00
Gilles Debunne
90599cdfe8 Merge "Used space visible in SD Card bar graph" into honeycomb-mr2 2011-06-06 15:16:05 -07:00
Freeman Ng
7f6f6e18c9 use prefs-style layout for setup wizard date/time settings on non-xlarge screens 
Adjusted the screen size test to fall back to phone version of
DateTimeSettingsSetupWizard on large screens.

I made the following changes from how the phone version works:

1. Some layout changes. (Tablet look, bigger margins.)
2. Use zone picker to select time zone.
3. Added isFirstRun boolean extra to hide the pref fields
we don't need to see from setup wizard

Furthermore, I made the following fixes to the existing phone flow
(which had probably never yet been tried on a phone):

1. Added conditionals around access to some variables that only
exist in the xlarge layout.
2. Implemented PreferenceFragment.OnPreferenceStartFragmentCallback
in DateTimeSettingsSetupWizard in order to catch the user tapping
on the timezone preference and show the time zone picker popup.
(Note: for phones in ICS, we might want to launch the zone picker
preferences style, like it would have been had this been a
PreferenceActivity. Or maybe we should just create a separate
DateTimeSettingsSetupWizardPhone activity that subclasses
PreferencesActivity and doesn't need to play this trick.)

Change-Id: Ib5774a005c9f44d730d86c13746d91eb712141cc
 2011-06-06 12:40:28 -07:00
Amith Yamasani
f41be7908b am 51a1bb15: am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2 
* commit '51a1bb15ea2d669d783e1938deb7eb061f3112da':
  Fix account type dialog re-creation on orientation change.
 2011-06-03 15:55:28 -07:00
Jeff Brown
e79551c53d am a3a96d18: am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'a3a96d180f7b1351e6f2aaa8763dc962844fc83e':
  Add a preference panel for mouse speed.
 2011-06-03 15:30:16 -07:00
Amith Yamasani
2a18319a1a am 1334d7fc: am 300c4f61: am 3a5b3494: Make the BT class icon visible. 
* commit '1334d7fc3a3a1fd2f48aed93d9344115d674fcc2':
  Make the BT class icon visible.
 2011-06-03 15:29:25 -07:00
Gilles Debunne
99da1a22a3 Always show unmount confirmation dialog 
Somehow related to bug 4534261

Change-Id: I2a64406ced4a2c231114d7bb949b84c59199fd82
 2011-06-03 14:47:13 -07:00
Gilles Debunne
4f734d9d59 Used space visible in SD Card bar graph 
Bug 4544470

Change-Id: Iccae9bb568f1f7baf81c702f29f7a9e238d39d2b
 2011-06-03 14:30:39 -07:00
Brian Carlstrom
5a137f7f34 Merge "Bulletproof CredentialStorage state handling" 2011-06-02 21:06:56 -07:00
Brian Carlstrom
0e88f4dd19 Bulletproof CredentialStorage state handling 
As noted by the class javadoc, CredentialStorage has seen the number
of cases to cope with grow. This change tries to address those cases.

	src/com/android/settings/CredentialStorage.java

Added ChooseLockSettingsHelper.EXTRA_KEY_PASSWORD to coordinate
additional producer and consumer.

    constant declaration here, since its used by callers of
    ChooseLockSettingsHelper.launchConfirmationActivity
	src/com/android/settings/ChooseLockSettingsHelper.java

    old producer
	src/com/android/settings/ConfirmLockPassword.java
    new producer (CredentialStorage wants passwords and patterns)
	src/com/android/settings/ConfirmLockPattern.java
    new consumer
	src/com/android/settings/CredentialStorage.java
    old consumer
	src/com/android/settings/CryptKeeperSettings.java

Made class final and removed protected from method to make it clear
ChooseLockSettingsHelper is not to be used by subclassing.

	src/com/android/settings/ChooseLockSettingsHelper.java

Change-Id: Ib2d65398fe44573168a6267a0376c3b0388b16c8
 2011-06-02 21:06:21 -07:00
Amith Yamasani
51a1bb15ea am ad466222: am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2 
* commit 'ad4662223210827df1e62ba4c7ec24dba80a47df':
  Fix account type dialog re-creation on orientation change.
 2011-06-02 18:29:49 -07:00
Amith Yamasani
ad46622232 am 51a9d157: Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2 
* commit '51a9d15722b3c94ac92e05b19048b678247b034e':
  Fix account type dialog re-creation on orientation change.
 2011-06-02 18:27:54 -07:00
Amith Yamasani
51a9d15722 Merge "Fix account type dialog re-creation on orientation change." into honeycomb-mr2 2011-06-02 18:26:28 -07:00
Amith Yamasani
7bb8f7288e Fix account type dialog re-creation on orientation change. 
Bug: 4499512

Dummy activity that launches ChooseAccountActivity was re-launching it on orientation
changes. Make sure that it only launches it one time.

Change-Id: I764a59eaefc3ce4546330ed1b994d88b8703ce80
 2011-06-02 18:23:55 -07:00
Jeff Brown
a3a96d180f am bb8fc4a4: am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit 'bb8fc4a4ea069aab35bb30b18cf3f6f72d3d1682':
  Add a preference panel for mouse speed.
 2011-06-02 17:31:11 -07:00
Jeff Brown
bb8fc4a4ea am 9fc039e7: Merge "Add a preference panel for mouse speed." into honeycomb-mr2 
* commit '9fc039e7bcea7f1845a51fcb70d608663ceec227':
  Add a preference panel for mouse speed.
 2011-06-02 17:27:39 -07:00
Jeff Brown
9fc039e7bc Merge "Add a preference panel for mouse speed." into honeycomb-mr2 2011-06-02 17:26:13 -07:00
Jeff Brown
d82487b0ff Add a preference panel for mouse speed. 
Bug: 4124987

Change-Id: Icf166810ebbd3745f0065331c140a074b58a363c
 2011-06-02 15:13:27 -07:00
Gilles Debunne
8d055f3270 am b667422c: am 41a99004: am 53872769: Merge "Erase SD Card fixed in Settings/Storage." into honeycomb-mr2 
* commit 'b667422cfdaf73d693bf79ce6186e082b68862b8':
  Erase SD Card fixed in Settings/Storage.
 2011-06-02 15:07:51 -07:00
Amith Yamasani
1334d7fc3a am 300c4f61: am 3a5b3494: Make the BT class icon visible. 
* commit '300c4f61d823936e4a34fcece25c14c73877c994':
  Make the BT class icon visible.
 2011-06-02 13:17:05 -07:00
Amith Yamasani
300c4f61d8 am 3a5b3494: Make the BT class icon visible. 
* commit '3a5b3494a7543c1ddb66c6f630856c3aace03f0a':
  Make the BT class icon visible.
 2011-06-02 13:13:38 -07:00
Amith Yamasani
3a5b3494a7 Make the BT class icon visible. 
This change is required due to a change in the framework to accomodate smaller screen sizes.

Bug: 4519989
Change-Id: I77c5d72b29dec69df2bdd4d82811f4828ad155a6
 2011-06-02 11:48:55 -07:00
Jeff Sharkey
9302986035 Replace INetStatService with TrafficStats. 
Change-Id: I679b67f9a51e7951b7c06c67dab4efa9f09297b9
 2011-06-01 17:48:21 -07:00
Brian Carlstrom
79e309a9b8 Merge "Integrating keystore with keyguard (Part 4 of 4)" 2011-06-01 14:33:40 -07:00