Commit Graph

138018 Commits

Author SHA1 Message Date
Mike Lockwood
22dbcdc8f8 am cfb4089b: Merge change 22611 into eclair
Merge commit 'cfb4089b372ee6be1c803a7deae56b464dc5d004'

* commit 'cfb4089b372ee6be1c803a7deae56b464dc5d004':
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
2009-08-25 11:58:53 -07:00
Android (Google) Code Review
cfb4089b37 Merge change 22611 into eclair
* changes:
  Hide the "Enable Assisted GPS" checkbox in security & location settings.
2009-08-25 11:55:20 -07:00
Mike Lockwood
7f894124f4 Hide the "Enable Assisted GPS" checkbox in security & location settings.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-25 11:34:56 -07:00
Amith Yamasani
cfdf010d4f am e13209ab: Remember dialog state for notification volume.
Merge commit 'e13209ab423932a739b66eac7d8bd4abd6e52287'

* commit 'e13209ab423932a739b66eac7d8bd4abd6e52287':
  Remember dialog state for notification volume.
2009-08-25 10:26:21 -07:00
Amith Yamasani
e13209ab42 Remember dialog state for notification volume.
Restore the original volume if user hasn't okayed the new volume.
2009-08-24 17:55:56 -07:00
Amith Yamasani
b68d94db25 am a0dc346f: Remove summaries from top-level of settings.
Merge commit 'a0dc346f4c5511a92ba19333df0a8c576946992e'

* commit 'a0dc346f4c5511a92ba19333df0a8c576946992e':
  Remove summaries from top-level of settings.
2009-08-24 15:32:28 -07:00
Joe LaPenna
626b4a191a Fix grammar in unknown sources dialog. issue 1938 2009-08-24 13:59:02 -07:00
Amith Yamasani
a0dc346f4c Remove summaries from top-level of settings. 2009-08-24 12:52:42 -07:00
Jaikumar Ganesh
c1d5695732 am 24408015: Merge change 22303 into eclair
Merge commit '244080159b0ddb66906cbfcdc2b782c4f55108d7'

* commit '244080159b0ddb66906cbfcdc2b782c4f55108d7':
  Show error messages when Authentication fails.
2009-08-24 10:57:48 -07:00
Android (Google) Code Review
244080159b Merge change 22303 into eclair
* changes:
  Show error messages when Authentication fails.
2009-08-24 10:53:27 -07:00
Chung-yih Wang
26114eb290 am a97d7948: Support WPA2-EAP configuration.
Merge commit 'a97d7948258d46b3cd683fa48ef5c2ae444ce4d8'

* commit 'a97d7948258d46b3cd683fa48ef5c2ae444ce4d8':
  Support WPA2-EAP configuration.
2009-08-23 23:37:47 -07:00
Chung-yih Wang
a97d794825 Support WPA2-EAP configuration.
Add the support for configuring WPA2-EAP APs by grouping them as the WPA-EAP in security mode.
2009-08-24 10:32:13 +08:00
Charles Chen
ad68028e76 am ad149f7e: Merge change 22339 into eclair
Merge commit 'ad149f7e8c9ee8958f5940564f772997125ff084'

* commit 'ad149f7e8c9ee8958f5940564f772997125ff084':
  Fixing bug 2064923.
2009-08-21 15:27:25 -07:00
Android (Google) Code Review
ad149f7e8c Merge change 22339 into eclair
* changes:
  Fixing bug 2064923. This is a fix to make sure that the accessibility manager does not start any of the accessibility services when it is disabled.
2009-08-21 15:22:51 -07:00
Charles Chen
d218df2787 Fixing bug 2064923.
This is a fix to make sure that the accessibility manager does not start
any of the accessibility services when it is disabled.
2009-08-21 15:14:25 -07:00
Eric Fischer
58db3ee507 am 57d72f2c: Merge change 22324 into eclair
Merge commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7'

* commit '57d72f2c5d3de1eff9c11b43c30af796ebc008d7':
  Cap the length of dictionary words to keep TextView from exploding.
2009-08-21 14:21:41 -07:00
Android (Google) Code Review
57d72f2c5d Merge change 22324 into eclair
* changes:
  Cap the length of dictionary words to keep TextView from exploding.
2009-08-21 14:17:53 -07:00
Jaikumar Ganesh
cb6a3b3d9e Show error messages when Authentication fails.
Call Canceled when user presses "Don't Pair".
Thus for Authentication Failed cases we can show the message to the
user.
2009-08-21 11:55:29 -07:00
Suchi Amalapurapu
955d6dee09 am 02c5fabc: Merge change 22064 into eclair
Merge commit '02c5fabcfd9e1c258b2cdef7a851cadea85f2869'

