PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,707 Commits 1 Branch 0 Tags
6a01acdeaf24e94a8f6a1399e8a6d351da26c07c
Commit Graph

3707 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
cb84ad529d am 1ad4824d: am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data". 
* commit '1ad4824d848d67e185f06b4fdce86f1caeb0d95e':
  Wifi disconnect policy summary text should not contain "mobile data".
 2011-03-08 13:51:52 -08:00
Amith Yamasani
1ad4824d84 am 35bc6b5f: Wifi disconnect policy summary text should not contain "mobile data". 
* commit '35bc6b5f151ea073522f14067eb92aab3a99bc7d':
  Wifi disconnect policy summary text should not contain "mobile data".
 2011-03-08 13:48:26 -08:00
Amith Yamasani
35bc6b5f15 Wifi disconnect policy summary text should not contain "mobile data". 
Bug: 4026299

Change the summary if it is a wifi-only device.

Change-Id: I433113d9fc430ab06efec81b6934a03dbb17ca1b
 2011-03-08 12:03:13 -08:00
Hung-ying Tyan
b6ad06118a am 0da4ec49: am f8a3a17c: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1 
* commit '0da4ec49813cbad4b27acc7ec56cbfba3a741b76':
  Don't check states when mActiveProfile is present
 2011-03-08 07:55:29 -08:00
Hung-ying Tyan
0da4ec4981 am f8a3a17c: Merge "Don\'t check states when mActiveProfile is present" into honeycomb-mr1 
* commit 'f8a3a17c1e8cb71342b63cc08388883dedeb3180':
  Don't check states when mActiveProfile is present
 2011-03-08 07:38:55 -08:00
Hung-ying Tyan
f8a3a17c1e Merge "Don't check states when mActiveProfile is present" into honeycomb-mr1 2011-03-08 07:24:13 -08:00
Daisuke Miyakawa
6eb9979910 Use consistent indent 
Not all indents but just relevant ones are fixed.

Change-Id: I042f3f70b4ede1e4cc90136b99005d4c4d455de9
 2011-03-07 19:26:06 -08:00
Daisuke Miyakawa
0c0249b0ea Merge "Handle "scanning" status correctly" 2011-03-07 19:21:22 -08:00
Daisuke Miyakawa
f82efaedce Fix layout for wifi setup xl 
- use 56dip instead of 48dip for TableRow's height
- enclose some Views to accomodate them well
  in TableRow
- use center_vertical instead of bottom to show
  TextView. Bottom texts looks weird with wider height.

Change-Id: I9c544cb4f2532e8ceb84a746fc22223ca1dce58c
 2011-03-07 17:58:01 -08:00
Daisuke Miyakawa
6a7b3d9949 Handle "scanning" status correctly 
Bug: 4026282
Change-Id: I7dc113122a8611095642e1a70334d7cdc165173f
 2011-03-07 16:29:50 -08:00
Daisuke Miyakawa
4eb13d06b6 Merge "Show "disconnected" progress bar on add network flow" 2011-03-07 16:07:43 -08:00
Daisuke Miyakawa
ffce5dabbb Show "disconnected" progress bar on add network flow 
Change-Id: I4dc2df9016f21f655a13c244b744020de4a12d0b
 2011-03-07 16:07:02 -08:00
Eric Fischer
f3b5a4620a am bada0585: (-s ours) am 0e1acd4d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'bada05855b26e9e9309460d22e2a48177ecaacd9':
  Import revised translations.  DO NOT MERGE
 2011-03-07 13:24:39 -08:00
Eric Fischer
bada05855b am 0e1acd4d: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '0e1acd4d19f3809acc446b761b74d12f2a88ecfc':
  Import revised translations.  DO NOT MERGE
 2011-03-07 13:11:50 -08:00
Eric Fischer
0e1acd4d19 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-07 13:06:48 -08:00
Eric Fischer
bf896b047d Import revised translations. DO NOT MERGE 
Change-Id: If88ebfce5d7dae236a41644ed9a09b85d1b17157
 2011-03-07 12:57:11 -08:00
