OSDN Git Service
The Android Open Source Project [Thu, 8 Aug 2013 21:14:12 +0000 (14:14 -0700)]
am
f4316f6d: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
f4316f6d5b9a87cd366af4f0f22ab8713ac1b8ad':
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Import translations. DO NOT MERGE
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Reset app preferences now resets all app ops.
Revert "Completely remove app ops activity."
Completely remove app ops activity.
Baligh Uddin [Thu, 8 Aug 2013 21:14:02 +0000 (14:14 -0700)]
am
b4d720f9: (-s ours) am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
b4d720f9d739f5618d6acef9bd87837700c908eb':
Import translations. DO NOT MERGE
Amith Yamasani [Thu, 8 Aug 2013 20:46:24 +0000 (20:46 +0000)]
Merge "Developer option to force RTL layout direction" into klp-dev
David Christie [Thu, 8 Aug 2013 20:19:05 +0000 (20:19 +0000)]
Merge "Modify Power Widget Gps Icon To Represent Location. Instead of directly controlling gps on/off, it will control master location switch on/off." into klp-dev
Svetoslav [Thu, 8 Aug 2013 19:35:36 +0000 (12:35 -0700)]
Fix a crash in accessibiility settings.
Change-Id: I27920668191742ab032de7b71c8f71cc35432e9f
David Christie [Wed, 7 Aug 2013 01:20:33 +0000 (18:20 -0700)]
Modify Power Widget Gps Icon To Represent Location.
Instead of directly controlling gps on/off, it will
control master location switch on/off.
Change-Id: I12a20fb77c12b5099172167821ff7ed00ba9ea7c
Amith Yamasani [Thu, 8 Aug 2013 03:14:44 +0000 (20:14 -0700)]
Developer option to force RTL layout direction
Sets a global setting and system property and forces a config change
when developer selects to force RTL screen layout direction.
Bug:
10244047
Change-Id: Id91e52be5e492515ff1eef3cbccfb08e944bfc92
Lifu Tang [Wed, 7 Aug 2013 18:18:16 +0000 (11:18 -0700)]
Displays a list of most recent location apps
Change-Id: I8e34ca8c30f308744022f17fac2444a496abd9e6
(cherry picked from commit
16ab0eca74751c331c1c74612548a27735a450b7)
Lifu Tang [Thu, 8 Aug 2013 00:55:39 +0000 (00:55 +0000)]
Merge "Finished the location settings"
Lifu Tang [Tue, 6 Aug 2013 20:31:50 +0000 (13:31 -0700)]
Finished the location settings
Change-Id: I333fcc74ad387ef6edaa558656d3eaa91feb8fe9
Jason Monk [Wed, 7 Aug 2013 19:10:42 +0000 (19:10 +0000)]
Merge "Restriction pin changes."
Geoffrey Borggaard [Wed, 7 Aug 2013 18:57:43 +0000 (14:57 -0400)]
Restriction pin changes.
Fixed bug in WirelessSettings where it was asking users for a PIN when
they weren't restricted. Did this by refactoring the preference level
pin checking into the superclass, where it checks for the restricted mode first.
Also pin protected changes to certificates for restricted users.
Change-Id: I8310fd39f0862159668318fc1360ec6859cc00d5
Baligh Uddin [Wed, 7 Aug 2013 17:26:15 +0000 (17:26 +0000)]
Merge "Import translations. DO NOT MERGE"
The Android Open Source Project [Wed, 7 Aug 2013 16:43:18 +0000 (09:43 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: I84e2f72513f3087ff4628a838efcf471e3695934
Satoshi Kataoka [Mon, 5 Aug 2013 09:00:49 +0000 (18:00 +0900)]
Change the refresh timing in input method settings
Bug:
8364845
Change-Id: I564a4b0d80cec5be670e2ca89e09d45944671082
Satoshi Kataoka [Wed, 7 Aug 2013 08:10:22 +0000 (17:10 +0900)]
Use isAsciiCapable when disabling system ime
Bug:
8364845
Change-Id: I2bb02b0c57b65ac3496b92d379e6d4ff21f338b1
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Conflicts:
res/values-nl/strings.xml
res/values-sw/strings.xml
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Baligh Uddin [Wed, 7 Aug 2013 03:05:46 +0000 (20:05 -0700)]
am
9a53339d: (-s ours) am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
9a53339dd6ea5c683629a5fff8837e7e59581680':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 03:04:13 +0000 (20:04 -0700)]
am
e211fd11: (-s ours) Import translations. DO NOT MERGE
* commit '
e211fd11c65c7db4e0225c774519604efa98889c':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 7 Aug 2013 02:55:54 +0000 (19:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I29d9c2b04800f28cd880e1470dca0d25ae74470f
Auto-generated-cl: translation import
Martijn Coenen [Wed, 7 Aug 2013 02:28:40 +0000 (02:28 +0000)]
Merge "NFC payment settings."
Martijn Coenen [Fri, 2 Aug 2013 01:13:33 +0000 (18:13 -0700)]
NFC payment settings.
First version, pending final UX.
Change-Id: I357e900c3f2012b35814ae197c49a8c9b97b7148
Lorenzo Colitti [Wed, 7 Aug 2013 00:32:43 +0000 (00:32 +0000)]
Merge "Display all link IP addresses, on different lines"
Amith Yamasani [Mon, 5 Aug 2013 17:07:23 +0000 (10:07 -0700)]
Single pane for 10" Settings
Change-Id: I960e4be3cfb19ffec4100f8766742d6fb17dda4a
Geoffrey Borggaard [Tue, 6 Aug 2013 22:03:44 +0000 (22:03 +0000)]
Merge "Pin protect more screens."
Geoffrey Borggaard [Fri, 2 Aug 2013 22:16:27 +0000 (18:16 -0400)]
Pin protect more screens.
When these screens are locked down with user restrictions,
it should prompt the user for the restrictions pin before allowing
access to the settings screen.
Change-Id: Iadbb087da2d9470b855ea0bea89f2da1ffb9e854
Alan Viverette [Tue, 6 Aug 2013 20:53:58 +0000 (13:53 -0700)]
Add captioning preferences screen
BUG:
9926077
Change-Id: Iea141d5d6fd0e4f134c36c51d89830b3c31abd09
Amith Yamasani [Tue, 6 Aug 2013 18:21:28 +0000 (18:21 +0000)]
Merge "Remove Restrictions UI"
Amith Yamasani [Tue, 6 Aug 2013 17:46:51 +0000 (10:46 -0700)]
Remove Restrictions UI
Bug:
10200097
Change-Id: Ifaa8aaa9aa5ad17a948bf18f184a131295112a30
Przemyslaw Szczepaniak [Tue, 6 Aug 2013 12:55:52 +0000 (13:55 +0100)]
State that TTS language is not supported if not in available list.
Bad TTS implementation of isLanguageAvailable may cause settings to
think that given language is available. This change adds additional
check, by searching locale in list of available locales returned
form TTS CheckVoiceData activity.
Bug:
9982002
Change-Id: Ic91cd1218349b8241e3f40f2343df52f3d900544
Baligh Uddin [Tue, 6 Aug 2013 04:46:55 +0000 (21:46 -0700)]
Import translations. DO NOT MERGE
Change-Id: I930e4bf6efae6d8552ccf739970539ff8820079f
Auto-generated-cl: translation import
Dianne Hackborn [Mon, 5 Aug 2013 23:52:32 +0000 (16:52 -0700)]
am
9a4f4656: am
a5ac281d: am
40557800: Fix issue #
10190597: "Any permission restrictions" is displayed after a...
* commit '
9a4f4656d752192db96348a488fe4968170eedb5':
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Dianne Hackborn [Mon, 5 Aug 2013 23:49:02 +0000 (16:49 -0700)]
am
a5ac281d: am
40557800: Fix issue #
10190597: "Any permission restrictions" is displayed after a...
* commit '
a5ac281db7103aef790a6141cd72fdbc22835552':
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Dianne Hackborn [Mon, 5 Aug 2013 23:45:48 +0000 (16:45 -0700)]
am
40557800: Fix issue #
10190597: "Any permission restrictions" is displayed after a...
* commit '
405578009471ab7908af26a813f7d2ef8c072a5c':
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
Dianne Hackborn [Mon, 5 Aug 2013 23:23:58 +0000 (16:23 -0700)]
Fix issue #
10190597: "Any permission restrictions" is displayed after a...
...newline in "Reset app preferences" dialog
Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Dianne Hackborn [Mon, 5 Aug 2013 18:20:06 +0000 (11:20 -0700)]
am
fc222b8d: am
8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit '
fc222b8d3aa716fe1596109ea960d57eb3aea1c5':
Fix app ops details not displaying permissions under certain conditions.
Dianne Hackborn [Mon, 5 Aug 2013 18:15:43 +0000 (11:15 -0700)]
am
8f00b771: Merge "Fix app ops details not displaying permissions under certain conditions."
* commit '
8f00b7711c48a102a70f9b7e6a563aa14b79f5a5':
Fix app ops details not displaying permissions under certain conditions.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Dianne Hackborn [Mon, 5 Aug 2013 18:11:11 +0000 (18:11 +0000)]
Merge "Fix app ops details not displaying permissions under certain conditions."
Amith Yamasani [Mon, 5 Aug 2013 18:04:22 +0000 (18:04 +0000)]
Merge "Add some missing fragments to the whitelist"
Amith Yamasani [Mon, 5 Aug 2013 18:02:16 +0000 (11:02 -0700)]
Add some missing fragments to the whitelist
Bug:
10184429
Change-Id: I4b4da5d5f2f4ec64992012e9d15799d195870a8a
Danny Baumann [Mon, 5 Aug 2013 12:28:58 +0000 (14:28 +0200)]
Fix app ops details not displaying permissions under certain conditions.
If there's a permission that is not granted, the loop is aborted instead
of just skipping said permission.
Change-Id: Icca567ebdd818f40ad6619f258c77590074d1deb
Przemyslaw Szczepaniak [Fri, 2 Aug 2013 16:06:41 +0000 (17:06 +0100)]
Disable TTS "Listen to the example" if not supported
If current TTS locale (most of the cases same as device locale) is
not supported by the TTS engine, field for setting synthesis speed
and "Listen to the example" will be disabled.
Added new field, "Default language status" to indicate level of support
for currently selected language. It can take one of three messages:
%s is fully supported
%s requires network connection
%s is not supported
Where %s is locale display name.
Added example string that will provide a fallback for example text
if not provided by Settings or TTS engine.
Change-Id: Ia2a920a71197a85d3812fc8df9dfed4ebe6b515f
Bug:
9982002
Dianne Hackborn [Sat, 3 Aug 2013 07:10:16 +0000 (00:10 -0700)]
am
ad38b60b: am
0a09b13c: am
a6683e0f: Reset app preferences now resets all app ops.
* commit '
ad38b60b372314f6266381207bd82144f21b1027':
Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 02:32:14 +0000 (19:32 -0700)]
am
0a09b13c: am
a6683e0f: Reset app preferences now resets all app ops.
* commit '
0a09b13c81bb0ebe556e46e3859a25805b2cbdcf':
Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 02:30:09 +0000 (19:30 -0700)]
am
a6683e0f: Reset app preferences now resets all app ops.
* commit '
a6683e0f4af75005ab5a1742d30df4bee071f725':
Reset app preferences now resets all app ops.
Dianne Hackborn [Sat, 3 Aug 2013 01:22:42 +0000 (18:22 -0700)]
Reset app preferences now resets all app ops.
Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Jeff Brown [Sat, 3 Aug 2013 01:11:31 +0000 (18:11 -0700)]
Add secure overlay displays in developer options.
Change-Id: I16fb0429de42443a95e8dfd03382bf8e0c2a6bb7
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:58:47 +0000 (17:58 -0700)]
am
a43e2701: (-s ours) am
4dce3456: am
034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '
a43e27016410910e9d11c09e981e58743ee9439e':
Completely remove app ops activity.
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:44:48 +0000 (17:44 -0700)]
am
4dce3456: am
034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '
4dce3456c7c858d5cec053cfd8a7f8ff2babec1d':
Completely remove app ops activity.
Jean-Baptiste Queru [Sat, 3 Aug 2013 00:39:03 +0000 (17:39 -0700)]
am
034b83e8: Reconcile with AOSP jb-mr2-dev - do not merge
* commit '
034b83e8668a0b26d1eccfc9fa433b8eae3e50a8':
Completely remove app ops activity.
Lifu Tang [Sat, 3 Aug 2013 00:04:23 +0000 (00:04 +0000)]
Merge "Added UI widgets for new location settings page"
Lifu Tang [Fri, 2 Aug 2013 00:23:10 +0000 (17:23 -0700)]
Added UI widgets for new location settings page
Change-Id: I87eee999a4dd0189609f58d6f3e4ffe517d63a0e
Dianne Hackborn [Fri, 2 Aug 2013 22:03:21 +0000 (15:03 -0700)]
am
45d4dce2: (-s ours) am
ca1b7458: Completely remove app ops activity.
* commit '
45d4dce29eea9fd503b15aedf4f63e38bf5fb0d7':
Completely remove app ops activity.
Baligh Uddin [Fri, 2 Aug 2013 21:51:33 +0000 (14:51 -0700)]
Merge commit '
0b849a70'
Resolve conflict.
Conflicts:
AndroidManifest.xml
Jean-Baptiste Queru [Fri, 2 Aug 2013 21:48:27 +0000 (14:48 -0700)]
Reconcile with AOSP jb-mr2-dev - do not merge
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Dianne Hackborn [Fri, 2 Aug 2013 21:41:18 +0000 (14:41 -0700)]
am
ca1b7458: Completely remove app ops activity.
* commit '
ca1b7458244191214172009d21eae2d04b6992f9':
Completely remove app ops activity.
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Geoffrey Borggaard [Fri, 2 Aug 2013 21:09:41 +0000 (21:09 +0000)]
Merge "Adds a base class for restricted settings"
Geoffrey Borggaard [Fri, 2 Aug 2013 19:03:22 +0000 (15:03 -0400)]
Adds a base class for restricted settings
Creates an easy way to ask for the restriction pin before
allowing access to a settings page. Does this to the WiFiSettings.
Change-Id: I49734f66e09b6449596412ecf6fc1113bf57ce7f
Dave Burke [Fri, 2 Aug 2013 20:25:35 +0000 (20:25 +0000)]
Revert "Completely remove app ops activity."
This reverts commit
1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.
Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Dave Burke [Fri, 2 Aug 2013 20:42:04 +0000 (13:42 -0700)]
am
1a32d477: am
136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
* commit '
1a32d477934399ca5331863fe17651c1dbf165b8':
Revert "Completely remove app ops activity."
Dave Burke [Fri, 2 Aug 2013 20:39:13 +0000 (13:39 -0700)]
am
136059f1: Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
* commit '
136059f118b580a3dc8f3023d1d19c8c56020a01':
Revert "Completely remove app ops activity."
Dave Burke [Fri, 2 Aug 2013 20:36:33 +0000 (20:36 +0000)]
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Dave Burke [Fri, 2 Aug 2013 20:25:35 +0000 (20:25 +0000)]
Revert "Completely remove app ops activity."
This reverts commit
1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.
Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Baligh Uddin [Fri, 2 Aug 2013 16:58:47 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Satoshi Kataoka [Fri, 2 Aug 2013 11:52:12 +0000 (20:52 +0900)]
Fix ime settings
Bug:
8364845
Change-Id: I1c9b30fa64682b905ef32c10bda0c9f93e8be975
Satoshi Kataoka [Wed, 31 Jul 2013 07:20:29 +0000 (16:20 +0900)]
Allow the users to disable system IME
Bug:
8364845
Change-Id: Icc5173a68fa00b2895c0768ff8f8b9dcf30e6171
Baligh Uddin [Thu, 1 Aug 2013 22:04:30 +0000 (15:04 -0700)]
Merge commit '
99d5938c'
Resolve conflict per ag/326799
Conflicts:
AndroidManifest.xml
Sascha Prueter [Thu, 1 Aug 2013 21:01:13 +0000 (14:01 -0700)]
am
df195650: am
d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit '
df195650191ba2d5a6090ff0721242b044b9b010':
Completely remove app ops activity.
Baligh Uddin [Thu, 1 Aug 2013 20:59:46 +0000 (13:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I619da6bcb74ebdb1bbb94878f62966870bf6ca64
Auto-generated-cl: translation import
Sascha Prueter [Thu, 1 Aug 2013 20:58:23 +0000 (13:58 -0700)]
am
d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit '
d346fce2687237d30677b69e66c76ba6cba8622b':
Completely remove app ops activity.
Dianne Hackborn [Mon, 1 Jul 2013 19:54:54 +0000 (12:54 -0700)]
Completely remove app ops activity.
Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Sascha Prueter [Thu, 1 Aug 2013 20:55:38 +0000 (20:55 +0000)]
Merge "Completely remove app ops activity." into jb-mr2-dev
David Christie [Thu, 1 Aug 2013 19:26:08 +0000 (19:26 +0000)]
Merge "Add Strings for the new high power location monitoring app op."
Amith Yamasani [Thu, 1 Aug 2013 17:26:14 +0000 (10:26 -0700)]
Add import for recently moved class
Change-Id: Iee617cf00271344bd6494824ca980c96e6df72bf
Amith Yamasani [Thu, 1 Aug 2013 17:18:39 +0000 (17:18 +0000)]
Merge "Whitelist fragments appropriate for an activity"
Lorenzo Colitti [Thu, 1 Aug 2013 08:30:07 +0000 (17:30 +0900)]
Display all link IP addresses, on different lines
Currently, the "IP address" field in the status page of the
settings app displays only the IP addesses on the base link.
Make it display the stacked link IP addresses as well.
Also, separate IP addresses via newlines instead of commas.
For example, display:
2a00:f40:e000:11c:cf93:ee9:5ad3:6686
192.0.0.4
instead of:
2a00:f40:e000:11c:cf93:ee9:5ad3:6686, 192.0.0.4
Change-Id: Ie78da142fea87735139adcefcfed7154b4f7fefb
Lifu Tang [Wed, 31 Jul 2013 01:34:35 +0000 (18:34 -0700)]
Implemented RadioButtonPreference
Change-Id: I047b6a95f3001b60e7500f85c25d507e1ca1ad0f
Amith Yamasani [Fri, 26 Jul 2013 20:38:41 +0000 (13:38 -0700)]
Whitelist fragments appropriate for an activity
Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
Lifu Tang [Tue, 30 Jul 2013 18:43:16 +0000 (18:43 +0000)]
Merge "Moved LocationSettings into location sub-package"
David Christie [Mon, 29 Jul 2013 23:01:21 +0000 (16:01 -0700)]
Add Strings for the new high power location monitoring app op.
Change-Id: I36b59fb0c18de1718c8fd2cfe30d713aed59c562
Baligh Uddin [Tue, 30 Jul 2013 17:28:21 +0000 (10:28 -0700)]
am
781458b3: (-s ours) am
bdf28a18: (-s ours) am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
781458b374bf0914ca96993b19f5cc52c572ff65':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 17:28:19 +0000 (10:28 -0700)]
am
539552e1: (-s ours) am
3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '
539552e17c08359f1c1fd07c8b730854a9c68487':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:19:30 +0000 (09:19 -0700)]
am
bdf28a18: (-s ours) am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
bdf28a1892e0116a8d6774d9c9d47033eb354368':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:15:32 +0000 (09:15 -0700)]
am
0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '
0cb57011065dd06e5faba2f4d72bbb1d31a3c309':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:12:51 +0000 (09:12 -0700)]
am
3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '
3ddbe519f44292e33292a9aea08a5894456a3118':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 30 Jul 2013 16:09:19 +0000 (16:09 +0000)]
Merge "Import translations. DO NOT MERGE"
Satoshi Kataoka [Tue, 30 Jul 2013 08:10:57 +0000 (08:10 +0000)]
Merge "Refactor ime settings"
Satoshi Kataoka [Mon, 29 Jul 2013 11:54:46 +0000 (20:54 +0900)]
Refactor ime settings
Bug:
8364845
Change-Id: Ie8db248314f2014278e1006b4b37aa64ce76f893
Satoshi Kataoka [Tue, 30 Jul 2013 03:52:42 +0000 (03:52 +0000)]
Merge "Fix the displayed name of the personal dictionary"
Satoshi Kataoka [Tue, 30 Jul 2013 02:54:15 +0000 (11:54 +0900)]
Fix the displayed name of the personal dictionary
Bug:
8976598
Change-Id: I3a8b50790b6da1658f32ff89df222127cb310da6
Robert Greenwalt [Mon, 29 Jul 2013 23:53:10 +0000 (16:53 -0700)]
am
5b7bf112: am
35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
* commit '
5b7bf112f55639668b34919dcf2ba19f2cfffaa3':
Fix "Add Network" show last selected WiFi AP Dialog
Robert Greenwalt [Mon, 29 Jul 2013 23:50:30 +0000 (16:50 -0700)]
am
35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
* commit '
35a2d796e3afbd7c2572c16f5c8655d89078198b':
Fix "Add Network" show last selected WiFi AP Dialog
Robert Greenwalt [Mon, 29 Jul 2013 23:43:33 +0000 (23:43 +0000)]
Merge "Fix "Add Network" show last selected WiFi AP Dialog"
OSDN Git Service
