Kenny Root
28b245c01d
Import revised translations
...
Change-Id: I6f0e1a9dbaa3b3e81b24de207c3731249d160a59
2010-05-17 11:42:19 -07:00
Chung-yih Wang
de5302577f
am 5dcdbb5c: am 8719f0d2: am 8c81257f: Fix the double-quoted SSID issue.
2010-05-17 09:21:28 -07:00
Chung-yih Wang
5dcdbb5c08
am 8719f0d2: am 8c81257f: Fix the double-quoted SSID issue.
...
Merge commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7' into kraken
* commit '8719f0d20a301cc7509c9bd3ce3275f551329dd7':
Fix the double-quoted SSID issue.
2010-05-14 23:18:27 -07:00
Chung-yih Wang
8719f0d20a
am 8c81257f: Fix the double-quoted SSID issue.
...
Merge commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c' into froyo-plus-aosp
* commit '8c81257f70fabeaa505e292bd0c2226dd5eefc4c':
Fix the double-quoted SSID issue.
2010-05-14 23:16:25 -07:00
Chung-yih Wang
8c81257f70
Fix the double-quoted SSID issue.
...
Bug id http://b/issue?id=2684571
Change-Id: I0f1e508b9a3d0fefcef28235380392368a51e42a
2010-05-15 10:57:23 +08:00
Konstantin Lopyrev
9aaf40d697
Fix 2593312: Screen does not get stuck in locked out mode.
...
Change-Id: Ib32db339a0d6b47119da94e56a14405c5ea63eb6
2010-05-13 16:36:03 -07:00
Konstantin Lopyrev
28efa02104
Making the choose password strings clearer
...
Change-Id: Ib693145542972863677fa0a383278e95abfb239d
2010-05-13 15:58:46 -07:00
Konstantin Lopyrev
015c186a24
Fix 2673731: Added password history
...
Change-Id: I6198833e099ec1f33309dc26b28e0fd4a6edb288
2010-05-12 17:16:24 -07:00
The Android Open Source Project
c9395470cf
am 81367cb4: am 542b8f2b: merge from open-source master
2010-05-12 10:42:17 -07:00
The Android Open Source Project
a4900233a9
am 728e95b2: am 0b53ac73: merge from open-source master
2010-05-12 10:40:51 -07:00
The Android Open Source Project
81367cb496
am 542b8f2b: merge from open-source master
...
Merge commit '542b8f2b471cbac5a2f4b550eae65caf24266d36' into kraken
* commit '542b8f2b471cbac5a2f4b550eae65caf24266d36':
Fixing Swedish translations of a few texts under "Phone info".
2010-05-12 10:39:17 -07:00
The Android Open Source Project
728e95b2f8
am 0b53ac73: merge from open-source master
...
Merge commit '0b53ac733c36e14a5e2e948393360bba00048ccb' into kraken
* commit '0b53ac733c36e14a5e2e948393360bba00048ccb':
The password in the APN settings is shown instead of stars
2010-05-12 10:37:51 -07:00
The Android Open Source Project
542b8f2b47
merge from open-source master
...
Change-Id: I0b8f7bedc11e98f2c790669bbbe5a7807947e196
2010-05-12 09:34:10 -07:00
The Android Open Source Project
0b53ac733c
merge from open-source master
...
Change-Id: Iab9eddbfea000b9403c92a211c37b93772f2a9c7
2010-05-12 09:33:50 -07:00
Henrik Hall
a7ece710fe
Fixing Swedish translations of a few texts under "Phone info".
...
* Build number
* Firmware version
Change-Id: Ifb8e84bcea86c7b95073e455f97f9b13c720c400
2010-05-11 13:38:44 -07:00
Romain Guy
d2bfade8f6
Merge "The password in the APN settings is shown instead of stars"
2010-05-11 10:51:12 -07:00
Robert Greenwalt
b12913368a
am ddde146f: am 482eadea: am e434bfb2: String change - wifi tether = hotspot
2010-05-10 10:20:15 -07:00
Robert Greenwalt
ddde146f8d
am 482eadea: am e434bfb2: String change - wifi tether = hotspot
...
Merge commit '482eadeae85a1764b86133172d11364df6ce7227' into kraken
* commit '482eadeae85a1764b86133172d11364df6ce7227':
String change - wifi tether = hotspot
2010-05-10 10:16:29 -07:00
Robert Greenwalt
482eadeae8
am e434bfb2: String change - wifi tether = hotspot
...
Merge commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7' into froyo-plus-aosp
* commit 'e434bfb216682a6ca331fa54ce58a2bff7adf8d7':
String change - wifi tether = hotspot
2010-05-10 10:14:36 -07:00
Michael Chan
f21dc705f4
am c56a35e3: am 15bb4754: am d2c81986: b/2652059 Refresh UI after bond state change
2010-05-10 09:55:46 -07:00
Michael Chan
c56a35e3c6
am 15bb4754: am d2c81986: b/2652059 Refresh UI after bond state change
...
Merge commit '15bb47545686395c0d94b54dd67c4f080fe625e5' into kraken
* commit '15bb47545686395c0d94b54dd67c4f080fe625e5':
b/2652059 Refresh UI after bond state change
2010-05-10 09:50:04 -07:00
Michael Chan
15bb475456
am d2c81986: b/2652059 Refresh UI after bond state change
...
Merge commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2' into froyo-plus-aosp
* commit 'd2c81986c236ed680cfae5e420561028ae4cc0d2':
b/2652059 Refresh UI after bond state change
2010-05-10 09:43:38 -07:00
Robert Greenwalt
e434bfb216
String change - wifi tether = hotspot
...
bug:2664412
Change-Id: I6ca955e7fcc299ae1d69892c93c9250229610b19
2010-05-08 17:20:26 -07:00
Michael Chan
d2c81986c2
b/2652059 Refresh UI after bond state change
...
Change-Id: I8f8a939ba3f383aae36091986cea4e8a6eae13fb
2010-05-07 15:24:22 -07:00
Michael Chan
7ab5a6e330
am d4869a99: am d17eb48e: am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair
2010-05-04 17:45:58 -07:00
Michael Chan
d4869a99df
am d17eb48e: am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair
...
Merge commit 'd17eb48e9c87e02cbcb42899915dbfc921075231' into kraken
* commit 'd17eb48e9c87e02cbcb42899915dbfc921075231':
b/2652059 Fixed the broken BT connects/disconnects after unpair
2010-05-04 12:45:29 -07:00
Michael Chan
d17eb48e9c
am 1308453b: b/2652059 Fixed the broken BT connects/disconnects after unpair
...
Merge commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e' into froyo-plus-aosp
* commit '1308453b16c2ca85a456bd4bb7f3c71c916bd83e':
b/2652059 Fixed the broken BT connects/disconnects after unpair
2010-05-04 12:36:27 -07:00
Michael Chan
1308453b16
b/2652059 Fixed the broken BT connects/disconnects after unpair
...
The unpair command was stuck in the queue.
Change-Id: I803cb10adcfaedbe6fd202e0db463593880e4280
2010-05-03 23:06:51 -07:00
Kenny Root
c1b1ee694b
am b458ec28: am a359fb77: (-s ours) am 6d409870: Import revised translations
2010-04-29 17:09:48 -07:00
Kenny Root
b458ec285f
am a359fb77: (-s ours) am 6d409870: Import revised translations
...
Merge commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af' into kraken
* commit 'a359fb77d41ab3ac00a1020b42fa2e898904c1af':
Import revised translations
2010-04-29 16:45:47 -07:00
Kenny Root
a359fb77d4
am 6d409870: Import revised translations
...
Merge commit '6d409870981361af2f547fba05877e7f405af75a' into froyo-plus-aosp
* commit '6d409870981361af2f547fba05877e7f405af75a':
Import revised translations
2010-04-29 16:03:30 -07:00
Kenny Root
6d40987098
Import revised translations
...
Change-Id: If5691d275bf86c94038a53beed65a93dad65b450
2010-04-29 16:01:54 -07:00
Michael Chan
b50d2baea6
am cb29eb04: am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo
2010-04-28 13:25:37 -07:00
Michael Chan
cb29eb04f5
am 3a1204f7: am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo
...
Merge commit '3a1204f7cd231ed1c451ca90901eae082541b9ef' into kraken
* commit '3a1204f7cd231ed1c451ca90901eae082541b9ef':
b/2630339 Fixed the crash when an app requests BT to be enabled
2010-04-28 13:17:36 -07:00
Michael Chan
3a1204f7cd
am 6078d450: Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo
...
Merge commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e' into froyo-plus-aosp
* commit '6078d4503d6bc29fe6d2ff7784124a66fe48186e':
b/2630339 Fixed the crash when an app requests BT to be enabled
2010-04-28 13:14:35 -07:00
Michael Chan
6078d4503d
Merge "b/2630339 Fixed the crash when an app requests BT to be enabled" into froyo
2010-04-28 12:43:00 -07:00
Michael Chan
a0de1dcd19
b/2630339 Fixed the crash when an app requests BT to be enabled
...
For AlertActivity, the dialog needs to display at onCreate() time.
Otherwise, the decor view would be made. Trying to display the
dialog afterward would crash. Changed to AlertDialog instead.
Change-Id: I2ea8463b4c475b9b54746d0a722fa80eea3d4529
2010-04-28 11:24:00 -07:00
Kenny Root
cecc0c8899
am 19b4bdca: am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo
2010-04-28 09:56:36 -07:00
Kenny Root
19b4bdca55
am 9fef437e: am b3c872bf: Merge "Import revised translations" into froyo
...
Merge commit '9fef437e04edd18f6406a49095403a1b71becf58' into kraken
* commit '9fef437e04edd18f6406a49095403a1b71becf58':
Import revised translations
2010-04-28 09:47:07 -07:00
Kenny Root
9fef437e04
am b3c872bf: Merge "Import revised translations" into froyo
...
Merge commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5' into froyo-plus-aosp
* commit 'b3c872bf581e3f1ec3c6f03fbb90e43690de75b5':
Import revised translations
2010-04-28 09:34:05 -07:00
Kenny Root
b3c872bf58
Merge "Import revised translations" into froyo
2010-04-28 09:23:34 -07:00
Kenny Root
eab62faea7
Import revised translations
...
Change-Id: I91401f661d61a86d166baac1cad14b8897d0a467
2010-04-28 09:20:52 -07:00
Amith Yamasani
e76c4e1297
am e6245178: am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
2010-04-27 18:56:47 -07:00
Amith Yamasani
e62451789f
am 567ca080: am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
...
Merge commit '567ca0805e884c124e537edc7eac5cecf8d4e202' into kraken
* commit '567ca0805e884c124e537edc7eac5cecf8d4e202':
Fix regression in removing settings that aren't relevant for a platform.
2010-04-27 15:09:49 -07:00
Amith Yamasani
567ca0805e
am 64ab5338: Fix regression in removing settings that aren\'t relevant for a platform.
...
Merge commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e' into froyo-plus-aosp
* commit '64ab5338cb0f90f8ee0787b0b98611670e6dee7e':
Fix regression in removing settings that aren't relevant for a platform.
2010-04-27 15:08:20 -07:00
Amith Yamasani
64ab5338cb
Fix regression in removing settings that aren't relevant for a platform.
...
Bug: 2630695
The PreferenceCategories added into the hierarchy caused removePreference() to
not work, since the preferences to be removed were not immediate children of
the preference screen.
Create empty PreferenceCategory elements and pull the preferences to the same
depth as the categories.
Change-Id: I34826ea4d84cda0ecab75c66a73febe3d51e7c68
2010-04-27 13:35:12 -07:00
Michael Chan
fbbbf3d332
am 84a4b9e4: am 0bca1653: am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
2010-04-23 10:58:07 -07:00
Michael Chan
84a4b9e4f3
am 0bca1653: am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
...
Merge commit '0bca1653cb78693e2c892efb48b944ddad98b66d' into kraken
* commit '0bca1653cb78693e2c892efb48b944ddad98b66d':
b/2608693 Fix the problem where BT was automatically reconnecting
2010-04-23 10:51:54 -07:00
Michael Chan
0bca1653cb
am 6368b25c: Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
...
Merge commit '6368b25c09992172b1900da3fd326c4fd2fdd203' into froyo-plus-aosp
* commit '6368b25c09992172b1900da3fd326c4fd2fdd203':
b/2608693 Fix the problem where BT was automatically reconnecting
2010-04-23 10:50:18 -07:00
Michael Chan
6368b25c09
Merge "b/2608693 Fix the problem where BT was automatically reconnecting ... after the user unpaired while docked." into froyo
2010-04-23 10:46:43 -07:00