Vasu Nori
da407be453 am 4943af9f: am 71dee16b: Merge "bug:3514023 fix strings" into honeycomb-mr1 
* commit '4943af9f71f0dc273c05de0d67dc23495748c5c1':
  bug:3514023 fix strings
 2011-03-07 11:49:53 -08:00
Vasu Nori
4943af9f71 am 71dee16b: Merge "bug:3514023 fix strings" into honeycomb-mr1 
* commit '71dee16bc9683d1dd768c852e12911c72e471544':
  bug:3514023 fix strings
 2011-03-07 11:46:45 -08:00
Vasu Nori
71dee16bc9 Merge "bug:3514023 fix strings" into honeycomb-mr1 2011-03-07 11:45:09 -08:00
Vasu Nori
e875c73505 bug:3514023 fix strings 
Change-Id: I3662b4eeaa4da9df9d007e3e0ad4a3dd59e429c0
 2011-03-07 11:14:27 -08:00
Hung-ying Tyan
68bcab8532 Don't check states when mActiveProfile is present 
and is in IDLE state. checkVpnConnectionStatus() will clean up mActiveProfile
if it's IDLE.

Bug: 3513962
Change-Id: I8289fa321fdbd46def9c8207cef79cb45509897a
 2011-03-06 01:53:45 +08:00
Dianne Hackborn
d4a39fce6b am b26cca37: am 3f1d3919: Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1 
* commit 'b26cca371c5040ec33b3e3de11914ca9fbc7b933':
  Cherry-pick from master:  Fix issue #3324032:
 2011-03-04 18:32:59 -08:00
Dianne Hackborn
b26cca371c am 3f1d3919: Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1 
* commit '3f1d39193ed6bb0a7553555ac0ebeafed75f03af':
  Cherry-pick from master:  Fix issue #3324032:
 2011-03-04 18:30:45 -08:00
Dianne Hackborn
3f1d39193e Merge "Cherry-pick from master: Fix issue #3324032:" into honeycomb-mr1 2011-03-04 18:28:48 -08:00
Dianne Hackborn
e2e7cf650d Cherry-pick from master: Fix issue #3324032: 
(I forgot to commit this before the MR2 branch was made.)

It is possible to create an app that cannot...
...be uninstalled using device policy managers

Don't allow app switches while we are bringing up the confirmation
dialog.  This prevents the app from pushing us out of the intended
settings app flow.

Change-Id: Id670e231ac47346478d22a3f59bb4a44a68ef7b2
 2011-03-04 17:34:13 -08:00
Dianne Hackborn
6bb14c7be7 Merge "Add font size preference." 2011-03-04 17:33:19 -08:00
Dianne Hackborn
6677e56f45 Add font size preference. 
Shamelessly stolen from SpareParts.

Change-Id: I5bcdc5c738a0b2af7e7bd8dae303997c28298086
 2011-03-04 17:30:54 -08:00
Dianne Hackborn
975ba224b7 Merge "Fix issue #3324032: It is possible to create an app that cannot..." 2011-03-04 17:30:28 -08:00
Jaikumar Ganesh
1bd39f4b30 am 18de874e: am 6ff81797: Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1 
* commit '18de874e9d4d5cf4df0467687e683704399d7689':
  Settings app: Run Bluetooth Event receiver when not in fg.
 2011-03-04 17:14:55 -08:00
Ed Heyl
7054dc4c03 am 45170dd6: Merge "resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp" into honeycomb-plus-aosp 
* commit '45170dd6bbc2106a837a6f39a6bf6455ea36d9cf':
  Support configuring the protocol in APN settings.
 2011-03-04 17:11:18 -08:00
Daisuke Miyakawa
0357663fc3 Merge "Fix padding problem around progress bar" 2011-03-04 17:04:20 -08:00
Jaikumar Ganesh
18de874e9d am 6ff81797: Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1 
* commit '6ff8179731043b04a2c5020ca964563c9510b697':
  Settings app: Run Bluetooth Event receiver when not in fg.
 2011-03-04 16:45:39 -08:00
Jaikumar Ganesh
6ff8179731 Merge "Settings app: Run Bluetooth Event receiver when not in fg." into honeycomb-mr1 2011-03-04 15:09:12 -08:00
Ed Heyl
45170dd6bb Merge "resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp" into honeycomb-plus-aosp 2011-03-04 15:07:23 -08:00
Jaikumar Ganesh
6eb84ac6de Settings app: Run Bluetooth Event receiver when not in fg. 
Also fix connection indication issues.
Fixes bugs 3510336 and 3513352