* commit '02c5fabcfd9e1c258b2cdef7a851cadea85f2869':
  Add type to filter option to list view
2009-08-21 11:52:35 -07:00
Android (Google) Code Review
02c5fabcfd Merge change 22064 into eclair
* changes:
  Add type to filter option to list view Make ListAdapter implement Filterable. Add new implementation for Filter to search based on prefixes. When creating the list include the filter option to create actual list entries. Since Filter.performFiltering is done on a work thread, introduce a new lock and a HashMap of packages matching a prefix which is then used to create a filtered list of applications. Also separte out modifying mAppLocalList which is the basis for list and the dependent mFilterMap used by Filter.performFiltering method to Locked methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
2009-08-21 11:48:50 -07:00
Suchi Amalapurapu
c0b23d3f0b Add type to filter option to list view
Make ListAdapter implement Filterable. Add new implementation for Filter
to search based on prefixes.
When creating the list include the filter option to create actual list entries.
Since Filter.performFiltering is done on a work thread, introduce a new lock
and a HashMap of packages matching a prefix which is then used to create a filtered list of applications.
Also separte out modifying mAppLocalList which is the basis for list and
the dependent mFilterMap used by Filter.performFiltering method to Locked
methods for clarity. Note that mAppLocalList is manipulated on main UI thread everywhere but mFilterMap is not.
2009-08-21 11:47:57 -07:00
Eric Fischer
c27b12c9dc Cap the length of dictionary words to keep TextView from exploding.
Bug 1994172
2009-08-21 11:17:46 -07:00
Eric Fischer
ec63d2d801 am acae2c21: (-s ours) am 64b691a8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'acae2c214279aa2d2d26f847ed3b122c5774ed72'

* commit 'acae2c214279aa2d2d26f847ed3b122c5774ed72':
  Import revised translations.  DO NOT MERGE
2009-08-20 16:04:53 -07:00
Eric Fischer
acae2c2142 am 64b691a8: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '64b691a8abb2bbb2952cb44a7dc04f153d717bc3' into eclair

* commit '64b691a8abb2bbb2952cb44a7dc04f153d717bc3':
  Import revised translations.  DO NOT MERGE
2009-08-20 16:00:51 -07:00
Jaikumar Ganesh
34c27e71c8 am 91827213: Merge change 22130 into eclair
Merge commit '9182721336cd5f070aa2b5cf971193c7887c81d6'

* commit '9182721336cd5f070aa2b5cf971193c7887c81d6':
  Call the correct function for canceling a pairing request.
2009-08-20 15:14:45 -07:00
Android (Google) Code Review
9182721336 Merge change 22130 into eclair
* changes:
  Call the correct function for canceling a pairing request.
2009-08-20 15:10:49 -07:00
Jaikumar Ganesh
8c08bcd2ab Call the correct function for canceling a pairing request. 2009-08-20 15:02:41 -07:00
Eric Fischer
64b691a8ab Import revised translations. DO NOT MERGE 2009-08-20 14:08:19 -07:00
Yue Lixin
037c1f7290 am a41e2f94: Implement Bluetooth device picker
Merge commit 'a41e2f94b792e44872be87f40fce182e6b39f4ba'

* commit 'a41e2f94b792e44872be87f40fce182e6b39f4ba':
  Implement Bluetooth device picker
2009-08-19 21:04:53 -07:00
Yue Lixin
a41e2f94b7 Implement Bluetooth device picker
Add Bluetooth device picker in Settings
- add resource to support device picker
- show different UI accroding to start Intent
- add OPP profile manager
2009-08-19 20:45:18 -07:00
Jaikumar Ganesh
a7f08942a8 am 3b94f097: Merge change 21929 into eclair
Merge commit '3b94f097567ac7a95e9cb180cc63771a5bc08289'

* commit '3b94f097567ac7a95e9cb180cc63771a5bc08289':
  Fix device address check when profile state changes.
2009-08-19 12:36:15 -07:00
Android (Google) Code Review
3b94f09756 Merge change 21929 into eclair
* changes:
  Fix device address check when profile state changes.
2009-08-19 12:32:09 -07:00
Amith Yamasani
74d9c353ed am 3bbb03ff: New settings top-level icons.
Merge commit '3bbb03ffbb6abc3252a5b32a04d2752e49cc1706'

* commit '3bbb03ffbb6abc3252a5b32a04d2752e49cc1706':
  New settings top-level icons.
2009-08-19 12:27:49 -07:00
Jaikumar Ganesh
53121cf110 Fix device address check when profile state changes. 2009-08-19 12:25:37 -07:00
jsh
d6e519377f am f78227df: Merge change 21838 into eclair
Merge commit 'f78227df417eb8ec43c80923a39fba5c50bfe768'

