OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoMove DataConnection related classes to their own package.
Wink Saville [Thu, 21 Feb 2013 13:24:12 +0000 (05:24 -0800)]
Move DataConnection related classes to their own package.

RadioInfo was importing DataConnection and GsmDataConnection causing
it to break. As it turns out it isn't using them so I removed them
and all other unused imports.

Change-Id: I34ee9e87545e6b15ebf4d3ec101d4ed3d322f7b2

11 years agoam ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
Irfan Sheriff [Sat, 16 Feb 2013 00:18:51 +0000 (16:18 -0800)]
am ff5b96fb: Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029

* commit 'ff5b96fb19e3a56a8803547a0c9cd11cfd97746c':
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage

11 years agoMerge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
Irfan Sheriff [Fri, 15 Feb 2013 23:42:50 +0000 (23:42 +0000)]
Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029

* changes:
  Use updated enterprise API
  Fix EAP field display for a new network
  Allow only valid EAP configs
  Update enterprise API usage

11 years agoUse updated enterprise API
Irfan Sheriff [Mon, 11 Feb 2013 23:55:31 +0000 (15:55 -0800)]
Use updated enterprise API

Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1

11 years agoFix EAP field display for a new network
Irfan Sheriff [Wed, 6 Feb 2013 18:51:13 +0000 (10:51 -0800)]
Fix EAP field display for a new network

We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way

Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4

11 years agoAllow only valid EAP configs
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs

We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.

Allow only support configs for various EAP methods

Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab

