OSDN Git Service
The Android Automerger [Sun, 30 Oct 2011 13:48:02 +0000 (06:48 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Sat, 29 Oct 2011 03:15:30 +0000 (03:15 +0000)]
am
6fded4ab: (-s ours) Import revised translations. DO NOT MERGE
* commit '
6fded4ab3fca2d79a82c40f90370b12489456dff':
Import revised translations. DO NOT MERGE
Eric Fischer [Sat, 29 Oct 2011 00:06:49 +0000 (17:06 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib938444059955eab65a79afef9d9ec3c971dcd8c
Eric Fischer [Fri, 28 Oct 2011 21:01:37 +0000 (14:01 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Fri, 28 Oct 2011 20:54:20 +0000 (13:54 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I8a28a888b322b379800fae19299e91a3b485b2f8
Narayan Kamath [Fri, 28 Oct 2011 09:15:38 +0000 (02:15 -0700)]
Merge "Hide the "install voice data" preference by default. DO NOT MERGE" into ics-mr1
Jaikumar Ganesh [Fri, 28 Oct 2011 02:14:06 +0000 (02:14 +0000)]
am
d9bf0d1a: Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
* commit '
d9bf0d1afa7857ec3f678ac2aa041b42bcf2ef5a':
Fix UI issue with Bluetooth Settings.
Jaikumar Ganesh [Thu, 27 Oct 2011 23:49:39 +0000 (16:49 -0700)]
Merge "Fix UI issue with Bluetooth Settings." into ics-mr0
Jaikumar Ganesh [Thu, 27 Oct 2011 23:23:30 +0000 (16:23 -0700)]
Fix UI issue with Bluetooth Settings.
When a profile fails to connect, the preference was getting unset.
Patch generated in conversation with Jake Hamby.
Bug:
5526404
Change-Id: I27ab8d337b6d121f8d369841d3f9a691293ef922
Eric Fischer [Thu, 27 Oct 2011 21:46:47 +0000 (21:46 +0000)]
am
65c61ef8: (-s ours) Import revised translations. DO NOT MERGE
* commit '
65c61ef8cd6904c4b378cb04dbe564229ff70cd7':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 27 Oct 2011 16:53:19 +0000 (09:53 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I2731df18113b720c7b2894c670302330c9c29f9f
Eric Fischer [Thu, 27 Oct 2011 16:45:59 +0000 (09:45 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Narayan Kamath [Thu, 27 Oct 2011 15:34:50 +0000 (16:34 +0100)]
Hide the "install voice data" preference by default. DO NOT MERGE
Re-added if there are voices to install.
DO NOT MERGE : Was already submitted to master.
bug:
5511343
Change-Id: Iac95f37c3dda3b213f6ba34c32b7dc725673d64d
The Android Automerger [Thu, 27 Oct 2011 13:47:48 +0000 (06:47 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Fischer [Thu, 27 Oct 2011 00:40:52 +0000 (17:40 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I22ad234b19bb6270f7edd9461590d119d7dc4eff
Eric Fischer [Wed, 26 Oct 2011 21:08:59 +0000 (21:08 +0000)]
am
d27fa50a: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
d27fa50a0a823403fd77929f8b6a40a260a27577':
Import revised translations. DO NOT MERGE
Eric Fischer [Wed, 26 Oct 2011 21:06:13 +0000 (14:06 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Wed, 26 Oct 2011 18:27:35 +0000 (11:27 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr1
Eric Fischer [Wed, 26 Oct 2011 18:09:44 +0000 (11:09 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I9d5e132b9d4a9e505269ef9998acabfba8ffa975
Eric Fischer [Wed, 26 Oct 2011 17:24:56 +0000 (10:24 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I7d78b6f42431a906f9a8f624c9f0e573859ea4bc
The Android Automerger [Wed, 26 Oct 2011 14:05:34 +0000 (07:05 -0700)]
merge in ics-mr1-release history after reset to ics-mr1
Todd Poynor [Wed, 26 Oct 2011 12:22:41 +0000 (12:22 +0000)]
am
a94320e3: Settings use minimum manual brightness from config
* commit '
a94320e332f3c14b6ebb2359cc3fe363b8dfe688':
Settings use minimum manual brightness from config
Todd Poynor [Wed, 26 Oct 2011 00:11:56 +0000 (17:11 -0700)]
Settings use minimum manual brightness from config
Remove use of deprecated android.os.Power.BRIGHTNESS_DIM (20) + 10.
Change-Id: I24aff7d7fc93b4b67dedb1047bbbd4dbe3fae382
Signed-off-by: Todd Poynor <toddpoynor@google.com>
Ed Heyl [Tue, 25 Oct 2011 20:19:41 +0000 (20:19 +0000)]
merge ics-mr0
Change-Id: I264e87a888059ada62b56a3ff7acf44cb0657cb8
Eric Fischer [Tue, 25 Oct 2011 00:09:58 +0000 (17:09 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I7df445e1dff14ef16380b371d8e14af1b6a98295
The Android Automerger [Sun, 23 Oct 2011 14:02:32 +0000 (07:02 -0700)]
merge in ics-release history after reset to master
Eric Fischer [Fri, 21 Oct 2011 23:02:31 +0000 (16:02 -0700)]
am
b8568b21: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
b8568b21118a423c6e30e736c5702b3f946b6179':
Import revised translations. DO NOT MERGE
Eric Fischer [Fri, 21 Oct 2011 23:00:30 +0000 (16:00 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Fri, 21 Oct 2011 21:41:59 +0000 (14:41 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: I1ccc1ed633e301bb2db039ea8ce1041a00daccc3
Irfan Sheriff [Fri, 21 Oct 2011 21:38:39 +0000 (14:38 -0700)]
am
cb5fa5a4: Merge "Remove wifidirect UI listing" into ics-mr0
* commit '
cb5fa5a44779f790fae87102a573816ecc15dd3d':
Remove wifidirect UI listing
Peter Ng [Fri, 21 Oct 2011 21:14:44 +0000 (14:14 -0700)]
Merge "Settings applications processes viewer color updates"
Eric Fischer [Fri, 21 Oct 2011 20:52:11 +0000 (13:52 -0700)]
am
388c9e2f: (-s ours) Import revised translations. DO NOT MERGE
* commit '
388c9e2f14c4b533ec9d19c1513e51353de89e75':
Import revised translations. DO NOT MERGE
Irfan Sheriff [Fri, 21 Oct 2011 20:29:53 +0000 (13:29 -0700)]
Merge "Remove wifidirect UI listing" into ics-mr0
Irfan Sheriff [Fri, 21 Oct 2011 20:11:37 +0000 (13:11 -0700)]
Remove wifidirect UI listing
Was used for testing. remove it until proper UI is
added
Bug:
5497909
Change-Id: Ic8bd1afbe348ede9031f2446b30a99d7efc88f7c
Eric Fischer [Fri, 21 Oct 2011 01:04:50 +0000 (18:04 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ib962f495098fdcffdcf5f75d5813bb5fb1e94d7c
Peter Ng [Thu, 20 Oct 2011 21:04:53 +0000 (14:04 -0700)]
Settings applications processes viewer color updates
Change-Id: I233bed85c331aa909aebcd3358f7b985d9eaa473
Eric Fischer [Thu, 20 Oct 2011 18:32:06 +0000 (11:32 -0700)]
am
49a681c4: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
49a681c4928d63b86fca0a546ee60b4f95d16669':
Import revised translations. DO NOT MERGE
Eric Fischer [Thu, 20 Oct 2011 18:29:07 +0000 (11:29 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Thu, 20 Oct 2011 18:16:21 +0000 (11:16 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Ic01568aa596d6aa3b36ee03d37f5d128e0744886
The Android Automerger [Thu, 20 Oct 2011 14:01:56 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Danielle Millett [Wed, 19 Oct 2011 22:14:41 +0000 (15:14 -0700)]
am
8123493e: Fix
5428748: Added more options for biometric weak
* commit '
8123493ef905a210bd00b0c623459f4c86505298':
Fix
5428748: Added more options for biometric weak
Danielle Millett [Wed, 19 Oct 2011 17:58:30 +0000 (13:58 -0400)]
Fix
5428748: Added more options for biometric weak
Adding make pattern visible (for pattern backup only) and vibrate
on touch as options for when biometric weak is enabled.
Change-Id: I6319f4f321779ebc6cf4acbfc0dd49b5014c0c88
The Android Automerger [Wed, 19 Oct 2011 14:45:04 +0000 (07:45 -0700)]
merge in ics-release history after reset to master
Chih-Chung Chang [Wed, 19 Oct 2011 10:33:46 +0000 (03:33 -0700)]
am
0bcd8a95: Fix
5352588: Accept view intent without URI.
* commit '
0bcd8a95a96566d9e2c97c3305ee0dccf758ca7a':
Fix
5352588: Accept view intent without URI.
Chih-Chung Chang [Tue, 18 Oct 2011 12:00:02 +0000 (20:00 +0800)]
Fix
5352588: Accept view intent without URI.
Change-Id: Ibfcf32a7d27c3ac2d3fa3695e430b3e29f3ecd20
Eric Fischer [Tue, 18 Oct 2011 23:35:18 +0000 (16:35 -0700)]
Merge "Import revised translations."
Eric Fischer [Tue, 18 Oct 2011 22:45:53 +0000 (15:45 -0700)]
Import revised translations.
Change-Id: I257f94325e7f588845bcf446e497ff827d4b2cec
Amith Yamasani [Tue, 18 Oct 2011 22:05:22 +0000 (15:05 -0700)]
Merge "Show IP address of current active link instead of just the WiFi IP address."
Dianne Hackborn [Tue, 18 Oct 2011 21:36:30 +0000 (14:36 -0700)]
am
644fa424: Work on issue #
5461497: Landed on Welcome screen after a tap on \'Next\' in Screen 500
* commit '
644fa4243b4c288c85845b3f86aab25135635729':
Work on issue #
5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
Dianne Hackborn [Tue, 18 Oct 2011 20:38:03 +0000 (13:38 -0700)]
Work on issue #
5461497: Landed on Welcome screen after a tap on 'Next' in Screen 500
With the corresponding change for the activity manager to allow the home
activity to finish itself, this activity can now be a little less dirty
and just call finish() when it finds it is not needed.
Change-Id: I1a449c7bec9fba659e27a9e918f8a9b0c55b2098
Svetoslav Ganov [Tue, 18 Oct 2011 20:16:59 +0000 (13:16 -0700)]
am
39b8eb6c: Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
* commit '
39b8eb6ce545287cd77bea465d280772669c68d1':
Accessibility service toggle setting state not preserved on screen rotation.
Svetoslav Ganov [Tue, 18 Oct 2011 20:14:38 +0000 (13:14 -0700)]
Merge "Accessibility service toggle setting state not preserved on screen rotation." into ics-mr0
Svetoslav Ganov [Tue, 18 Oct 2011 18:58:21 +0000 (11:58 -0700)]
Accessibility service toggle setting state not preserved on screen rotation.
The state of the toggle switch for enabling/disabling an accessibility service
is not preserved on screen rotation after its state has been changed once.
bug:
5478062
Change-Id: Ie453f78bc07dcd39d88bb4acf260768eccc73a74
Eric Fischer [Tue, 18 Oct 2011 18:33:36 +0000 (11:33 -0700)]
am
3d0b5254: (-s ours) Merge "Import revised translations. DO NOT MERGE" into ics-mr0
* commit '
3d0b525491559f59d65156fca5783f80f2bddc14':
Import revised translations. DO NOT MERGE
Eric Fischer [Tue, 18 Oct 2011 18:31:06 +0000 (11:31 -0700)]
Merge "Import revised translations. DO NOT MERGE" into ics-mr0
Eric Fischer [Tue, 18 Oct 2011 18:13:37 +0000 (11:13 -0700)]
Import revised translations. DO NOT MERGE
Change-Id: Idddc20bec80db65304678bc5ad191cff3f2d2c5f
Peter Ng [Tue, 18 Oct 2011 17:45:34 +0000 (10:45 -0700)]
Merge "data usage color standardization"
Danielle Millett [Tue, 18 Oct 2011 17:29:48 +0000 (10:29 -0700)]
am
4c9a5fe6: Merge "Fix
5466557: Removed secondary screenlock settings labels" into ics-mr0
* commit '
4c9a5fe6a3765ecd7617b611463766cd72706458':
Fix
5466557: Removed secondary screenlock settings labels
Danielle Millett [Tue, 18 Oct 2011 17:27:41 +0000 (10:27 -0700)]
Merge "Fix
5466557: Removed secondary screenlock settings labels" into ics-mr0
Justin Ho [Tue, 18 Oct 2011 16:33:09 +0000 (09:33 -0700)]
am
6ab0c12c: Updated bandwidth assets
* commit '
6ab0c12ca417aef49d2c287b8d215c9e66ae154d':
Updated bandwidth assets
The Android Automerger [Tue, 18 Oct 2011 14:00:51 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Justin Ho [Tue, 18 Oct 2011 01:04:18 +0000 (18:04 -0700)]
Updated bandwidth assets
Change-Id: Ia180ff9dfb020ab2f3528638f522c38f11ea010f
Danielle Millett [Mon, 17 Oct 2011 23:21:19 +0000 (19:21 -0400)]
Fix
5466557: Removed secondary screenlock settings labels
Removed summary line from the screen lock picker and displaying
the about screen for face unlock every time instead of just the
first time
Change-Id: Iac572d2366acf28d32e632e8dcdde63475641e39
Peter Ng [Tue, 18 Oct 2011 00:34:58 +0000 (17:34 -0700)]
data usage color standardization
Change-Id: I7c46ecd5b0730dc524bc788cb941493f3534cb20
Amith Yamasani [Mon, 17 Oct 2011 23:41:00 +0000 (16:41 -0700)]
Show IP address of current active link instead of just the WiFi IP address.
Bug:
5359194
Show "Unavailable" only if there's no active link.
Change-Id: I82ba6bda3a08ea84080a8d8cda331f22d7c7a2bd
Justin Ho [Mon, 17 Oct 2011 23:34:41 +0000 (16:34 -0700)]
am
7a33de4c: Merge "Update wifi icons" into ics-mr0
* commit '
7a33de4c004c9093682b54afa3deab2fdf9ed5f6':
Update wifi icons
Justin Ho [Mon, 17 Oct 2011 23:33:07 +0000 (16:33 -0700)]
Merge "Update wifi icons" into ics-mr0
Justin Ho [Mon, 17 Oct 2011 23:04:31 +0000 (16:04 -0700)]
Update wifi icons
Change-Id: I7a82b96df6c44bc17d70631ef36dc5ad733515c4
John Huang [Mon, 17 Oct 2011 22:22:28 +0000 (15:22 -0700)]
am
7b21e97c: Merge "Add "Roaming protocol" to APN editor." into ics-mr0
* commit '
7b21e97c2a213afbb7ab0d2247e751e8194f89fc':
Add "Roaming protocol" to APN editor.
John Huang [Mon, 17 Oct 2011 22:20:28 +0000 (15:20 -0700)]
Merge "Add "Roaming protocol" to APN editor." into ics-mr0
Claudia de Veaux [Mon, 17 Oct 2011 21:20:29 +0000 (14:20 -0700)]
Merge "Restore Wi-Fi spelling; change "extra-large" to "huge". Bugs:
5467607,
5163232"
Claudia de Veaux [Mon, 17 Oct 2011 19:54:20 +0000 (12:54 -0700)]
Restore Wi-Fi spelling; change "extra-large" to "huge".
Bugs:
5467607,
5163232
Change-Id: Ia0085a085b6f2d1ec9d5a00d08dee4bb38b10f22
Eric Fischer [Mon, 17 Oct 2011 18:28:34 +0000 (11:28 -0700)]
Fix capitalization of Face Unlock.
Bug
5447766
Change-Id: I4a91bd00bb09251af170ca054a8aa0bd88c5eec0
satok [Mon, 17 Oct 2011 12:54:06 +0000 (21:54 +0900)]
Update enabled subtypes in the input method subtype enabler in "onResume"
Bug:
5446825
Change-Id: Iab52ecb8a7334b7be3a81350fbfc9b02d09e88d4
John Huang [Sun, 16 Oct 2011 05:41:11 +0000 (22:41 -0700)]
Add "Roaming protocol" to APN editor.
Field already exists in the APN database. Now it is user updatable.
Only enable it on CDMA for this release (means it is not really user
visible, but available for testing purposes). Will revisit enabling
for all in a future release.
Bug:
5420680
Change-Id: Ia2c551c48ae9ce47c57ad36ec73d152441a27284
Dianne Hackborn [Sun, 16 Oct 2011 18:49:00 +0000 (11:49 -0700)]
Fix issue #
5460725: Crespo does not fully boot after a wipe
Add a hack to relaunch whatever was supposed to be launched
(presumably home) when CryptKeeper discovers it shouldn't be
running.
Change-Id: I1406b8d6e8d484ed1c169fa4908a9e05e8c7c2ad
The Android Automerger [Sun, 16 Oct 2011 14:00:49 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Fri, 14 Oct 2011 21:36:58 +0000 (14:36 -0700)]
Data usage chart fixes.
Always draw first data point at 0. Each point should include full
value of current bucket, instead of lagging behind by one.
Bug:
5404917,
5404861,
5178305
Change-Id: I5fa63bc84cc1f9c0403fb03effd5affd2f01ad4c
Jeff Sharkey [Thu, 13 Oct 2011 19:37:47 +0000 (12:37 -0700)]
Merge "Toast when finished pattern or password setup." into ics-mr0
Daniel Sandler [Thu, 13 Oct 2011 19:34:51 +0000 (12:34 -0700)]
Merge "Use new status bar disable flags." into ics-mr0
Jeff Sharkey [Wed, 12 Oct 2011 00:26:27 +0000 (17:26 -0700)]
Toast when finished pattern or password setup.
Bug:
5443781
Change-Id: I599ccbb9c535396e05a2a22ab6d3ef302fb9c623
The Android Automerger [Thu, 13 Oct 2011 14:00:44 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Jim Miller [Thu, 13 Oct 2011 00:46:17 +0000 (17:46 -0700)]
Fix
5444675: Don't show "Vibrate on touch" in password lock options
Don't show "Vibrate on touch" for password lock screen options because
vibrate is controlled by the IME setting in this case.
Change-Id: Idc8c73048a0c396037457638faed02331ed104f3
Daniel Sandler [Wed, 12 Oct 2011 19:34:23 +0000 (15:34 -0400)]
Use new status bar disable flags.
Requires frameworks/base change I04eb2245.
Bug:
5380495
Change-Id: Ia9e5c25e224b38c1cdad4cd725fc425de90f8344
The Android Automerger [Tue, 11 Oct 2011 12:34:26 +0000 (05:34 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Tue, 11 Oct 2011 00:20:53 +0000 (17:20 -0700)]
Merge "Add disclaimer string."
Jeff Sharkey [Tue, 11 Oct 2011 00:04:12 +0000 (17:04 -0700)]
Add disclaimer string.
Bug:
5337015
Change-Id: Iabeb8490ed51f77e98f3c5317e31d30e4e780178
Eric Fischer [Mon, 10 Oct 2011 18:48:47 +0000 (11:48 -0700)]
Merge "Import revised translations."
Eric Fischer [Mon, 10 Oct 2011 18:25:09 +0000 (11:25 -0700)]
Import revised translations.
Change-Id: I064a55b4923fcc09ae2172e1b21cb81eee0db653
The Android Automerger [Mon, 10 Oct 2011 14:00:49 +0000 (07:00 -0700)]
merge in ics-release history after reset to master
Jeff Sharkey [Sun, 9 Oct 2011 20:21:10 +0000 (13:21 -0700)]
Bring back network counters in battery stats.
Bug:
4902271
Change-Id: I0900c030407a86efb14a9d528ab355c56f54679e
The Android Automerger [Sun, 9 Oct 2011 14:01:19 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
Amith Yamasani [Fri, 7 Oct 2011 21:43:24 +0000 (14:43 -0700)]
Merge "Remove pending message when fragment is paused."
Amith Yamasani [Fri, 7 Oct 2011 20:58:39 +0000 (13:58 -0700)]
Remove pending message when fragment is paused.
Bug:
5422788
Converted the runnable to a message and removed any pending messages in onPause.
Change-Id: I048413ae2abd69a359b1fa2c648d98df3c3ae343
Peter Ng [Fri, 7 Oct 2011 19:32:13 +0000 (12:32 -0700)]
Merge "Data usage grid asset updates"
Peter Ng [Fri, 7 Oct 2011 01:35:13 +0000 (18:35 -0700)]
Data usage grid asset updates
Change-Id: I232e784c8552f4f185814f4d5b8082894438c500
Romain Guy [Thu, 6 Oct 2011 01:49:52 +0000 (18:49 -0700)]
Fix string for hdpi devices
Change-Id: Icfad64a4c7df0a6c68336cc361e60ec626b5d735
Irfan Sheriff [Thu, 6 Oct 2011 19:43:01 +0000 (12:43 -0700)]
Merge "Add mobile hotspot provisioning support"
Irfan Sheriff [Thu, 6 Oct 2011 18:45:45 +0000 (11:45 -0700)]
Add mobile hotspot provisioning support
Bug:
5346812
Change-Id: I3e117fb62039c1d8370440ab4109705894011928
The Android Automerger [Thu, 6 Oct 2011 14:01:28 +0000 (07:01 -0700)]
merge in ics-release history after reset to master
OSDN Git Service
