PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,860 Commits 1 Branch 0 Tags
50c32a16f34ea154fe97afdc5aaebba6598f58be
Commit Graph

3860 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Eric Fischer
50c32a16f3 am 3c75fbc5: (-s ours) am 5bdc3e91: Import revised Croatian translations. 
* commit '3c75fbc55667d4b3f368afbd29ef78eab55303a2':
  Import revised Croatian translations.
 2011-06-16 15:55:10 -07:00
Eric Fischer
3c75fbc556 am 5bdc3e91: Import revised Croatian translations. 
* commit '5bdc3e9139a7b37b97a56554cc9a89abc196b437':
  Import revised Croatian translations.
 2011-06-16 15:48:43 -07:00
Eric Fischer
957bed6e52 am 3bf263c9: am b5c4437f: Import revised translations. DO NOT MERGE 
* commit '3bf263c97e23eeec199bd56ef520fba17a1e3917':
  Import revised translations.  DO NOT MERGE
 2011-06-16 14:41:45 -07:00
Eric Fischer
3bf263c97e am b5c4437f: Import revised translations. DO NOT MERGE 
* commit 'b5c4437f336c3e79d34428de0b1b7ce22785fb29':
  Import revised translations.  DO NOT MERGE
 2011-06-16 14:29:39 -07:00
Eric Fischer
b5c4437f33 Import revised translations. DO NOT MERGE 
Change-Id: I4fa5f4000565d487a86e858cb3520555b2147dd2
 2011-06-15 15:13:19 -07:00
Eric Fischer
5bdc3e9139 Import revised Croatian translations. 
Change-Id: Ib0067e98d8e3ce35d5e2868e61a8ad3680c62f1e
 2011-06-15 12:09:02 -07:00
Amith Yamasani
80cc0ffa2b am e7f7643c: am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs. 
* commit 'e7f7643c485ed6926bc354ca28628d5179019b50':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
 2011-06-14 15:44:23 -07:00
Amith Yamasani
e7f7643c48 am 6ef6f183: Stability fixes for Settings. Asynchronous callbacks causing NPEs. 
* commit '6ef6f183e4d8be0828d1a969178a6e315d8a0ea7':
  Stability fixes for Settings. Asynchronous callbacks causing NPEs.
 2011-06-14 15:41:00 -07:00
Amith Yamasani
6ef6f183e4 Stability fixes for Settings. Asynchronous callbacks causing NPEs. 
Bug: 4598717
Change-Id: I7f1c5bf6e079bb36301e81085096c5b82615814b
 2011-06-14 15:19:14 -07:00
Mike Lockwood
c938a02bc6 am c1db1192: am d2a6f28f: Disable option to format SD card for secondary external storage 
* commit 'c1db119250fd481341c095f47a62adb14ad09484':
  Disable option to format SD card for secondary external storage
 2011-06-13 04:36:26 -07:00
Mike Lockwood
c1db119250 am d2a6f28f: Disable option to format SD card for secondary external storage 
* commit 'd2a6f28fa7ba8189d2a1987129db27fd840fac0f':
  Disable option to format SD card for secondary external storage
 2011-06-13 04:25:51 -07:00
Mike Lockwood
d2a6f28fa7 Disable option to format SD card for secondary external storage 
This is a temporary workaround for an interoperability problem with MTP

Change-Id: Iaf63ea0ac76e12ffd635765785da027cab0fcb9a
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-06-11 18:11:03 -04:00
Freeman Ng
945aac2e29 am fb096074: am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2 
* commit 'fb09607469a5cb42c833725d121e517af5daca72':
  remove disabling of Back/Dismiss button for 10" mode
 2011-06-10 07:46:40 -07:00
Freeman Ng
a35506c7fb am f2a9bd33: am 0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2 
* commit 'f2a9bd337b495b65f9e6708117835b2ff986d5af':
  add "behind" screen orientation to prevent spurious flipping
 2011-06-10 07:46:37 -07:00
Freeman Ng
fb09607469 am 148222fd: Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2 
* commit '148222fd43499a578c16c0bdf6ae9336255facd7':
  remove disabling of Back/Dismiss button for 10" mode
 2011-06-09 18:22:02 -07:00