11 years agoUpdate enterprise API usage
Irfan Sheriff [Fri, 11 Jan 2013 22:12:54 +0000 (14:12 -0800)]
Update enterprise API usage

Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen

Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 15 Feb 2013 22:48:57 +0000 (14:48 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4bb5b296199aa3d33d9e653e2f982e67178c3e7f
Auto-generated-cl: translation import

11 years agoam 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"
Amith Yamasani [Fri, 15 Feb 2013 18:17:17 +0000 (10:17 -0800)]
am 1ef6a106: Merge "Fix Settings app crash after enabled multi-user"

* commit '1ef6a106d50f6fce2e2a810075a55bb264fa5c23':
  Fix Settings app crash after enabled multi-user

11 years agoMerge "Fix Settings app crash after enabled multi-user"
Amith Yamasani [Fri, 15 Feb 2013 17:15:41 +0000 (17:15 +0000)]
Merge "Fix Settings app crash after enabled multi-user"

11 years agoresolved conflicts for merge of bbe409d3 to master
Kenny Root [Thu, 14 Feb 2013 21:25:19 +0000 (13:25 -0800)]
resolved conflicts for merge of bbe409d3 to master

Change-Id: I5d64f8d628636f3621b765873aade25eca948576

11 years agoMerge "KeyStore: stop using state()"
Kenny Root [Thu, 14 Feb 2013 20:18:11 +0000 (20:18 +0000)]
Merge "KeyStore: stop using state()"

11 years agoKeyStore: stop using state()
Kenny Root [Thu, 14 Feb 2013 18:27:22 +0000 (10:27 -0800)]
KeyStore: stop using state()

Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4

11 years agoApp ops: new labels, fix crash, fix updating list.
Dianne Hackborn [Wed, 13 Feb 2013 19:02:12 +0000 (11:02 -0800)]
App ops: new labels, fix crash, fix updating list.

- Add new labels for media ops.
- Fix crash due to missing boolean entry for access notifications op.
- Fix updating op category lists to remain stable (not jump
  back to the top).

Change-Id: I505cfd91b1ff92587a627d33f3ac7a21145a9bbd

11 years agoMerge "Use updated enterprise API"
Irfan Sheriff [Tue, 12 Feb 2013 22:57:14 +0000 (22:57 +0000)]
Merge "Use updated enterprise API"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 12 Feb 2013 21:30:38 +0000 (21:30 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 12 Feb 2013 20:27:01 +0000 (12:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: Iba047f24fc3edbd4c57a5e53c8c6ef6f8acb5c03
Auto-generated-cl: translation import

11 years agoShow the user's list of notifications in Settings.
Daniel Sandler [Thu, 17 Jan 2013 18:14:02 +0000 (13:14 -0500)]
Show the user's list of notifications in Settings.

Requires new APIs in change I41338230 and change Icce8d6f9
from frameworks/base.

Change-Id: I21b645bdc265b477453f9b177f6776e2c58bd323

11 years agoUse updated enterprise API
Irfan Sheriff [Mon, 11 Feb 2013 23:55:31 +0000 (15:55 -0800)]
Use updated enterprise API

Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 11 Feb 2013 17:12:24 +0000 (09:12 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia18ab88594e12fcb1151329b127db50b1102f780
Auto-generated-cl: translation import

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 8 Feb 2013 19:03:45 +0000 (11:03 -0800)]
Import translations. DO NOT MERGE

Change-Id: If973bc69ae7c28f8353eb8cafb1cf2cc7d86a711
Auto-generated-cl: translation import

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Fri, 8 Feb 2013 01:19:50 +0000 (01:19 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoClean up RTL in Wi-Fi details dialog.
Jeff Sharkey [Thu, 7 Feb 2013 23:45:29 +0000 (15:45 -0800)]
Clean up RTL in Wi-Fi details dialog.

Bug: 7677078
Change-Id: Ic7652bc7bd0bc24ccacbe1135e763190cc6f12cd

11 years agoMerge "Update theme of ActivityPicker"
Michael Jurka [Thu, 7 Feb 2013 10:09:14 +0000 (10:09 +0000)]
Merge "Update theme of ActivityPicker"

11 years agoMerge "App ops: add "draw on top" op, improve switch ordering."
Dianne Hackborn [Thu, 7 Feb 2013 08:09:02 +0000 (08:09 +0000)]
Merge "App ops: add "draw on top" op, improve switch ordering."

11 years agoApp ops: add "draw on top" op, improve switch ordering.
Dianne Hackborn [Thu, 7 Feb 2013 08:01:10 +0000 (00:01 -0800)]
App ops: add "draw on top" op, improve switch ordering.

Change-Id: Ibe490305650f986f3ccf1ea25012272287455f59

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 6 Feb 2013 22:17:49 +0000 (14:17 -0800)]
Import translations. DO NOT MERGE

Change-Id: I90ee946c8575cc443beee288f6ded5a96afc0e55
Auto-generated-cl: translation import

11 years agoam 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
Irfan Sheriff [Wed, 6 Feb 2013 19:20:40 +0000 (11:20 -0800)]
am 5c879e48: am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"

# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '5c879e48eddfe617125733f2be46854a0266a23b':
  P2PSetting:Avoid p2p_find on group removal event

11 years agoam 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
Irfan Sheriff [Wed, 6 Feb 2013 19:16:24 +0000 (11:16 -0800)]
am 414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"

# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '414d9e9c6928581d4f91b008c109a6a4630bfaae':
  P2PSetting:Avoid p2p_find on group removal event

11 years agoMerge "Fix EAP field display for a new network"
Irfan Sheriff [Wed, 6 Feb 2013 19:03:37 +0000 (19:03 +0000)]
Merge "Fix EAP field display for a new network"

11 years agoFix EAP field display for a new network
Irfan Sheriff [Wed, 6 Feb 2013 18:51:13 +0000 (10:51 -0800)]
Fix EAP field display for a new network

We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way

Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4

11 years agoMerge "P2PSetting:Avoid p2p_find on group removal event"
Irfan Sheriff [Wed, 6 Feb 2013 18:13:59 +0000 (18:13 +0000)]
Merge "P2PSetting:Avoid p2p_find on group removal event"

11 years agoP2PSetting:Avoid p2p_find on group removal event
sunil duttu [Wed, 6 Feb 2013 07:13:54 +0000 (12:43 +0530)]
P2PSetting:Avoid p2p_find on group removal event

Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.

Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e

11 years agoam 6639dee4: am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant...
Irfan Sheriff [Wed, 6 Feb 2013 17:02:26 +0000 (09:02 -0800)]
am 6639dee4: am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"

# By sunil duttu
# Via Android Git Automerger (1) and others
* commit '6639dee497304c359141caf9b0452699a6d64aa9':
  wifiSettings: Updating the networkinfo on supplicant event

11 years agoam 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
Irfan Sheriff [Wed, 6 Feb 2013 16:58:31 +0000 (08:58 -0800)]
am 203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"

# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '203631b24cd3947bcba2ab24789e4cfec487eff7':
  wifiSettings: Updating the networkinfo on supplicant event

11 years agoMerge "wifiSettings: Updating the networkinfo on supplicant event"
Irfan Sheriff [Wed, 6 Feb 2013 16:42:45 +0000 (16:42 +0000)]
Merge "wifiSettings: Updating the networkinfo on supplicant event"

11 years agoUpdate theme of ActivityPicker
Michael Jurka [Wed, 6 Feb 2013 13:54:54 +0000 (14:54 +0100)]
Update theme of ActivityPicker

Bug: 7971340

11 years agowifiSettings: Updating the networkinfo on supplicant event
sunil duttu [Wed, 6 Feb 2013 05:42:03 +0000 (11:12 +0530)]
wifiSettings: Updating the networkinfo on supplicant event

In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.

Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c

11 years agoMerge "App ops: add modify settings op."
Dianne Hackborn [Wed, 6 Feb 2013 01:36:47 +0000 (01:36 +0000)]
Merge "App ops: add modify settings op."

11 years agoApp ops: add modify settings op.
Dianne Hackborn [Wed, 6 Feb 2013 01:31:10 +0000 (17:31 -0800)]
App ops: add modify settings op.

Change-Id: I7aab6c7f565a20fe24156956895a7db20c8d3aaa

11 years agoMerge "fix an issue where sensors power usage wasn't reported properly"
Mathias Agopian [Wed, 6 Feb 2013 01:16:09 +0000 (01:16 +0000)]
Merge "fix an issue where sensors power usage wasn't reported properly"

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Tue, 5 Feb 2013 20:07:34 +0000 (20:07 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoApp ops: add UI for SMS ops.
Dianne Hackborn [Tue, 5 Feb 2013 02:27:40 +0000 (18:27 -0800)]
App ops: add UI for SMS ops.

Change-Id: I595df9a286ba5389f9e309516dc4a8ab34773277

11 years agoMerge "Improve error message to figure out which fragment class is problematic."
Amith Yamasani [Tue, 5 Feb 2013 19:15:07 +0000 (19:15 +0000)]
Merge "Improve error message to figure out which fragment class is problematic."

11 years agoImprove error message to figure out which fragment class is problematic.
Amith Yamasani [Tue, 5 Feb 2013 18:56:55 +0000 (10:56 -0800)]
Improve error message to figure out which fragment class is problematic.

Bug: 8057867
Change-Id: I6ad0bc8c8a6ed9bc8a1cca5debffe15c6de3a1b5

11 years agofix an issue where sensors power usage wasn't reported properly
Mathias Agopian [Tue, 5 Feb 2013 03:24:46 +0000 (19:24 -0800)]
fix an issue where sensors power usage wasn't reported properly

the battery service records a sensor's *handle*, but the
PowerUsageSummary code used it as a sensor *type*.

Change-Id: I0d2cbdffc24238d5e02f0d6369fa44ed990176a4

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 4 Feb 2013 17:59:27 +0000 (09:59 -0800)]
Import translations. DO NOT MERGE

Change-Id: I6091aef5f86bfdc58cfe83f15e1292e7d86339dd
Auto-generated-cl: translation import

11 years agoFix Settings app crash after enabled multi-user
Jaewan Kim [Mon, 4 Feb 2013 06:36:17 +0000 (15:36 +0900)]
Fix Settings app crash after enabled multi-user

Bug: 8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf

11 years agoMerge "Settings: Add setting to clear adb public keys"
Benoit Goby [Sat, 2 Feb 2013 02:38:48 +0000 (02:38 +0000)]
Merge "Settings: Add setting to clear adb public keys"

11 years agoApp ops: improve presentation.
Dianne Hackborn [Sat, 2 Feb 2013 01:29:15 +0000 (17:29 -0800)]
App ops: improve presentation.

Change-Id: Ia8702f9421a2cf2e27e8e24bfdc596321ace515a

11 years agoApp ops: Support neighboring cells, call phone, improve UI.
Dianne Hackborn [Thu, 31 Jan 2013 23:06:57 +0000 (15:06 -0800)]
App ops: Support neighboring cells, call phone, improve UI.

Change-Id: I0783c7ae941499cf9847bcf657141c3aea76f59d

11 years agoMerge "Use non-breaking hyphen for "Wi-Fi""
Russell Brenner [Fri, 1 Feb 2013 21:20:29 +0000 (21:20 +0000)]
Merge "Use non-breaking hyphen for "Wi-Fi""

11 years agoUse non-breaking hyphen for "Wi-Fi"
Russell Brenner [Fri, 1 Feb 2013 18:57:49 +0000 (10:57 -0800)]
Use non-breaking hyphen for "Wi-Fi"

Strings flagged with 'translatable="false"' have not been altered.

Bug: 6632800
Change-Id: I1676d3fed7d6faec6ab4ec58d851fa976df2c43a

11 years agoMigrate package notification controls to AppOps.
Daniel Sandler [Wed, 30 Jan 2013 19:03:58 +0000 (14:03 -0500)]
Migrate package notification controls to AppOps.

We still show the [X] Show Notifications box in
InstalledAppDetails for now, however the information should
be mostly in sync with the AppOps screen. ("Mostly" because
there's no way to register for changes to AppOp modes at
present.)

Change-Id: Ia5cdda26c140aed8ee7329caaeedac04b8cbd8f1

11 years agoMerge "Fix bugs with null AppOp permissions."
Daniel Sandler [Fri, 1 Feb 2013 14:43:38 +0000 (14:43 +0000)]
Merge "Fix bugs with null AppOp permissions."

11 years agoFix bugs with null AppOp permissions.
Daniel Sandler [Thu, 31 Jan 2013 20:22:51 +0000 (15:22 -0500)]
Fix bugs with null AppOp permissions.

Change-Id: I9f199d4f5843fbba374ced8206902098811b3786

11 years agoMerge "Remove "enhance web scripts" from settings."
Svetoslav [Thu, 31 Jan 2013 03:17:06 +0000 (03:17 +0000)]
Merge "Remove "enhance web scripts" from settings."

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 30 Jan 2013 18:43:41 +0000 (10:43 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia4458289713f2e9f6c47882d2f2e99d36f6e2aec
Auto-generated-cl: translation import

11 years agoImprove resetting of application state.
Dianne Hackborn [Tue, 29 Jan 2013 23:22:22 +0000 (15:22 -0800)]
Improve resetting of application state.

We now reset preferred apps to our defaults, instead of
just clearing everything out.

Change-Id: I70f713ce62b2ffb2d7f6a8e056978847734c27f7

11 years agoRemove "enhance web scripts" from settings.
Svetoslav [Tue, 29 Jan 2013 10:16:41 +0000 (02:16 -0800)]
Remove "enhance web scripts" from settings.

See change Ic125514c34f191aea0416a469e4b3481ab3200b9 for details.

bug:8089372

Change-Id: I47eda16579c29051aa24b8d4c38035439aa00915

11 years agoMerge "Revert "Use non-breaking hyphen for "Wi-Fi"""
Russell Brenner [Mon, 28 Jan 2013 19:35:55 +0000 (19:35 +0000)]
Merge "Revert "Use non-breaking hyphen for "Wi-Fi"""

11 years agoRevert "Use non-breaking hyphen for "Wi-Fi""
Russell Brenner [Mon, 28 Jan 2013 19:33:40 +0000 (19:33 +0000)]
Revert "Use non-breaking hyphen for "Wi-Fi""

This reverts commit 6a98b9bf58b0715713834d75028b3c21a6d92a43

Change-Id: Ia4168462988e37f3470c510453c31c73ed63ab7b

11 years agoMerge "Revert "Import translations. DO NOT MERGE""
Baligh Uddin [Mon, 28 Jan 2013 19:32:19 +0000 (19:32 +0000)]
Merge "Revert "Import translations. DO NOT MERGE""

11 years agoRevert "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 28 Jan 2013 19:32:01 +0000 (19:32 +0000)]
Revert "Import translations. DO NOT MERGE"

broken build.

This reverts commit 3e93c29207e96387b367b18f47663972b2000e6b

Change-Id: Ib1f8d64f12add5ffbf1a777d22525fc55e226bc3

11 years agoUse non-breaking hyphen for "Wi-Fi"
Russell Brenner [Sat, 19 Jan 2013 00:36:06 +0000 (16:36 -0800)]
Use non-breaking hyphen for "Wi-Fi"

Bug: 6632800
Change-Id: I5838a16ffce10ae6df4b2b5fd504b43124b6de3e

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Mon, 28 Jan 2013 18:33:40 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoMerge "Follow UX design guideline for frequency band"
Irfan Sheriff [Mon, 28 Jan 2013 16:46:49 +0000 (16:46 +0000)]
Merge "Follow UX design guideline for frequency band"

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 28 Jan 2013 16:44:57 +0000 (08:44 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ib27a3e53b1691361731f0a1b02d9f529cdd5f71a
Auto-generated-cl: translation import

11 years agoam bbf8daf4: am 505232be: Merge "Fix of Settings application sort crash"
Dianne Hackborn [Sat, 26 Jan 2013 01:11:42 +0000 (17:11 -0800)]
am bbf8daf4: am 505232be: Merge "Fix of Settings application sort crash"

# By Jia Arlan
# Via Android Git Automerger (1) and others
* commit 'bbf8daf4602b62d806c4946196b526edbe08e056':
  Fix of Settings application sort crash

11 years agoam 61b0f8c8: am b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings...
Irfan Sheriff [Sat, 26 Jan 2013 01:11:31 +0000 (17:11 -0800)]
am 61b0f8c8: am b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"

# By Venkataraman Nerellapalli
# Via Android Git Automerger (1) and others
* commit '61b0f8c88ab6c8254230aa7953bf619934d7d756':
  Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot

11 years agoFollow UX design guideline for frequency band
Irfan Sheriff [Fri, 25 Jan 2013 22:37:20 +0000 (14:37 -0800)]
Follow UX design guideline for frequency band

Bug: 8019331
Change-Id: Ib87f4200ed42730d06485e339dc67cbb870b0538

11 years agoApp ops: add UI for viewing and controlling ops per-app.
Dianne Hackborn [Fri, 25 Jan 2013 03:14:26 +0000 (19:14 -0800)]
App ops: add UI for viewing and controlling ops per-app.

Change-Id: Iadd68cbd429af4d431dcd09b9adacd09c5092ae6

11 years agoam 505232be: Merge "Fix of Settings application sort crash"
Dianne Hackborn [Fri, 25 Jan 2013 01:09:13 +0000 (17:09 -0800)]
am 505232be: Merge "Fix of Settings application sort crash"

# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '505232be07e388c602529e14254df013637b16f2':
  Fix of Settings application sort crash

11 years agoMerge "Fix of Settings application sort crash"
Dianne Hackborn [Fri, 25 Jan 2013 01:02:58 +0000 (01:02 +0000)]
Merge "Fix of Settings application sort crash"

11 years agoam b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
Irfan Sheriff [Thu, 24 Jan 2013 19:30:12 +0000 (11:30 -0800)]
am b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"

# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit 'b1ea6805d98bf953448db350ae33e53c3c3b797d':
  Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot

11 years agoMerge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
Irfan Sheriff [Thu, 24 Jan 2013 18:50:05 +0000 (18:50 +0000)]
Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"

11 years agoMerge "Handle new "disabled until used" mode."
Dianne Hackborn [Wed, 23 Jan 2013 22:45:27 +0000 (22:45 +0000)]
Merge "Handle new "disabled until used" mode."

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 23 Jan 2013 19:34:51 +0000 (11:34 -0800)]
Import translations. DO NOT MERGE

Change-Id: Ia36273d69a924d49f94116887962252c942d0042
Auto-generated-cl: translation import

11 years agoOption "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Venkataraman Nerellapalli [Wed, 22 Feb 2012 09:12:46 +0000 (14:42 +0530)]
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot

First option in Wi-Fi AP settings of Wi-Fi Hotspot, "Open", is
changed to "None" since "Open" is not localized.
"None" (@string/wifi_security_none) already in use in other
Wi-Fi related screens and it is already localized in
the existing source code.

Change-Id: Ic79b20e3b0f094e064dd4758d8a03d67a208389a

11 years agoSettings: Add setting to clear adb public keys
Benoit Goby [Sat, 22 Dec 2012 00:43:20 +0000 (16:43 -0800)]
Settings: Add setting to clear adb public keys

Change-Id: I1d5ab7a83a3b7b23f0cd51305d965f45793eb853

11 years agoHandle new "disabled until used" mode.
Dianne Hackborn [Wed, 23 Jan 2013 01:17:25 +0000 (17:17 -0800)]
Handle new "disabled until used" mode.

We want these apps to still show up as normal apps,
not look like they have been disabled completely (entirely
gone) or by the user (listed separately as disabled).

Change-Id: Ib58ead274a74c6df3ee87c8db5f7d0652e37b9bd

11 years agoMerge "Import translations. DO NOT MERGE"
Baligh Uddin [Wed, 23 Jan 2013 00:58:48 +0000 (00:58 +0000)]
Merge "Import translations. DO NOT MERGE"

11 years agoam a6c51f3d: am 7b8b6618: Merge "Fix for battery temperature display"
Amith Yamasani [Wed, 23 Jan 2013 00:25:15 +0000 (16:25 -0800)]
am a6c51f3d: am 7b8b6618: Merge "Fix for battery temperature display"

* commit 'a6c51f3d0b1b43aa3e27bd98639f0ad3acf22ecc':
  Fix for battery temperature display

11 years agoam 7b8b6618: Merge "Fix for battery temperature display"
Amith Yamasani [Wed, 23 Jan 2013 00:20:28 +0000 (16:20 -0800)]
am 7b8b6618: Merge "Fix for battery temperature display"

* commit '7b8b6618219a2a9e1402858b513cf19628033204':
  Fix for battery temperature display

11 years agoMerge "Fix for battery temperature display"
Amith Yamasani [Wed, 23 Jan 2013 00:09:51 +0000 (00:09 +0000)]
Merge "Fix for battery temperature display"

11 years agoam 814db19c: am 67995f97: Merge "Fix for F/C in WifiConfigInfo"
Irfan Sheriff [Tue, 22 Jan 2013 23:23:57 +0000 (15:23 -0800)]
am 814db19c: am 67995f97: Merge "Fix for F/C in WifiConfigInfo"

* commit '814db19c4631dba3c60ac807771be4bf04c20880':
  Fix for F/C in WifiConfigInfo

11 years agoam 67995f97: Merge "Fix for F/C in WifiConfigInfo"
Irfan Sheriff [Tue, 22 Jan 2013 23:12:22 +0000 (15:12 -0800)]
am 67995f97: Merge "Fix for F/C in WifiConfigInfo"

* commit '67995f973dd524ba20983b9246a17a10746c4590':
  Fix for F/C in WifiConfigInfo

11 years agoMerge "Fix for F/C in WifiConfigInfo"
Irfan Sheriff [Tue, 22 Jan 2013 22:58:19 +0000 (22:58 +0000)]
Merge "Fix for F/C in WifiConfigInfo"

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Tue, 22 Jan 2013 17:27:15 +0000 (09:27 -0800)]
Import translations. DO NOT MERGE

Change-Id: I5386ba5861b8c9b623bd6031d936474ad457ca1f
Auto-generated-cl: translation import

11 years agoam d7d5b33b: am 375b6d98: Merge "Force closed at settings application when delete...
Elliott Hughes [Tue, 22 Jan 2013 16:03:32 +0000 (08:03 -0800)]
am d7d5b33b: am 375b6d98: Merge "Force closed at settings application when delete Misc files"

* commit 'd7d5b33bcd78680d475c92fca7bafc4ac4279621':
  Force closed at settings application when delete Misc files

11 years agoam 375b6d98: Merge "Force closed at settings application when delete Misc files"
Elliott Hughes [Tue, 22 Jan 2013 15:58:42 +0000 (07:58 -0800)]
am 375b6d98: Merge "Force closed at settings application when delete Misc files"

* commit '375b6d985be9203fb221eb42810e586e196c34f8':
  Force closed at settings application when delete Misc files

11 years agoMerge "Force closed at settings application when delete Misc files"
Elliott Hughes [Tue, 22 Jan 2013 15:43:05 +0000 (15:43 +0000)]
Merge "Force closed at settings application when delete Misc files"

11 years agoFix of Settings application sort crash
Jia Arlan [Fri, 11 May 2012 08:27:07 +0000 (16:27 +0800)]
Fix of Settings application sort crash

The original implementation of compareTo function
will sometimes cause crash when the power usage list
above 32 items.

When comparing double values a proper comparison method
needs to be used. Using just subtraction does not take
into account NaN:S, infinities and +/-0 numbers. In certain
cirtumstances it seems that using subtraction causes
compareTo to return values that is not expected by the
sorting code and causes an illegal argument exception with
"Comparison method violates its general contract!".

This problem only happens if the sort code is called arrays
containing more than 32 (currently) due to how
ComparableTimSort works (call chain is Collections.sort ->
Arrays.sort(Object[]) -> ComparableTimSort.

Change-Id: If732f04797a3c8b2a43568c90bb73a1ec69a4c98

11 years agoMerge "Allow only valid EAP configs"
Irfan Sheriff [Sat, 19 Jan 2013 18:16:35 +0000 (18:16 +0000)]
Merge "Allow only valid EAP configs"

11 years agoFix for F/C in WifiConfigInfo
Shuhrat Dehkanov [Sat, 19 Jan 2013 12:50:06 +0000 (21:50 +0900)]
Fix for F/C in WifiConfigInfo

1. Turn off Wi-Fi
2. Open the dialer and input *#*#4636#*#*
3. Navigate to Wi-Fi information -> Wi-Fi config and observe "Unfortunately,
Settings has stopped" dialog.

Change-Id: I6ed59fc157e9bd8a46e00184b91a1a9f0412d198
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
11 years agoFix for battery temperature display
ikbae.kim [Fri, 18 Jan 2013 00:29:55 +0000 (16:29 -0800)]
Fix for battery temperature display

Centi temperature under zero degree is displayed with '-' sign.
Fix this using absolute value in centi degree display.

Change-Id: If4958d9c75c03d1f3ecfd14436fc80dc2fd57860

11 years agoImprove app ops UI.
Dianne Hackborn [Fri, 18 Jan 2013 18:52:38 +0000 (10:52 -0800)]
Improve app ops UI.

Merge app entries together some.

Also a little weekend present for swetland.

Change-Id: Ie2b6654d9de0b9eeaafbf4b070845353c130b9c1

11 years agoAllow only valid EAP configs
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs

We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.

Allow only support configs for various EAP methods

Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab

11 years agoForce closed at settings application when delete Misc files
Predrag Stanojevic [Tue, 15 May 2012 13:01:02 +0000 (15:01 +0200)]
Force closed at settings application when delete Misc files

NullPointerException in MiscFilesHandler.java, missing check to
ensure that dir.list() does not return null.

Change-Id: I13aac19949826b385610fd1fee2befb411684023

11 years agoMerge "Remove now obsolete tracing options"
Chris Craik [Thu, 17 Jan 2013 23:45:33 +0000 (23:45 +0000)]
Merge "Remove now obsolete tracing options"