OSDN Git Service
Alex Klyubin [Thu, 6 Jun 2013 22:35:34 +0000 (15:35 -0700)]
am
0c32da7e: am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0c32da7ee01f7f523a889c5faf1a449e664f8bce':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:33:45 +0000 (15:33 -0700)]
am
6f28e342: am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
6f28e3420ade08f05588d35937b772ffb5cdaf83':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:32:00 +0000 (15:32 -0700)]
am
9f6a1933: am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
9f6a193394de16bfe398c8b7424f273231c77134':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:29:56 +0000 (15:29 -0700)]
am
0ffbbad5: am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
0ffbbad5b1ad34bb2add06f7ec030191ed94e866':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:28:52 +0000 (15:28 -0700)]
am
60544e74: am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
60544e74b689c5c9e6e47e6b1c50582fe37d0a70':
Ensure all active Device Admins are listed.
Alex Klyubin [Thu, 6 Jun 2013 22:26:48 +0000 (15:26 -0700)]
am
3dddd8cb: Ensure all active Device Admins are listed.
* commit '
3dddd8cbff8c8153363373ebe9911d67f0e50bcd':
Ensure all active Device Admins are listed.
Alex Klyubin [Wed, 22 May 2013 16:06:35 +0000 (09:06 -0700)]
Ensure all active Device Admins are listed.
Bug:
9074296
(cherry picked from commit
d14258e50efc3677abef3cd204b67e7f26e47b56)
Conflicts:
src/com/android/settings/DeviceAdminSettings.java
Changes made to make the cherry-pick apply:
* Dropped PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS in the
PackageManager.queryBroadcastReceivers invocation. The above
flag was introduced in API Level 18.
Change-Id: I65596c49bedad7e39ceb1785859c129db1e3e6d7
Dianne Hackborn [Thu, 6 Jun 2013 19:35:00 +0000 (12:35 -0700)]
am
a9a28d2f: am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
a9a28d2feeccdd2deacf6fcfb96abfcdeed58ddf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:32:46 +0000 (12:32 -0700)]
am
f96a86c9: am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
f96a86c99d7505e15a39266967cf4d4d75295af1':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:30:51 +0000 (12:30 -0700)]
am
6d80d477: am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
6d80d477391c6ad14a6bcdb044c3351de4e20481':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:29:04 +0000 (12:29 -0700)]
am
0bccd7e7: am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
0bccd7e7f4d6fe4d5c7e1fef151f50ebed7addaf':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:26:39 +0000 (12:26 -0700)]
am
5f28c77b: am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
5f28c77bc64deb132082eaab0ebd544ba5111bd0':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Thu, 6 Jun 2013 19:23:05 +0000 (12:23 -0700)]
am
d6086125: Fix issue #
9074296: Device Admins can activate in a way...
* commit '
d60861258169083f3174734af821fc8078ec5d2f':
Fix issue #
9074296: Device Admins can activate in a way...
Dianne Hackborn [Wed, 22 May 2013 18:29:36 +0000 (11:29 -0700)]
Fix issue #
9074296: Device Admins can activate in a way...
...that makes it impossible to deactive/uninstall them
Don't allow device admins to directly launch the add UI if
they are malformed.
(cherry picked from commit
8274b6770219a469ab8a5254206d0d81bd5c96d3)
Changes due to make the cherry-pick apply:
* Replaced PackageManager.GET_DISABLED_UNTIL_USED_COMPONENTS with 0
in the PackageManager.queryBroadcastReceivers invocation. The above
constant was introduced in API Level 18 only. DeviceAdminSettings
class from which this fix was extracted is not passing in the above
flag when it invokes queryBroadcastReceivers either.
Change-Id: I64d2792cd06bacbd4bfc600a10046d51a9383606
Kenny Root [Thu, 28 Mar 2013 21:30:37 +0000 (14:30 -0700)]
am
9dc478ec: Merge "Add ability to install credentials as other UID"
* commit '
9dc478ec23944e9b008ab559e2f1360a9e4818b4':
Add ability to install credentials as other UID
Kenny Root [Thu, 28 Mar 2013 20:57:03 +0000 (20:57 +0000)]
Merge "Add ability to install credentials as other UID"
Kenny Root [Thu, 28 Mar 2013 18:05:19 +0000 (11:05 -0700)]
Add ability to install credentials as other UID
We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.
Bug:
8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0
Jeff Sharkey [Wed, 20 Mar 2013 17:21:53 +0000 (10:21 -0700)]
am
74fd506b: Merge "Enable Ethernet tab in data usage"
* commit '
74fd506bba9643221479ba11ae56a6657ed48279':
Enable Ethernet tab in data usage
Jeff Sharkey [Wed, 20 Mar 2013 17:08:25 +0000 (17:08 +0000)]
Merge "Enable Ethernet tab in data usage"
Jaewan Kim [Tue, 19 Mar 2013 07:53:45 +0000 (16:53 +0900)]
Enable Ethernet tab in data usage
mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.
Bug:
8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0
Robert Greenwalt [Sun, 17 Mar 2013 16:26:13 +0000 (09:26 -0700)]
am
ae9ebfd1: Merge "add MVNO field for APN Editor"
* commit '
ae9ebfd153d63beb03c018786cb3a7ca7610ce64':
add MVNO field for APN Editor
Robert Greenwalt [Sat, 16 Mar 2013 00:55:30 +0000 (00:55 +0000)]
Merge "add MVNO field for APN Editor"
Elliott Hughes [Thu, 14 Mar 2013 01:17:56 +0000 (18:17 -0700)]
am
53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
* commit '
53309365f60b317b032e55643e9eb0122c6fbb3f':
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
Elliott Hughes [Thu, 14 Mar 2013 00:12:48 +0000 (00:12 +0000)]
Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
Sungmin Choi [Fri, 1 Mar 2013 12:20:46 +0000 (21:20 +0900)]
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog
In case of using DatePickerDialog, user could select any date
before 1970-01-01. However, the system clock cannot be set to
a date before 1970-01-01.
As a result, user couldn't select date before 1970-01-01.
So, use date from 1970-01-01 to 2037-12-31 of DatePickerDialog.
Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1970 and Done
Change-Id: I075b3fcaa86df1c314c85dd3dd85474a28b8c637
Amith Yamasani [Tue, 12 Mar 2013 22:42:57 +0000 (15:42 -0700)]
am
506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
* commit '
506b68e1c586ea3956c939c4181f11e5a112a2f5':
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
Amith Yamasani [Tue, 12 Mar 2013 21:56:41 +0000 (21:56 +0000)]
Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:13:41 +0000 (13:13 -0700)]
am
33adccd2: am
9cff5e3f: am
f4b1aefb: (-s ours) am
8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
33adccd203ee8303cd0bf489e3f072d362e1705d':
Jean-Baptiste Queru [Mon, 11 Mar 2013 20:00:49 +0000 (13:00 -0700)]
am
9cff5e3f: am
f4b1aefb: (-s ours) am
8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
9cff5e3f4a534c5472b8a8e269f34cdca2ebff8c':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:42:01 +0000 (12:42 -0700)]
am
f4b1aefb: (-s ours) am
8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
f4b1aefbaafba7ba290a05bce84f77ee5ad5b043':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:27:42 +0000 (12:27 -0700)]
am
8638eeb4: (-s ours) Reconcile with jb-mr1-release - do not merge
* commit '
8638eeb4e925009fcc91fd9a9965740c25fe518a':
Jean-Baptiste Queru [Mon, 11 Mar 2013 19:22:07 +0000 (12:22 -0700)]
Reconcile with jb-mr1-release - do not merge
Henrik Baard [Wed, 27 Feb 2013 07:57:03 +0000 (08:57 +0100)]
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY
There is an array (NEED_VOICE_CAPABILITY) with all keys that
should not be present in a device that does not have voice
capability.
The key KEY_VIBRATE was not part of this array, it was handled
separately in the code.
Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY and remove the
special treatement.
Change-Id: I96aa066cec373ccbfe89c46b530feb484f6f8164
Amith Yamasani [Fri, 8 Mar 2013 18:24:22 +0000 (18:24 +0000)]
Merge "Fix the message when Bluetooth is turning off while on the tethering menu."
Ryan Baxter [Wed, 6 Mar 2013 23:27:53 +0000 (18:27 -0500)]
Fix the message when Bluetooth is turning off while on the tethering menu.
Currently says "Turning Wifi off..."
This change will display "Turning Bluetooth off..." instead.
Change-Id: I697d19ca4d7a69cc6b3729ad09fcf38bf5ab2427
Signed-off-by: Ryan Baxter <rbryanbaxter@gmail.com>
Irfan Sheriff [Tue, 5 Mar 2013 19:08:15 +0000 (19:08 +0000)]
Merge "Fix not updating error message when authentication fails"
Jaewan Kim [Thu, 28 Feb 2013 11:50:21 +0000 (20:50 +0900)]
Fix not updating error message when authentication fails
If attempt to configure the first network fails, AccessPoints fails to
update error message because it only checks the error code if it is not
active.
With this change, user may see saved network message for a second
because SupplicantStateTracker retries on authentication failure so
intermediate status is displayed between each trial.
Bug:
8284024
Change-Id: I8b976b03878e27e46726ee8a176f131115b7a409
Sungmin Choi [Wed, 30 Jan 2013 04:53:03 +0000 (13:53 +0900)]
add MVNO field for APN Editor
For MVNO, add related data fields.
Bug:
8143480
Change-Id: Idfa06c6f39a2c15ff4f0815724823f44b76ac819
Wink Saville [Wed, 20 Feb 2013 23:07:59 +0000 (23:07 +0000)]
Merge "avoid stopping app in case of accessing empty db"
Amith Yamasani [Wed, 20 Feb 2013 16:57:49 +0000 (16:57 +0000)]
Merge "Prevent cursor from causing global reference leaks."
Irfan Sheriff [Fri, 15 Feb 2013 23:42:50 +0000 (23:42 +0000)]
Merge changes If41fad5f,I9c860569,I2e3e8d4d,If65c4029
* changes:
Use updated enterprise API
Fix EAP field display for a new network
Allow only valid EAP configs
Update enterprise API usage
Irfan Sheriff [Mon, 11 Feb 2013 23:55:31 +0000 (15:55 -0800)]
Use updated enterprise API
Change-Id: If41fad5fae5864555bb1de3fc99130682b1cdff1
Irfan Sheriff [Wed, 6 Feb 2013 18:51:13 +0000 (10:51 -0800)]
Fix EAP field display for a new network
We now hide certain EAP fields based on the type chosen. For a
new network, we should set a default and handle this the same
way
Change-Id: I9c8605694ba51bc588a49f711dcf31517ea3f6e4
Irfan Sheriff [Thu, 17 Jan 2013 17:47:45 +0000 (09:47 -0800)]
Allow only valid EAP configs
We allow configuring all possible EAP fields today even though
some of the configs make no sense and will not result in a
successful connection.
Allow only support configs for various EAP methods
Change-Id: I2e3e8d4d6203acb2eac8cd645df39e1a9ca579ab
Irfan Sheriff [Fri, 11 Jan 2013 22:12:54 +0000 (14:12 -0800)]
Update enterprise API usage
Also, remove the unnecessary keystore lock/unlock checks since these
are now controlled at lockscreen
Change-Id: If65c4029d4cf2b8377fbc3512c9f691572125995
Amith Yamasani [Fri, 15 Feb 2013 17:15:41 +0000 (17:15 +0000)]
Merge "Fix Settings app crash after enabled multi-user"
Hyejin Kim [Thu, 14 Feb 2013 06:49:19 +0000 (15:49 +0900)]
avoid stopping app in case of accessing empty db
When accessing empty database, Setting App is stopped, sometimes.
To avoid stopping app, check null for cursor
Change-Id: I71ec067f502d12a9215a9abdbe9e23fc07af17bb
Kenny Root [Thu, 14 Feb 2013 20:18:11 +0000 (20:18 +0000)]
Merge "KeyStore: stop using state()"
Kenny Root [Thu, 14 Feb 2013 18:27:22 +0000 (10:27 -0800)]
KeyStore: stop using state()
Change-Id: Ia8fc945666c59c0b9a9bd6f890cc2a6b8859e1d4
Irfan Sheriff [Wed, 6 Feb 2013 19:16:24 +0000 (11:16 -0800)]
am
414d9e9c: Merge "P2PSetting:Avoid p2p_find on group removal event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '
414d9e9c6928581d4f91b008c109a6a4630bfaae':
P2PSetting:Avoid p2p_find on group removal event
Irfan Sheriff [Wed, 6 Feb 2013 18:13:59 +0000 (18:13 +0000)]
Merge "P2PSetting:Avoid p2p_find on group removal event"
sunil duttu [Wed, 6 Feb 2013 07:13:54 +0000 (12:43 +0530)]
P2PSetting:Avoid p2p_find on group removal event
Immediately after group termination p2p_find is being issued
from settings and this causing issue whenever user sends
connection request immediately after group_removal_event.
Change-Id: I41e5f520f7d9475d0ec890d40eea172d9d66d06e
Irfan Sheriff [Wed, 6 Feb 2013 16:58:31 +0000 (08:58 -0800)]
am
203631b2: Merge "wifiSettings: Updating the networkinfo on supplicant event"
# By sunil duttu
# Via Gerrit Code Review (1) and sunil duttu (1)
* commit '
203631b24cd3947bcba2ab24789e4cfec487eff7':
wifiSettings: Updating the networkinfo on supplicant event
Irfan Sheriff [Wed, 6 Feb 2013 16:42:45 +0000 (16:42 +0000)]
Merge "wifiSettings: Updating the networkinfo on supplicant event"
sunil duttu [Wed, 6 Feb 2013 05:42:03 +0000 (11:12 +0530)]
wifiSettings: Updating the networkinfo on supplicant event
In framework we update the networkId on supplicant state change
these changes in the network info should be reflected in settings.
there by updating the networkinfo.
The problem we are facing without this fix is when we have single
saved AP profile Switching off the AP when we are in connecting
tate resulting in a behavior Where UI keep showing connecting
to that AP instead of showing it as out of range.
Change-Id: I04073b9a4068f4b75216ebfd431adc126583f15c
Jaewan Kim [Mon, 4 Feb 2013 06:36:17 +0000 (15:36 +0900)]
Fix Settings app crash after enabled multi-user
Bug:
8128225
Change-Id: I2918a5ec36e861a1ce4b2e67cf7607929732a7bf
Per Allard [Tue, 9 Oct 2012 12:18:55 +0000 (14:18 +0200)]
Prevent cursor from causing global reference leaks.
To fix this the ContentQueryMap needs to be closed
when onStop is called so any global references can
be reclaimed.
Change-Id: I0c679c10b0d75ab0aac2fe499563c57d934e318a
Dianne Hackborn [Fri, 25 Jan 2013 01:09:13 +0000 (17:09 -0800)]
am
505232be: Merge "Fix of Settings application sort crash"
# By Jia Arlan
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
505232be07e388c602529e14254df013637b16f2':
Fix of Settings application sort crash
Dianne Hackborn [Fri, 25 Jan 2013 01:02:58 +0000 (01:02 +0000)]
Merge "Fix of Settings application sort crash"
Irfan Sheriff [Thu, 24 Jan 2013 19:30:12 +0000 (11:30 -0800)]
am
b1ea6805: Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
# By Venkataraman Nerellapalli
# Via Gerrit Code Review (1) and Henrik Baard (1)
* commit '
b1ea6805d98bf953448db350ae33e53c3c3b797d':
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
Irfan Sheriff [Thu, 24 Jan 2013 18:50:05 +0000 (18:50 +0000)]
Merge "Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot"
Venkataraman Nerellapalli [Wed, 22 Feb 2012 09:12:46 +0000 (14:42 +0530)]
Option "None" replaced "Open" in Wi-Fi AP Settings of Wi-Fi Hotspot
First option in Wi-Fi AP settings of Wi-Fi Hotspot, "Open", is
changed to "None" since "Open" is not localized.
"None" (@string/wifi_security_none) already in use in other
Wi-Fi related screens and it is already localized in
the existing source code.
Change-Id: Ic79b20e3b0f094e064dd4758d8a03d67a208389a
Amith Yamasani [Wed, 23 Jan 2013 00:20:28 +0000 (16:20 -0800)]
am
7b8b6618: Merge "Fix for battery temperature display"
* commit '
7b8b6618219a2a9e1402858b513cf19628033204':
Fix for battery temperature display
Amith Yamasani [Wed, 23 Jan 2013 00:09:51 +0000 (00:09 +0000)]
Merge "Fix for battery temperature display"
Irfan Sheriff [Tue, 22 Jan 2013 23:12:22 +0000 (15:12 -0800)]
am
67995f97: Merge "Fix for F/C in WifiConfigInfo"
* commit '
67995f973dd524ba20983b9246a17a10746c4590':
Fix for F/C in WifiConfigInfo
Irfan Sheriff [Tue, 22 Jan 2013 22:58:19 +0000 (22:58 +0000)]
Merge "Fix for F/C in WifiConfigInfo"
Elliott Hughes [Tue, 22 Jan 2013 15:58:42 +0000 (07:58 -0800)]
am
375b6d98: Merge "Force closed at settings application when delete Misc files"
* commit '
375b6d985be9203fb221eb42810e586e196c34f8':
Force closed at settings application when delete Misc files
Elliott Hughes [Tue, 22 Jan 2013 15:43:05 +0000 (15:43 +0000)]
Merge "Force closed at settings application when delete Misc files"
Jia Arlan [Fri, 11 May 2012 08:27:07 +0000 (16:27 +0800)]
Fix of Settings application sort crash
The original implementation of compareTo function
will sometimes cause crash when the power usage list
above 32 items.
When comparing double values a proper comparison method
needs to be used. Using just subtraction does not take
into account NaN:S, infinities and +/-0 numbers. In certain
cirtumstances it seems that using subtraction causes
compareTo to return values that is not expected by the
sorting code and causes an illegal argument exception with
"Comparison method violates its general contract!".
This problem only happens if the sort code is called arrays
containing more than 32 (currently) due to how
ComparableTimSort works (call chain is Collections.sort ->
Arrays.sort(Object[]) -> ComparableTimSort.
Change-Id: If732f04797a3c8b2a43568c90bb73a1ec69a4c98
Shuhrat Dehkanov [Sat, 19 Jan 2013 12:50:06 +0000 (21:50 +0900)]
Fix for F/C in WifiConfigInfo
1. Turn off Wi-Fi
2. Open the dialer and input *#*#4636#*#*
3. Navigate to Wi-Fi information -> Wi-Fi config and observe "Unfortunately,
Settings has stopped" dialog.
Change-Id: I6ed59fc157e9bd8a46e00184b91a1a9f0412d198
Signed-off-by: Shuhrat Dehkanov <uzbmaster@gmail.com>
ikbae.kim [Fri, 18 Jan 2013 00:29:55 +0000 (16:29 -0800)]
Fix for battery temperature display
Centi temperature under zero degree is displayed with '-' sign.
Fix this using absolute value in centi degree display.
Change-Id: If4958d9c75c03d1f3ecfd14436fc80dc2fd57860
Predrag Stanojevic [Tue, 15 May 2012 13:01:02 +0000 (15:01 +0200)]
Force closed at settings application when delete Misc files
NullPointerException in MiscFilesHandler.java, missing check to
ensure that dir.list() does not return null.
Change-Id: I13aac19949826b385610fd1fee2befb411684023
Elliott Hughes [Thu, 20 Dec 2012 19:03:50 +0000 (11:03 -0800)]
am
f141594c: Merge "Correct check box visibility in Display / Brightness"
* commit '
f141594c0507dccd26e876bf2cd40ba15a34d68b':
Correct check box visibility in Display / Brightness
Elliott Hughes [Thu, 20 Dec 2012 00:11:15 +0000 (16:11 -0800)]
Merge "Correct check box visibility in Display / Brightness"
The Android Open Source Project [Tue, 18 Dec 2012 17:44:44 +0000 (09:44 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: I3ce5c84d693ade39f0ffa17313acf7b0df85b934
Benn Porscke [Wed, 17 Oct 2012 17:01:11 +0000 (19:01 +0200)]
Correct check box visibility in Display / Brightness
The check box for "Automatic brightness" should not be visible in
Brightness screen if the product configuration
config_automatic_brightness_available in config.xml is set to false.
Change-Id: I0d81137723d0eacd97aa88bf08b69e12dd4d73fa
Signed-off-by: Benn Porscke <benn.porscke@stericsson.com>
The Android Automerger [Tue, 18 Dec 2012 04:49:51 +0000 (20:49 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Jean Chalard [Mon, 17 Dec 2012 18:46:29 +0000 (10:46 -0800)]
am
d0a9d5b6: am
a374d816: Distinguish adding an already present word / cancelling
* commit '
d0a9d5b6e0b557c3796616791fd3ac93d12bcad9':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 18:44:36 +0000 (10:44 -0800)]
am
a374d816: Distinguish adding an already present word / cancelling
* commit '
a374d81605f4ba760db9613dd8aa8d8a0370dab8':
Distinguish adding an already present word / cancelling
Jean Chalard [Mon, 17 Dec 2012 05:58:04 +0000 (14:58 +0900)]
Distinguish adding an already present word / cancelling
Bug:
7725834
Change-Id: Iab3d1818f008a553868fb30e8460ea3f77c2de50
The Android Open Source Project [Fri, 14 Dec 2012 22:03:38 +0000 (14:03 -0800)]
Reconcile with jb-mr1.1-release - do not merge
Change-Id: Ida52d4ffe46a6805df540f684465dcd46db71945
The Android Automerger [Fri, 14 Dec 2012 21:56:20 +0000 (13:56 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Mike Cleron [Fri, 14 Dec 2012 19:00:28 +0000 (11:00 -0800)]
am
49ce96a1: am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
49ce96a14be5d414128b9e8ca12de281b610a57f':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 18:59:17 +0000 (10:59 -0800)]
am
1f597c87: Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
* commit '
1f597c8764b375bf87d411d11a29b2808e1d2ef9':
Call back to whom requested to add a word to the user dict
Mike Cleron [Fri, 14 Dec 2012 18:57:17 +0000 (10:57 -0800)]
Merge "Call back to whom requested to add a word to the user dict" into jb-mr1.1-dev
Jean Chalard [Thu, 13 Dec 2012 06:34:11 +0000 (15:34 +0900)]
Call back to whom requested to add a word to the user dict
Bug:
7725834
Change-Id: I2537754789f25fa978efd457979ed130806b9fbf
The Android Automerger [Thu, 13 Dec 2012 23:30:57 +0000 (15:30 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Irfan Sheriff [Thu, 13 Dec 2012 19:34:46 +0000 (11:34 -0800)]
am
878072a1: am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
878072a11a4f481e99cdc499752b72d14a03090d':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:32:51 +0000 (11:32 -0800)]
am
2a9cbb61: am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
2a9cbb61b3d8bae75b3a6e769dbe1c69c563f210':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:30:41 +0000 (11:30 -0800)]
am
f197105e: Merge "Fix wifi compareTo" into jb-mr1-dev
* commit '
f197105e3bd83a1f244cb690a1aa615624629961':
Fix wifi compareTo
Irfan Sheriff [Thu, 13 Dec 2012 19:28:47 +0000 (11:28 -0800)]
Merge "Fix wifi compareTo" into jb-mr1-dev
Irfan Sheriff [Thu, 29 Nov 2012 20:31:06 +0000 (12:31 -0800)]
Fix wifi compareTo
Bug:
7521354
Change-Id: I8d77594dacb56f17126f0e33ff6e47379f615d40
The Android Automerger [Wed, 12 Dec 2012 23:06:22 +0000 (15:06 -0800)]
merge in jb-mr1.1-release history after reset to jb-mr1.1-dev
Baligh Uddin [Wed, 12 Dec 2012 21:42:57 +0000 (13:42 -0800)]
am
efacd47f: am
5b4509b5: Import translations. DO NOT MERGE
* commit '
efacd47f4f2f9b5103cd3bf876b819904d881da6':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:40:49 +0000 (13:40 -0800)]
am
5b4509b5: Import translations. DO NOT MERGE
* commit '
5b4509b5adf2f3e12ffb7df4065fcdfd7e5e3f93':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:39:37 +0000 (13:39 -0800)]
am
92ff5ebe: Import translations. DO NOT MERGE
* commit '
92ff5ebe1e0bbb58b444c06d3e4b6887a3dbe120':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 12 Dec 2012 21:19:14 +0000 (13:19 -0800)]
Import translations. DO NOT MERGE
Change-Id: Iea0171a572174bec2168592681ee0f44d1a74083
Auto-generated-cl: translation import
Baligh Uddin [Wed, 12 Dec 2012 21:17:55 +0000 (13:17 -0800)]
Import translations. DO NOT MERGE
Change-Id: I4067263fdbd86c2b1037443ad7360fb17cabe56c
Auto-generated-cl: translation import
Amith Yamasani [Wed, 12 Dec 2012 17:55:56 +0000 (09:55 -0800)]
am
0df6a277: Merge "Grey out settings icon when it is in disabled state"
* commit '
0df6a2771d92e355e122195d3dceaf9a2b264ee5':
Grey out settings icon when it is in disabled state
Amith Yamasani [Wed, 12 Dec 2012 17:12:46 +0000 (09:12 -0800)]
Merge "Grey out settings icon when it is in disabled state"