Change-Id: Iaa47c9d7fd04fa5dd2700f55993ba2fd1a78fd70
 2011-03-04 14:53:44 -08:00
Lorenzo Colitti
67c70267d1 resolved conflicts for merge of a4fb8c86 to honeycomb-plus-aosp 
Change-Id: I8edb2e7f07f793e78c15bcf9b2f048d91b1f6504
 2011-03-04 14:49:40 -08:00
Eric Fischer
87489c9626 am c0906230: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'c0906230013ec3788f0013f8b53f9732f866ff69':
  Import revised translations.  DO NOT MERGE
 2011-03-04 14:01:21 -08:00
Eric Fischer
c090623001 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-04 13:53:51 -08:00
Eric Fischer
bc2f61b2e3 Import revised translations. DO NOT MERGE 
Change-Id: I76e25be51258b5f5f7ea1b919b1280c326741953
 2011-03-04 13:47:23 -08:00
Daisuke Miyakawa
f26b2b5110 Fix padding problem around progress bar 
Change-Id: I3f76b4f01ed433e68a839f02c2c1840c60749ef1
 2011-03-04 13:08:44 -08:00
Daisuke Miyakawa
daeafc37ef am e0db1773: am 3a695a12: (-s ours) Not receive tick event in datetime setup 
* commit 'e0db17733499a8922fcd742343d7d6210be04d55':
  Not receive tick event in datetime setup
 2011-03-04 11:42:17 -08:00
Jaikumar Ganesh
1645c832ce am 04bebd98: Merge "Fix settings app not showing correct profile connection state message." into honeycomb-mr1 
* commit '04bebd980008d7bd48c07612629382cb376593f3':
  Fix settings app not showing correct profile connection state message.
 2011-03-04 11:38:53 -08:00
Daisuke Miyakawa
834f4363cf am d85ce3c9: Put SSID field first. 
* commit 'd85ce3c9eacdf3a0b201a7756e8b423f32328584':
  Put SSID field first.
 2011-03-04 11:37:55 -08:00
Daisuke Miyakawa
e0db177334 am 3a695a12: (-s ours) Not receive tick event in datetime setup 
* commit '3a695a124e5c64b1f7485e525c16f343aa22e7f0':
  Not receive tick event in datetime setup
 2011-03-04 11:17:19 -08:00
Jaikumar Ganesh
04bebd9800 Merge "Fix settings app not showing correct profile connection state message." into honeycomb-mr1 2011-03-04 11:06:39 -08:00
Jaikumar Ganesh
50e0b0cf87 Fix settings app not showing correct profile connection state message. 
Bug:3385085
Change-Id: Ie4b7eb6bc9d8c91264cf7f68d7830c110e34496d
 2011-03-04 10:27:31 -08:00
Eric Fischer
89a2fc69f8 am e39213e2: Merge changes I33bf228d,I18d2329e into honeycomb-mr1 
* commit 'e39213e2253adfc621c3d7ed1a2ffdd8e1702c10':
  Remove unneeded large-screen-specific translations.
  Mark placeholders in format strings as placeholders.
 2011-03-04 01:00:11 -08:00
Irfan Sheriff
6eb360de99 am 5640ccff: Avoid dialog dismiss until IP and proxy is valid 
* commit '5640ccff74e90669cea7b82d1f9db2653f070ebe':
  Avoid dialog dismiss until IP and proxy is valid
 2011-03-04 01:00:10 -08:00
Irfan Sheriff
55e790d56c am 216a58c8: (-s ours) Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1 
* commit '216a58c882917926ccf450ae180c552d0de36a2b':
  DO NOT MERGE Proxy and IP fixes
 2011-03-04 01:00:06 -08:00
Daisuke Miyakawa
d85ce3c9ea Put SSID field first. 
Bug: 3508455
Change-Id: I1626562d235947cd662a3eb9579f93b6ebc6ab56
 2011-03-03 20:08:09 -08:00