Commit Graph

20174 Commits

Author SHA1 Message Date
Eric Fischer
dbaa28c8af am b459a335: am 18517f50: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'b459a335459cd2be551d51b5650868424948f367' into eclair-mr2-plus-aosp

* commit 'b459a335459cd2be551d51b5650868424948f367':
  Import revised translations.  DO NOT MERGE
2009-11-16 20:03:49 -08:00
Eric Fischer
b459a33545 am 18517f50: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-mr2

* commit '18517f50edcfebf41b61965b24e360858db1c5e4':
  Import revised translations.  DO NOT MERGE
2009-11-16 19:53:51 -08:00
Oscar Montemayor
8877f74901 Encrypted File Systems Project. Enabling Settings menu changes to transition to EFS mode.
Menu interface changes only. Does not affect operatio forthe rest of the system.
2009-11-16 17:18:58 -08:00
Eric Fischer
1262cd8897 am 18517f50: Import revised translations. DO NOT MERGE
Merge commit '18517f50edcfebf41b61965b24e360858db1c5e4' into eclair-plus-aosp

* commit '18517f50edcfebf41b61965b24e360858db1c5e4':
  Import revised translations.  DO NOT MERGE
2009-11-16 16:55:31 -08:00
Eric Fischer
18517f50ed Import revised translations. DO NOT MERGE 2009-11-16 16:45:29 -08:00
Charles Chen
05b08a50f8 Adding a prompt to help users download Talkback
(Google's open source screen reader) if they go
to the Accessibility settings screen and do not
have any accessibility tools installed.

This is a fix for bug #2250279
2009-11-16 15:28:31 -08:00
Jean-Baptiste Queru
51004fbf7f am bd0131f2: merge from open-source master
Merge commit 'bd0131f2207080d95ea3ea493f228085024e9369'

* commit 'bd0131f2207080d95ea3ea493f228085024e9369':
  eclair snapshot
2009-11-15 15:08:24 -08:00
Jean-Baptiste Queru
bd0131f220 merge from open-source master 2009-11-15 14:55:26 -08:00
Jean-Baptiste Queru
7ed2ec359b merge from open-source master
Merge commit 'goog/stage-korg-master' into HEAD
2009-11-15 14:06:44 -08:00
Jean-Baptiste Queru
ab34317c20 merge from eclair 2009-11-15 12:06:54 -08:00
Eric Fischer
c7f17be2a8 am ac54a6fd: (-s ours) am 7cd65f3d: am 83e718f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'ac54a6fd6c26871e770bce62bb1efd7a37001984'

* commit 'ac54a6fd6c26871e770bce62bb1efd7a37001984':
  Import revised translations.  DO NOT MERGE
2009-11-13 18:04:05 -08:00
Eric Fischer
ac54a6fd6c am 7cd65f3d: am 83e718f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '7cd65f3dace45576823d9cb0600a1b1286d9af91' into eclair-mr2-plus-aosp

* commit '7cd65f3dace45576823d9cb0600a1b1286d9af91':
  Import revised translations.  DO NOT MERGE
2009-11-13 18:00:11 -08:00
Eric Fischer
32ee72d197 am 83e718f9: Import revised translations. DO NOT MERGE
Merge commit '83e718f92710c766ef341fdde769b2efc489bef9' into eclair-plus-aosp

* commit '83e718f92710c766ef341fdde769b2efc489bef9':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:55:46 -08:00
Eric Fischer
7cd65f3dac am 83e718f9: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '83e718f92710c766ef341fdde769b2efc489bef9' into eclair-mr2

* commit '83e718f92710c766ef341fdde769b2efc489bef9':
  Import revised translations.  DO NOT MERGE
2009-11-13 17:55:36 -08:00
Eric Fischer
83e718f927 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-13 17:24:10 -08:00
Eric Fischer
c38c8df153 am c8fe4e8e: (-s ours) am 92b93495: am 48c451b3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit 'c8fe4e8ee3646d8320886e62e254b0d2822f70d6'

* commit 'c8fe4e8ee3646d8320886e62e254b0d2822f70d6':
  Import revised translations.  DO NOT MERGE
2009-11-13 11:33:06 -08:00
Eric Fischer
c8fe4e8ee3 am 92b93495: am 48c451b3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '92b93495c01e950e04275113c8936dbdb0d38f56' into eclair-mr2-plus-aosp

* commit '92b93495c01e950e04275113c8936dbdb0d38f56':
  Import revised translations.  DO NOT MERGE
2009-11-13 11:10:31 -08:00
Eric Fischer
92b93495c0 am 48c451b3: (-s ours) Import revised translations. DO NOT MERGE
Merge commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-mr2

* commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:42:40 -08:00
Eric Fischer
3ee742fc6b am 48c451b3: Import revised translations. DO NOT MERGE
Merge commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5' into eclair-plus-aosp

* commit '48c451b38824e96b85ab9f5bac8724b07bd2c9e5':
  Import revised translations.  DO NOT MERGE
2009-11-13 10:40:48 -08:00
Eric Fischer
48c451b388 Import revised translations. DO NOT MERGE
Approver: jerryw
2009-11-12 19:50:45 -08:00
Jean-Baptiste Queru
6310fa9ae4 eclair snapshot 2009-11-12 18:46:12 -08:00
Amith Yamasani
de6b50c9ff am e52386b4: am eba00ec7: am a79239b1: Merge change I2d844842 into eclair
Merge commit 'e52386b496e9255010105d595fc9ccc25f5ebeea'

* commit 'e52386b496e9255010105d595fc9ccc25f5ebeea':
  Fix for NPE in #2248683
2009-11-11 19:26:26 -08:00
Jason Chen
66bd5a0e07 am e40d8434: am 554cd5ec: am 6b23b270: Fix misspellings in the Settings app.
Merge commit 'e40d84343c61d1c5359e1d222ec38af850991ae2'

* commit 'e40d84343c61d1c5359e1d222ec38af850991ae2':
  Fix misspellings in the Settings app.
2009-11-11 19:26:22 -08:00
Amith Yamasani
e52386b496 am eba00ec7: am a79239b1: Merge change I2d844842 into eclair
Merge commit 'eba00ec701f9633a05203116151e94449e55c517' into eclair-mr2-plus-aosp

* commit 'eba00ec701f9633a05203116151e94449e55c517':
  Fix for NPE in #2248683
2009-11-11 19:22:21 -08:00
Jason Chen
e40d84343c am 554cd5ec: am 6b23b270: Fix misspellings in the Settings app.
Merge commit '554cd5eca37a1027bcd3d7cc024471ff1d0b9ac1' into eclair-mr2-plus-aosp

* commit '554cd5eca37a1027bcd3d7cc024471ff1d0b9ac1':
  Fix misspellings in the Settings app.
2009-11-11 19:22:18 -08:00
Amith Yamasani
eba00ec701 am a79239b1: Merge change I2d844842 into eclair
Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-mr2

* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
  Fix for NPE in #2248683
2009-11-11 19:20:33 -08:00
Jason Chen
554cd5eca3 am 6b23b270: Fix misspellings in the Settings app.
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-mr2

* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
  Fix misspellings in the Settings app.
2009-11-11 19:20:30 -08:00
Amith Yamasani
04321bf323 am a79239b1: Merge change I2d844842 into eclair
Merge commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f' into eclair-plus-aosp

* commit 'a79239b102f7b9c83e31be7b3a47ab50459b6a4f':
  Fix for NPE in #2248683
2009-11-11 19:20:22 -08:00
Jason Chen
d1fa931682 am 6b23b270: Fix misspellings in the Settings app.
Merge commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c' into eclair-plus-aosp

* commit '6b23b2700c2c5a2766ec2ab23d83a6e3ba7ab26c':
  Fix misspellings in the Settings app.
2009-11-11 19:20:18 -08:00
Android (Google) Code Review
a79239b102 Merge change I2d844842 into eclair
* changes:
  Fix for NPE in #2248683
2009-11-11 19:15:47 -08:00
Amith Yamasani
f6b384045d Fix for NPE in #2248683
Also fix a problem in type-to-filter. It was looking for substring match
instead of searching on word boundaries. It will now search by word
boundaries (separated by space).
2009-11-11 19:03:09 -08:00
Jason Chen
6b23b2700c Fix misspellings in the Settings app.
Bug: 2176816
2009-11-11 08:39:31 -08:00
Michael Chan
715be7ceb2 am 28a30ec4: am 4fcf94c4: am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '28a30ec4929dbd753f98d42e061fa19386fabda3'

* commit '28a30ec4929dbd753f98d42e061fa19386fabda3':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 15:23:13 -08:00
Daniel Sandler
d8a83b8fc4 am 85c5b614: (-s ours) am c3ace180: am 7ceb387e: (-s ours) Merge change Ib720a080 into eclair
Merge commit '85c5b614d7bcd6f1d45102c11640292cce3d6690'

* commit '85c5b614d7bcd6f1d45102c11640292cce3d6690':
  Updated icons for Settings. DO NOT MERGE
2009-11-10 15:23:10 -08:00
Michael Chan
28a30ec492 am 4fcf94c4: am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '4fcf94c47b5526e1ee64854d7e25bfcac171885b' into eclair-mr2-plus-aosp

* commit '4fcf94c47b5526e1ee64854d7e25bfcac171885b':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 15:10:43 -08:00
Daniel Sandler
85c5b614d7 am c3ace180: am 7ceb387e: (-s ours) Merge change Ib720a080 into eclair
Merge commit 'c3ace180d0853185da19b49e9668324faa9f468e' into eclair-mr2-plus-aosp

* commit 'c3ace180d0853185da19b49e9668324faa9f468e':
  Updated icons for Settings. DO NOT MERGE
2009-11-10 15:10:35 -08:00
Michael Chan
4fcf94c47b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-mr2

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 11:06:36 -08:00
Daniel Sandler
c3ace180d0 am 7ceb387e: (-s ours) Merge change Ib720a080 into eclair
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-mr2

* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
  Updated icons for Settings. DO NOT MERGE
2009-11-10 11:06:27 -08:00
Michael Chan
9cffec1c7b am 5469ff8b: b/2226832 Showing Pairing Dialog in the foreground
Merge commit '5469ff8b3f9966c6f141078b37da5f178b7825e4' into eclair-plus-aosp

* commit '5469ff8b3f9966c6f141078b37da5f178b7825e4':
  b/2226832 Showing Pairing Dialog in the foreground
2009-11-10 11:06:01 -08:00
Daniel Sandler
945ea6dae7 am 7ceb387e: Merge change Ib720a080 into eclair
Merge commit '7ceb387ee601655ba72264646e3d8ecf2d74c138' into eclair-plus-aosp

* commit '7ceb387ee601655ba72264646e3d8ecf2d74c138':
  Updated icons for Settings. DO NOT MERGE
2009-11-10 11:05:58 -08:00
Michael Chan
5469ff8b3f b/2226832 Showing Pairing Dialog in the foreground
Pairing Dialogs notifications (in the window shade) were not visible in full
screen apps e.g. gallery.  Showing Pairing Dialog in the foreground:
1) if the remote device was picked in the device picker in the last minute or
2) if the device was in discoverable mode in the last minute.
2009-11-10 10:37:54 -08:00
Eric Fischer
1db917f9d8 am ac783645: (-s ours) am 60037611: Import revised translations. DO NOT MERGE
Merge commit 'ac7836457a8360154caf43d4be94ea464fc81966'

