PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
3,828 Commits 1 Branch 0 Tags
783be0a24f328d7e781b5765b7688c55fb24c89c
Commit Graph

3828 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Eric Fischer
b81a56c79b am 436e1d2e: (-s ours) Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit '436e1d2e919b9170a1cd5bb15a9bea6b2d209e0f':
  Import revised translations.  DO NOT MERGE
 2011-03-03 18:22:21 -08:00
Svetoslav Ganov
8802b5c67f am c82b60dc: Updated the strings for configuring long press timeout. 
* commit 'c82b60dcc766d4c189838f77c351b066c25c5f89':
  Updated the strings for configuring long press timeout.
 2011-03-03 17:25:02 -08:00
Lorenzo Colitti
a4fb8c8684 am f4393101: Merge "Support configuring the protocol in APN settings." into gingerbread 
* commit 'f4393101f80f0ca1a10771613a18565323b69fa2':
  Support configuring the protocol in APN settings.
 2011-03-03 17:07:39 -08:00
Lorenzo Colitti
f4393101f8 Merge "Support configuring the protocol in APN settings." into gingerbread 2011-03-03 17:03:45 -08:00
Daisuke Miyakawa
3a695a124e Not receive tick event in datetime setup 
DO NOT MERGE

Bug: 3510551
Change-Id: If3d7175fe90b8927099e804fa5fbb37c207fd529
 2011-03-03 16:35:22 -08:00
Eric Fischer
e39213e225 Merge changes I33bf228d,I18d2329e into honeycomb-mr1 
* changes:
  Remove unneeded large-screen-specific translations.
  Mark placeholders in format strings as placeholders.
 2011-03-03 16:20:18 -08:00
Eric Fischer
a52f9d5666 Remove unneeded large-screen-specific translations. 
Change-Id: I33bf228dfa58959db343da5d41be000a2ef58ab0
 2011-03-03 15:50:37 -08:00
Eric Fischer
43d495987d Mark placeholders in format strings as placeholders. 
Bug: 3422176

Change-Id: I18d2329e72fa9a521c2349fea638e4435f737ca7
 2011-03-03 15:17:05 -08:00
Irfan Sheriff
5640ccff74 Avoid dialog dismiss until IP and proxy is valid 
Accepting an invalid configuration can lead to
unexpected behavior.

Validate all fields before dismissing dialog. A further
improvement to this can be highlighting the faulty field
to the user by a color change.

Bug: 3462049
Change-Id: I0d0a6eae1d62b16fbb822261c4536c4108a5866d
 2011-03-03 15:04:23 -08:00
Irfan Sheriff
216a58c882 Merge "DO NOT MERGE Proxy and IP fixes" into honeycomb-mr1 2011-03-03 15:02:05 -08:00
Irfan Sheriff
00615cf5dc DO NOT MERGE Proxy and IP fixes 
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields

Change-Id: I5b556a07c2a5b69ecec959c933f2872e70496946
 2011-03-03 15:01:07 -08:00
Irfan Sheriff
5d31868735 Proxy and IP fixes 
Fix dual display of IP addresses for static IP
Fix inputType for proxy and IP fields
Add hint texts for IP fields

Change-Id: I478c915b245592d4738c7d7da2ca1485a247ed39
 2011-03-03 14:32:47 -08:00
Eric Fischer
436e1d2e91 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-03 14:24:34 -08:00
Eric Fischer
e4c392be0e Import revised translations. DO NOT MERGE 
Change-Id: I4806cd78bd5fab24445c12755ef47e982dc2b3f2
 2011-03-03 14:10:34 -08:00
Svetoslav Ganov
c82b60dcc7 Updated the strings for configuring long press timeout. 
Change-Id: I1a4b2e05bf63933861198b8bcf7a34d0f4f6b1fd
 2011-03-03 13:21:20 -08:00
Daisuke Miyakawa
89abc19eb0 am d61737b5: (-s ours) am 96f05f90: (-s ours) fix datetime setup problem. DO NOT MERGE 
* commit 'd61737b560706ce928ebae16613eb2ee45a78b08':
  fix datetime setup problem. DO NOT MERGE
 2011-03-03 08:58:03 -08:00
Daisuke Miyakawa
d61737b560 am 96f05f90: (-s ours) fix datetime setup problem. DO NOT MERGE 
* commit '96f05f909e19a4fe7cee8f961344ef13a882e7e3':
  fix datetime setup problem. DO NOT MERGE
 2011-03-03 08:31:30 -08:00
Dianne Hackborn
4f25e1d5e3 Fix issue #3324032: 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: Iea1ff64c054452d307f91f349a815c0b244e9af5
 2011-03-02 22:39:49 -08:00
Eric Fischer
98aec796ca am 39f443ce: (-s ours) am 0d9e74d4: Import revised translations. DO NOT MERGE 
* commit '39f443ce265a8a4e9565662aea341bbb74c4f4a1':
  Import revised translations.  DO NOT MERGE
 2011-03-02 22:16:43 -08:00
Amith Yamasani
fb6f306a2b am 665fc6aa: am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb 
* commit '665fc6aadd07b831dcb72d1e04199fd26b6049b6':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.
 2011-03-02 22:16:41 -08:00
Mike Lockwood
1de75d44ac am 71dcf4d2: (-s ours) am 9d768735: (-s ours) am 0552d336: DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings 
* commit '71dcf4d2c4de4cb38d287301a7bdca1643a7156d':
  DO NOT MERGE: InstalledAppDetails: "Clear defaults" button now clears USB service settings
 2011-03-02 22:11:01 -08:00
Amith Yamasani
e1e1e61d23 Merge "Fix the string for empty dictionary on the tablet." 2011-03-02 22:09:38 -08:00
Daisuke Miyakawa
96f05f909e fix datetime setup problem. DO NOT MERGE 
- remove bat if clause for xl
- use HOUR_OF_DAY instead of HOUR

Bug: 3487947
Change-Id: I532bdb72f62ecbc776411496dd96e72d9c16b997
 2011-03-02 20:08:48 -08:00
Svetoslav Ganov
dded90c67e Merge "Adding system wide long press timeout configurability under accessibility." 2011-03-02 19:17:30 -08:00
Amith Yamasani
26797fefdc Fix the string for empty dictionary on the tablet. 
Bug: 3335775
Change-Id: Iee7fbf6a25d61c761ea4cb125454c08a579b5a7e
 2011-03-02 19:03:01 -08:00
Daisuke Miyakawa
027d610205 Merge "Notify "skip to caller." 2011-03-02 18:25:53 -08:00
Eric Fischer
39f443ce26 am 0d9e74d4: Import revised translations. DO NOT MERGE 
* commit '0d9e74d4d28585c920c16a350d301afb7004187b':
  Import revised translations.  DO NOT MERGE
 2011-03-02 18:25:46 -08:00
Amith Yamasani
665fc6aadd am b7e393bf: Merge "Bring back Wi-Fi sleep policy setting for wifi-only devices." into honeycomb 
* commit 'b7e393bf9b0327833098d2181b0e7125af2181dc':
  Bring back Wi-Fi sleep policy setting for wifi-only devices.
 2011-03-02 18:25:11 -08:00
Daisuke Miyakawa
e0d9ed4a31 Merge "fix datetime setup problem" 2011-03-02 18:13:46 -08:00