* commit 'f78227df417eb8ec43c80923a39fba5c50bfe768':
  Fix RadioInfo for CDMA.
2009-08-19 12:17:32 -07:00
Amith Yamasani
3bbb03ffbb New settings top-level icons. 2009-08-19 12:13:57 -07:00
Android (Google) Code Review
f78227df41 Merge change 21838 into eclair
* changes:
  Fix RadioInfo for CDMA.
2009-08-19 12:12:49 -07:00
Suchi Amalapurapu
59fd26a145 am 2c9b21f0: am d2136f7e: Create a shared preference setting and use it before loading/unloading cache and disable cache if file operations failed in the last launch. A simple if check when reading buffer size from file
Merge commit '2c9b21f048303469f040f30ec386e9ba25930ee9'

* commit '2c9b21f048303469f040f30ec386e9ba25930ee9':
  Create a shared preference setting and use it before loading/unloading cache
2009-08-18 19:56:20 -07:00
Suchi Amalapurapu
2c9b21f048 am d2136f7e: Create a shared preference setting and use it before loading/unloading cache and disable cache if file operations failed in the last launch. A simple if check when reading buffer size from file
Merge commit 'd2136f7e5da6d36a685f5bed2727f0abdafb70bf' into eclair

* commit 'd2136f7e5da6d36a685f5bed2727f0abdafb70bf':
  Create a shared preference setting and use it before loading/unloading cache
2009-08-18 19:51:39 -07:00
Suchi Amalapurapu
d2136f7e5d Create a shared preference setting and use it before loading/unloading cache
and disable cache if file operations failed in the last launch.
A simple if check when reading buffer size from file
2009-08-18 19:32:06 -07:00
jsh
87fa11b90e Fix RadioInfo for CDMA. 2009-08-18 18:00:15 -07:00
Eric Fischer
85a4469706 am 1858ccd8: (-s ours) am aafb491d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '1858ccd8044f713ce540ee1d457d51fb9cb6ea54'

* commit '1858ccd8044f713ce540ee1d457d51fb9cb6ea54':
  Import revised translations.  DO NOT MERGE
2009-08-18 13:14:46 -07:00
Doug Zongker
6008f2d2ad am 2818107d: (-s ours) am 36efef1d: cut number of frames in lock screen demo animation from 15 to 8
Merge commit '2818107dcc5c7e6ddf152448de8836ce01d3e1ad'

* commit '2818107dcc5c7e6ddf152448de8836ce01d3e1ad':
  cut number of frames in lock screen demo animation from 15 to 8
2009-08-18 13:14:45 -07:00
Eric Fischer
1858ccd804 am aafb491d: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'aafb491d35e2512c504356bc441ae48b48a9f5db' into eclair

* commit 'aafb491d35e2512c504356bc441ae48b48a9f5db':
  Import revised translations.  DO NOT MERGE
2009-08-18 13:11:27 -07:00
Doug Zongker
2818107dcc am 36efef1d: cut number of frames in lock screen demo animation from 15 to 8
Merge commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f' into eclair

* commit '36efef1d7122aab2cc1172e7b7fe4d79ac98a41f':
  cut number of frames in lock screen demo animation from 15 to 8
2009-08-18 13:11:16 -07:00
Eric Fischer
15ac15dd44 am f509814f: (-s ours) am da99054a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'f509814f6577754243edae217c5b6d51978300e9'

* commit 'f509814f6577754243edae217c5b6d51978300e9':
  Import revised translations.  DO NOT MERGE
2009-08-18 12:09:03 -07:00
Eric Fischer
aafb491d35 Import revised translations. DO NOT MERGE 2009-08-18 11:19:42 -07:00
Eric Fischer
f509814f65 am da99054a: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'da99054ace677782c02cfd3e8cf3461ce15d61c1' into eclair

* commit 'da99054ace677782c02cfd3e8cf3461ce15d61c1':
  Import revised translations.  DO NOT MERGE
2009-08-18 11:00:58 -07:00
Jared Suttles
dbc9ce45db am 5807c646: Allow optional nested parenthesis in the kernel compiler version string.
Merge commit '5807c64631b0716390bcef08320e8b4865a4246d'

* commit '5807c64631b0716390bcef08320e8b4865a4246d':
  Allow optional nested parenthesis in the kernel compiler version string.
2009-08-18 10:50:11 -07:00
Jared Suttles
5807c64631 Allow optional nested parenthesis in the kernel compiler version string.
This fixes parsing of the kernel version string in so that groups
3 and 4 can be shown in About phone.

Submitted on behalf of Patrick Auchter <patrick.auchter@motorola.com>
Signed-off-by: Jared Suttles <jared.suttles@motorola.com>
2009-08-18 10:26:00 -07:00