PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,938 Commits 1 Branch 0 Tags
b98c00e710710d3aa96d5c950b51a60cfa48b51d
Commit Graph

1642 Commits

Author SHA1 Message Date
Dianne Hackborn
5f3017975a am 4e4ed14e: Fix issue #3146784: ANR in manage applications 
* commit '4e4ed14ee2b82cb90a25b3027eb36f190ce2e1e7':
  Fix issue #3146784: ANR in manage applications
 2010-10-29 15:40:36 -07:00
Dianne Hackborn
4e4ed14ee2 Fix issue #3146784: ANR in manage applications 
See the big comment.

Change-Id: I36164a6fcba58fe2b0e2b3aa216780d0d0e5ed37
 2010-10-29 13:58:49 -07:00
Amith Yamasani
99d71d5718 Remove extra labels from Volume settings. 
Bug: 3013561
 2010-10-29 10:27:26 -07:00
Amith Yamasani
48e9000283 Bluetooth settings revamp 
Added a separate scanning screen.
UI changes to not require long-press options.
Needs TODOs to be filled by BT team.

Bug: 3038327
 2010-10-27 16:23:05 -07:00
satok
4a5f889f80 Copy InputMethodSubtypeEnabler from the framework 
- TODO: remove InputMethodSubtypeEnabler from the framework

Change-Id: I751f3c73197c855c7f186ff64465d88ed1e2b603
 2010-10-27 15:27:12 +09:00
Daisuke Miyakawa
03b99a7141 Supress auto screen migration after wifi connection 
Bug: 3133575
Change-Id: Ibf0a6cd8704d55cb5876c76a547a97664c4b82e4
 2010-10-26 17:21:34 -07:00
Irfan Sheriff
e45e13f47a UI for wps pin from device 
Bug: 3119043
Bug: 3112178
Change-Id: I573146ed0c834cb88d5f42c25fe0be3ed501a321
 2010-10-26 09:58:58 -07:00
Jean-Baptiste Queru
838c0f2ad0 am 28539897: am 8815f032: Merge "Always set right auth_type value in apn." 
Merge commit '28539897151f0980b0a190ce82b3adf6337d081c'

* commit '28539897151f0980b0a190ce82b3adf6337d081c':
  Always set right auth_type value in apn.
 2010-10-25 17:59:56 -07:00
Jean-Baptiste Queru
2853989715 am 8815f032: Merge "Always set right auth_type value in apn." 
Merge commit '8815f03202abf3117b6a1f6a058a835915ddae04' into gingerbread-plus-aosp

* commit '8815f03202abf3117b6a1f6a058a835915ddae04':
  Always set right auth_type value in apn.
 2010-10-25 17:32:17 -07:00