Freeman Ng
f2a9bd337b am 0a67cdb7: Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2 
* commit '0a67cdb7e1d853ae0431c36e95930bbf355eca52':
  add "behind" screen orientation to prevent spurious flipping
 2011-06-09 18:22:00 -07:00
Freeman Ng
148222fd43 Merge "remove disabling of Back/Dismiss button for 10" mode" into honeycomb-mr2 2011-06-09 18:20:13 -07:00
Freeman Ng
0a67cdb7e1 Merge "add "behind" screen orientation to prevent spurious flipping" into honeycomb-mr2 2011-06-09 18:20:04 -07:00
Dianne Hackborn
8d7ecabc68 am 60d8b3f8: am 55c86911: Mark access to private resources now that aapt enforces this. 
* commit '60d8b3f875ae5630330feacc450169223e605166':
  Mark access to private resources now that aapt enforces this.
 2011-06-09 16:09:00 -07:00
Dianne Hackborn
60d8b3f875 am 55c86911: Mark access to private resources now that aapt enforces this. 
* commit '55c869119aabc27d3b6c6b4aab0e69faf57f1250':
  Mark access to private resources now that aapt enforces this.
 2011-06-09 16:04:44 -07:00
Freeman Ng
03708e030a remove disabling of Back/Dismiss button for 10" mode 
bug: 4580049
Change-Id: Ifee699a3ff42282a30c3c7c61b6e7799ac902700
 2011-06-09 16:00:34 -07:00
Dianne Hackborn
55c869119a Mark access to private resources now that aapt enforces this. 
Change-Id: Ifea6854d8295294011b5253640198a10e1b5c1e1
 2011-06-09 15:33:56 -07:00
Freeman Ng
9df47ed19e add "behind" screen orientation to prevent spurious flipping 
Calling setRequestedOrientation() before setContentView() used to
start activities off in the desired orientation even if the device
was in the opposite orientation, but now, there's a kind of lag
where they display briefly in the device orientation before
flipping to the request one. This change eliminates this effect.

bug: 4581374
Change-Id: I807b0a0a8a247ec8e51b85707afcbd9f75ed9956
 2011-06-09 12:00:35 -07:00
Justin Ho
9209d20adc am ea8f103f: am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403 
* commit 'ea8f103f8310c869f84d8ad48a167e8e0b63923b':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
 2011-06-08 23:33:05 -07:00
Justin Ho
ea8f103f83 am 7825cb29: Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403 
* commit '7825cb295c5f08f84282b4bbaeb03da0a536a826':
  Fixing remaining SetupWizard backgrounds for Flyer Bug: 4523403
 2011-06-08 23:30:25 -07:00
Justin Ho
7825cb295c Fixing remaining SetupWizard backgrounds for Flyer 
Bug: 4523403

Change-Id: I568747b5b856f0418caaf81664dcfa5b8fdb2481
 2011-06-08 23:13:05 -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
Jaikumar Ganesh
3f3f390b87 am a6daa21d: (-s ours) am 015788ca: Merge "Import translations for cherry-picked Bluetooth changes." into gingerbread 
* commit 'a6daa21db833191a4e83aac5c488f971bff4578c':
  Import translations for cherry-picked Bluetooth changes.
 2011-06-07 13:17:35 -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
Jaikumar Ganesh
37940170d0 am bd34e568: (-s ours) am eddb21a2: Merge "Changes for API of Bluetooth Discoverability. DO NOT MERGE" into gingerbread 
* commit 'bd34e568bf0a986f7254b93ac3b69fe3c0459162':
  Changes for API of Bluetooth Discoverability. DO NOT MERGE
 2011-06-07 10:01:40 -07:00
Jaikumar Ganesh
eeb7803a95 am aeca1851: (-s ours) am c955d8ee: Merge "Allow users to change the length of BT disoverability. DO NOT MERGE" into gingerbread 
* commit 'aeca185107481f28ad248c4f811bd708be8f5bff':
  Allow users to change the length of BT disoverability. DO NOT MERGE
 2011-06-07 10:01:36 -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
Gilles Debunne
99da1a22a3 Always show unmount confirmation dialog 
Somehow related to bug 4534261

Change-Id: I2a64406ced4a2c231114d7bb949b84c59199fd82
 2011-06-03 14:47:13 -07:00