* commit 'ac7836457a8360154caf43d4be94ea464fc81966':
  Import revised translations.  DO NOT MERGE
2009-11-06 16:27:31 -08:00
Eric Fischer
ac7836457a am 60037611: Import revised translations. DO NOT MERGE
Merge commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9' into eclair-mr2-plus-aosp

* commit '60037611a4f4bd9f2a724f9076abb17f553c6bb9':
  Import revised translations.  DO NOT MERGE
2009-11-06 16:15:55 -08:00
Eric Fischer
60037611a4 Import revised translations. DO NOT MERGE 2009-11-06 15:29:45 -08:00
Michael Chan
bffe6334bd am d7962545: am 51dfd4b0: am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit 'd7962545aadb31b5ac1a9ff93f5a91168bcae5c6'

* commit 'd7962545aadb31b5ac1a9ff93f5a91168bcae5c6':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:47:05 -08:00
Android (Google) Code Review
7ceb387ee6 Merge change Ib720a080 into eclair
* changes:
  Updated icons for Settings. DO NOT MERGE
2009-11-06 16:44:30 -05:00
Michael Chan
d7962545aa am 51dfd4b0: am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d' into eclair-mr2-plus-aosp

* commit '51dfd4b03563fd5b6fa87a7123d8bf0a9a7ce89d':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:38:15 -08:00
Michael Chan
51dfd4b035 am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-mr2

* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:32:53 -08:00
Michael Chan
830ab02954 am 834e5993: b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Merge commit '834e5993e4f2f34d5aceb3196601b30231d00b07' into eclair-plus-aosp

* commit '834e5993e4f2f34d5aceb3196601b30231d00b07':
  b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
2009-11-06 13:32:42 -08:00
Michael Chan
834e5993e4 b/2234854 Fixed Bluetooth API return codes for requesting permission to enable bluetooth
Also added test app.
2009-11-05 18:32:09 -08:00