Marta Białka
1929008ac5 Always set right auth_type value in apn. 
It fixes a bug that automatically sets auth_type value
of editing apn that has and should have that value set
to null (-1 = Not yet set) to auth_type value of an
apn previously displayed in the apn editor. It is
caused by careless persisting and reading data from
SharedPreferences. Fixed to keep and persist (to be
consistent with other apn's Preferences) null value
for not yet set auth_type property.

Change-Id: I4e125a4cdbad968c9f6ea8781a8c849f4c31c929
 2010-10-25 15:39:04 +02:00
Daisuke Miyakawa
1aac3240ef Merge "Disable Wifi when a user press cancel in XL setup" 2010-10-24 13:43:52 -07:00
Dianne Hackborn
2d968c6d84 am 8731cb1b: am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 13:01:02 -07:00
Dianne Hackborn
8731cb1b6a am 5e34f239: Fix issue #3124528: Mange applications is including cache files in storage size 2010-10-22 12:59:31 -07:00
Dianne Hackborn
5e34f23986 Fix issue #3124528: Mange applications is including cache files in storage size 
Change-Id: If26aeaed7572354feca7b8e65b7451a024a10266
 2010-10-22 12:18:16 -07:00
Jaikumar Ganesh
659b39abf8 Update BT APIs for change in return type. 
Change-Id: Ic85b47da50876fd6bdc6e223af4248a8586d82bc
 2010-10-22 11:12:48 -07:00
Mathew Inwood
f8b25796f0 Add 'Use My Location for Google services'. 
This interfaces to GSF to actually change the setting as Settings doesn't
have the permissions to do it directly. When GSF is not present on the device,
the setting will be hidden.

Depending on change: Ib3809571fe22f40ba34468d39fedfff70f0742ef
Bug: 3093036

Change-Id: I98596cce118f0fa5ebae45a7f8ab9c9f8a3bf2bc
 2010-10-22 12:24:02 +01:00
Daisuke Miyakawa
55de702961 Disable Wifi when a user press cancel in XL setup 
Bug: 3122182
Change-Id: Id333b9ede9093fa7fb8aa256b720effa5abf290d
 2010-10-21 19:40:16 -07:00
Nick Pelly
26d5c2b283 am 26d6e470: am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread 
Merge commit '26d6e4704a9e514097ad88c04b29a4e8b325344f'

* commit '26d6e4704a9e514097ad88c04b29a4e8b325344f':
  NFC Settings cleanup.
 2010-10-21 13:50:02 -07:00
Dianne Hackborn
50ee821003 am 149fec6a: am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread 
Merge commit '149fec6a899079eba30743e7055834969c138d52'

* commit '149fec6a899079eba30743e7055834969c138d52':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
 2010-10-21 13:47:00 -07:00
Dianne Hackborn
0fda1ad88c am 5cfa7587: am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs 
Merge commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7'

* commit '5cfa75875fcb2701fbe3b8cf861c4c1d0e38e5e7':
  Fix issue #3108683: GRH18: Battery usage chart FCs
 2010-10-21 10:41:35 -07:00
Nick Pelly
26d6e4704a am 781c0aa2: Merge "NFC Settings cleanup." into gingerbread 
Merge commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571' into gingerbread-plus-aosp

* commit '781c0aa21ed1e4a38dc3ec1a5facc7be48386571':
  NFC Settings cleanup.
 2010-10-21 09:37:55 -07:00
Nick Pelly
781c0aa21e Merge "NFC Settings cleanup." into gingerbread 2010-10-21 03:56:18 -07:00
Nick Pelly
e16f78d54a NFC Settings cleanup. 
NFC service now tracks its own settings. Call the NFC API to determine
state.

Change-Id: Ibdb33e68abdbe36df31fb13ad95c8ca1b3bcb35b
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-20 18:42:23 -07:00
Dianne Hackborn
149fec6a89 am 7a519955: Merge "Fix issue #3114356: Storage visualization in Manage Apps is confusing" into gingerbread 
Merge commit '7a51995581128a9ade44682abe064d9fcca79aa6' into gingerbread-plus-aosp

* commit '7a51995581128a9ade44682abe064d9fcca79aa6':
  Fix issue #3114356: Storage visualization in Manage Apps is confusing
 2010-10-20 17:05:19 -07:00
Dianne Hackborn
d2be882d8f Fix issue #3114356: Storage visualization in Manage Apps is confusing 
Also fixes issue #3097388: If you launch Manage Applications when SD
card app info isn't available, incomplete information gets cached

Change-Id: If3377a965653590e5bc1df25e38764a83e96b820
 2010-10-20 16:54:41 -07:00
Dianne Hackborn
5cfa75875f am 916adce0: Fix issue #3108683: GRH18: Battery usage chart FCs 
Merge commit '916adce02d5b37038cd78d11a8c884237684f9a8' into gingerbread-plus-aosp

* commit '916adce02d5b37038cd78d11a8c884237684f9a8':
  Fix issue #3108683: GRH18: Battery usage chart FCs
 2010-10-19 18:20:40 -07:00
Dianne Hackborn
916adce02d Fix issue #3108683: GRH18: Battery usage chart FCs 
Make array more bigger, and bounds check the thing.

Change-Id: Iaffebefd27c16c6ecf57566803859be1a5049b8a
 2010-10-19 16:23:53 -07:00
Brad Fitzpatrick
4453ecaca4 am 17001cea: NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Merge commit '17001cea9e198228c55111871518ebdf710f8544'

* commit '17001cea9e198228c55111871518ebdf710f8544':
  NFC: async enabling/disabling, ala Bluewooth & Wifi.
 2010-10-19 10:43:38 -07:00
Daisuke Miyakawa
c05efc1df7 UI refresh 
Bug: 3110575
Change-Id: Ia6ffef6de8882920b89372052b5e29968bedfe5f
 2010-10-19 10:12:50 -07:00
Brad Fitzpatrick
17001cea9e NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
 2010-10-18 17:03:44 -07:00
Brad Fitzpatrick
d36d650a81 NFC: async enabling/disabling, ala Bluewooth & Wifi. 
Don't ANR when toggling.

Bug: 3097279
Change-Id: Ief09a5a4d023f32b02b2f3b72ac701e8089254c8
 2010-10-18 15:25:49 -07:00
Dan Morrill
45e3000666 Merge commit '593a7049f52d46a4e47162e2e3f2c5730e8ccfd8' into mergefix 
Conflicts:
	res/values/strings.xml
	src/com/android/settings/deviceinfo/Memory.java

Change-Id: Id481ad234f2e74bdef66ea9485a548f11f0cab84
 2010-10-18 15:23:16 -07:00
Nick Pelly
e0b6d45386 am fb515337: am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 
Merge commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba'

* commit 'fb515337c2c8ceefe47b7387ebffa2b3185ef2ba':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
 2010-10-17 11:15:48 -07:00
Dianne Hackborn
593a7049f5 am 1337d0f7: Implement issue #3094621 and #3094609 - wipe sd card 
Merge commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87' into gingerbread-plus-aosp

* commit '1337d0f70b18dd732c6a617be83e5be0bb8f2f87':
  Implement issue #3094621 and #3094609 - wipe sd card
 2010-10-16 16:55:30 -07:00
Dianne Hackborn
1337d0f70b Implement issue #3094621 and #3094609 - wipe sd card 
3094621: add "wipe sd card" option to factory data reset
3094609: collapse unmount/format into one command

Implements requested UI changes.  Also some final tweaks to
Manage Applications.

Change-Id: I0219195dd0c74d8c003ef1c3f6e09714859d7f89
 2010-10-16 16:27:25 -07:00
Amith Yamasani
346ca43eeb am 8de45a66: am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. 
Merge commit '8de45a6686b298d09c5195e332f202223a555b91'

* commit '8de45a6686b298d09c5195e332f202223a555b91':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
 2010-10-16 09:43:15 -07:00
Jaikumar Ganesh
cf7ef7cbd6 am 7805fa99: am 022299df: Merge "Disconnect dock only if its connected." into gingerbread 
Merge commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54'

* commit '7805fa99ffce21bb9b016ffdd5375d331b9a8a54':
  Disconnect dock only if its connected.
 2010-10-16 08:52:36 -07:00
Nick Pelly
fb515337c2 am e1a9ca68: Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 
Merge commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f' into gingerbread-plus-aosp

* commit 'e1a9ca686249ebe7c85a98d467bb705e4c3eed2f':
  Use NfcAdapter.getDefaultAdapter() to check for NFC prescence.
 2010-10-15 18:21:06 -07:00
Jim Miller
bd8e697338 Fix 3100926: Prevent proguard from stripping OwnerInfo 
This just renames OwnerInfo to OwnerInfoSettings so the existing
proguard rule picks it up.

Change-Id: Ie5682d77e8efe22a922bf750d4689cafd50e7a65
 2010-10-15 12:42:00 -07:00
Nick Pelly
e1a9ca6862 Merge "Use NfcAdapter.getDefaultAdapter() to check for NFC prescence." into gingerbread 2010-10-15 10:56:05 -07:00
Amith Yamasani
8de45a6686 am 1bdb7874: Make summary appear for both checked and unchecked NFC checkbox in Settings. 
Merge commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed' into gingerbread-plus-aosp

* commit '1bdb7874adf52b0fc2fe6ec40913a0562cf585ed':
  Make summary appear for both checked and unchecked NFC checkbox in Settings.
 2010-10-15 10:06:18 -07:00
Amith Yamasani
1bdb7874ad Make summary appear for both checked and unchecked NFC checkbox in Settings. 
And remove the extra "Tag" in the summary.

Bug: 3083079
Change-Id: I998c2556a88180098a060d43b720276a7619a368
 2010-10-15 10:00:40 -07:00
Nick Pelly
a57eacef3c Use NfcAdapter.getDefaultAdapter() to check for NFC prescence. 
Change-Id: I518389a317a4e9ab9009fd33330a91f7c35edc2a
Signed-off-by: Nick Pelly <npelly@google.com>
 2010-10-15 02:15:27 -07:00
Nick Pelly
38964d8937 am f4e4319f: am 083310d3: Update NFC settings description, and fix polarity. 
Merge commit 'f4e4319f4162c5dca14a9acc00bb5a2df0e452b3'

* commit 'f4e4319f4162c5dca14a9acc00bb5a2df0e452b3':
  Update NFC settings description, and fix polarity.
 2010-10-14 22:14:34 -07:00
Jaikumar Ganesh
c0a2044b9a am 0d5e320c: am bdf13107: Merge "Call disconnect / connect without checking the current status" into gingerbread 
Merge commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e'

* commit '0d5e320cdd9cbd76012c0a1aec157e358d05891e':
  Call disconnect / connect without checking the current status
 2010-10-14 19:30:08 -07:00
Nick Pelly
2f54a66abd am b3c4365d: am cd99332f: Merge "Update settings app for new NFC API." into gingerbread 
Merge commit 'b3c4365d10047eae367b529d98d5a90d052f6393'

* commit 'b3c4365d10047eae367b529d98d5a90d052f6393':
  Update settings app for new NFC API.
 2010-10-14 19:29:44 -07:00
Jim Miller
9d36ab531b Merge "Fix 3024528: Initial implementation of owner info to enable dogfooding" 2010-10-14 15:55:04 -07:00
Jim Miller
edfaaeaed7 Fix 3024528: Initial implementation of owner info to enable dogfooding 
This is a quick UI implementation to allow owner info to be changed
on LockScreen for dogfooding.

Change-Id: I0dc781def594d1c921c44348c130f509798a71f4
 2010-10-14 15:50:15 -07:00
Jaikumar Ganesh
7805fa99ff am 022299df: Merge "Disconnect dock only if its connected." into gingerbread 
Merge commit '022299dfce6a705a8cbaff972a4309da6e90a8c2' into gingerbread-plus-aosp

* commit '022299dfce6a705a8cbaff972a4309da6e90a8c2':
  Disconnect dock only if its connected.
 2010-10-14 15:33:42 -07:00
Jaikumar Ganesh
9d03e98d22 Disconnect dock only if its connected. 
Scenario: BT is off, device is paired with the desk dock.
Media is switched off. So when the user docks, it was trying to
disconnect even when BT was off and hence DBUS was crashing.

Bug: 3097224

Change-Id: I13e1dd4459c47d5ba9a403f2ae1cc8a131f02a08
 2010-10-14 15:09:57 -07:00