Michael Chan
684736a9d4
b/2090193 Prevent Bluetooth Pairing Request Dialog from showing in "Recent Apps"
2009-09-01 19:06:36 -07:00
Jean-Michel Trivi
f553f49b88
am 7865507c
: am ab6552c3
: Make sure the TTS example in the TTS Settings loads a supported language. This fixes the issue where the example wouldn\'t play when the UI is in Japanese in bug 2088099.
...
Merge commit '7865507c978fe104deecc702f392d3ff085ff132'
* commit '7865507c978fe104deecc702f392d3ff085ff132':
Make sure the TTS example in the TTS Settings loads a supported language.
2009-09-01 16:18:54 -07:00
Jean-Michel Trivi
7865507c97
am ab6552c3
: Make sure the TTS example in the TTS Settings loads a supported language. This fixes the issue where the example wouldn\'t play when the UI is in Japanese in bug 2088099.
...
Merge commit 'ab6552c3f01f893ca927fc8ef0fec95a6c8f178f' into eclair-plus-aosp
* commit 'ab6552c3f01f893ca927fc8ef0fec95a6c8f178f':
Make sure the TTS example in the TTS Settings loads a supported language.
2009-09-01 16:17:44 -07:00
Dianne Hackborn
9e4391d413
am feab7249
: am c58c549c
: New UI for viewing and stopping currently running services.
...
Merge commit 'feab7249a970b0670513a35495cbc53bbf909f8e'
* commit 'feab7249a970b0670513a35495cbc53bbf909f8e':
New UI for viewing and stopping currently running services.
2009-09-01 13:59:28 -07:00
Jean-Michel Trivi
ab6552c3f0
Make sure the TTS example in the TTS Settings loads a supported language.
...
This fixes the issue where the example wouldn't play when the UI is in
Japanese in bug 2088099.
2009-09-01 13:46:44 -07:00
Dianne Hackborn
feab7249a9
am c58c549c
: New UI for viewing and stopping currently running services.
...
Merge commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99' into eclair-plus-aosp
* commit 'c58c549cc963bd8946d332a0f9945d9a1ed19e99':
New UI for viewing and stopping currently running services.
2009-09-01 12:34:33 -07:00
Jean-Baptiste Queru
e8fa3ddc7a
am f602bc8b
: merge from open-source master
...
Merge commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf'
* commit 'f602bc8bee72c9845bd4c2319fdd149ff6861daf':
Fix grammar in unknown sources dialog. issue 1938
screenOrientation written as content instead of attribute by mistake
2009-09-01 12:14:37 -07:00
Dianne Hackborn
c58c549cc9
New UI for viewing and stopping currently running services.
...
Change-Id: I86012262635c911be23513aa0b027174b490374d
2009-09-01 12:11:24 -07:00
Jean-Baptiste Queru
f602bc8bee
merge from open-source master
2009-09-01 08:28:18 -07:00
Amith Yamasani
c8168ba06e
am 71964dd6
: Merge change 23372 into eclair
...
Merge commit '71964dd6598cf2b4744535e537ded21dbffe611c'
* commit '71964dd6598cf2b4744535e537ded21dbffe611c':
Show the Use location prompt only once if user agrees. Bug #1910370
2009-08-31 17:43:29 -07:00
Android (Google) Code Review
71964dd659
Merge change 23372 into eclair
...
* changes:
Show the Use location prompt only once if user agrees. Bug #1910370
2009-08-31 17:39:34 -07:00
Amith Yamasani
f411c9625c
Show the Use location prompt only once if user agrees. Bug #1910370
2009-08-31 17:27:53 -07:00
Chouting Zhang
ff4b7d40e9
am 71cc49e4
: Airplane Mode in Emergency Callback Mode (ECM)
...
Merge commit '71cc49e480e7dfd5d0986d7600d0c73aecdbdf93'
* commit '71cc49e480e7dfd5d0986d7600d0c73aecdbdf93':
Airplane Mode in Emergency Callback Mode (ECM)
2009-08-31 16:45:22 -07:00
Daniel Sandler
bd839196cd
am b89653cb
: Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
...
Merge commit 'b89653cb954e6945d78a3f2ed876a1760c5d5484'
* commit 'b89653cb954e6945d78a3f2ed876a1760c5d5484':
Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
2009-08-31 16:43:17 -07:00
Daniel Sandler
3cdbc2dfc1
resolved conflicts for merge of 2b9fd2d7
to master
2009-08-31 16:41:57 -04:00
Chouting Zhang
71cc49e480
Airplane Mode in Emergency Callback Mode (ECM)
...
When user tries to change Airplane Mode between ON & OFF
in ECM mode, a notice should be shown to indicate it's in ECM mode,
and ask if user wants to exit ECM, if yes, then the Airplane Mode
is changed after ECM mode exit. If not, Airplane Mode should not be
changed.
2009-08-31 09:45:21 -07:00
Daniel Sandler
b89653cb95
Missing images from change-id I2b9fd2d739085a297ec81ae73eebd60fed4c6896.
2009-08-31 10:00:50 -04:00
Daniel Sandler
2b9fd2d739
Add missing hdpi frames of the unlock pattern animation.
2009-08-31 09:29:16 -04:00
Amith Yamasani
9d81a6fca2
am 11cd8c5a
: Fix for 1785342: The old PIN is required after entering New PIN
...
Merge commit '11cd8c5ac95334c9363a82fd81d05d85623f9d17'
* commit '11cd8c5ac95334c9363a82fd81d05d85623f9d17':
Fix for 1785342: The old PIN is required after entering New PIN
2009-08-28 17:32:12 -07:00
Amith Yamasani
11cd8c5ac9
Fix for 1785342: The old PIN is required after entering New PIN
...
State of dialogs was not properly maintained across pause/resume.
2009-08-28 17:10:46 -07:00
Daniel Sandler
ca20eb42bc
am 98fa0e29
: Merge change 23149 into eclair
...
Merge commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786'
* commit '98fa0e2941a86284d3eaae8c60fbde4a2410b786':
High-resolution (hdpi) artwork from TAT for Settings.
2009-08-28 13:21:00 -07:00
Android (Google) Code Review
98fa0e2941
Merge change 23149 into eclair
...
* changes:
High-resolution (hdpi) artwork from TAT for Settings.
2009-08-28 13:16:27 -07:00
Eric Fischer
22306cd2d1
am fe4ddf85
: Armor string format tokens with translation placeholders.
...
Merge commit 'fe4ddf853e2f6a9797037171e218bf30a25a254f'
* commit 'fe4ddf853e2f6a9797037171e218bf30a25a254f':
Armor string format tokens with translation placeholders.
2009-08-28 13:08:29 -07:00
Eric Fischer
fe4ddf853e
Armor string format tokens with translation placeholders.
...
Change-Id: I17df22448834b6d8b35f1d9a803fb4d36dfbb1f2
2009-08-28 13:02:24 -07:00
Daniel Sandler
0a9359310d
High-resolution (hdpi) artwork from TAT for Settings.
2009-08-28 15:02:50 -04:00
Hung-ying Tyan
174034f3a4
am 7ca3655d
: Handle two new err codes:
...
Merge commit '7ca3655dcb620c8635ad84d1465ab2afc3ef31a0'
* commit '7ca3655dcb620c8635ad84d1465ab2afc3ef31a0':
Handle two new err codes:
2009-08-27 20:31:17 -07:00
Hung-ying Tyan
7ca3655dcb
Handle two new err codes:
...
REMOTE_PPP_HUNG_UP and PPP_NEGOTIATION_FAILED.
Also refactor the dialog creation code to directly use the err code as
the dialog id and make it easier to tell which type of dialog (reconnect
or edit) is invoked for which err code.
2009-08-28 11:25:44 +08:00
Eric Fischer
e0a57efd80
am d1de20d8
: Fix strings whose apostrophes were eaten because of the lack of a backslash.
...
Merge commit 'd1de20d883725ce98931fbebeef9bed8c340352d'
* commit 'd1de20d883725ce98931fbebeef9bed8c340352d':
Fix strings whose apostrophes were eaten because of the lack of a backslash.
2009-08-27 14:38:34 -07:00
Eric Fischer
d1de20d883
Fix strings whose apostrophes were eaten because of the lack of a backslash.
...
Change-Id: I11619ef7bdd0d418e701930ae46b2b9c93ca07ac
2009-08-27 13:52:31 -07:00
Hung-ying Tyan
bdc2ae99df
am 11dd7d5f
: Fix the state machine for CONNECTING/DISCONNECTING states.
...
Merge commit '11dd7d5fb36a408f1d3962cbec0b58ba5212ade9'
* commit '11dd7d5fb36a408f1d3962cbec0b58ba5212ade9':
Fix the state machine for CONNECTING/DISCONNECTING states.
2009-08-26 20:33:43 -07:00
Hung-ying Tyan
11dd7d5fb3
Fix the state machine for CONNECTING/DISCONNECTING states.
2009-08-27 11:03:46 +08:00
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