OSDN Git Service
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
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 [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: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.
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"
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"
Lifu Tang [Mon, 29 Jul 2013 19:07:48 +0000 (12:07 -0700)]
Moved LocationSettings into location sub-package
Change-Id: I55b30df5b6889576539b8cb880e3032f417ddfd7
Jonathan Dixon [Mon, 29 Jul 2013 18:51:32 +0000 (18:51 +0000)]
Merge "Use WebViewFactory accessors to find experimental state"
Baligh Uddin [Mon, 29 Jul 2013 17:58:35 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie50baba5f53ab5e0f5894f9966c7abccdadf5a1d
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Jul 2013 17:54:51 +0000 (10:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0ca4e8fc4396ac28c5c6d7857a988a6191e36f2c
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Jul 2013 17:53:05 +0000 (10:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
Birdson_Chen [Fri, 26 Jul 2013 08:48:28 +0000 (16:48 +0800)]
Fix "Add Network" show last selected WiFi AP Dialog
When user taps Wi-Fi add network button, the pop-up dialog is not empty (it shows last selected WiFi AP Dialog).
The above is observed after the following steps:
- Launch Settings application
- Turn on Wi-Fi
- Select any Wi-Fi Access Point which is not connected previously and change to portrait mode
- Press Cancel from the pop-up and select Add Network icon in menu
Because the "Rotation" operation will cause WifiDialog re-creating and the current settings
of selected Wi-Fi Access Point is saved before WifiDialog destroyed.
Then, the saved Wi-Fi Access Point is displayed when user tap on "Add Network".
It need to clear the saved Wi-Fi Access Point when WifiDialog re-creating.
Change-Id: I3e93943e5bee405329e309c3ec88a35ee9cafc43
Zhihai Xu [Fri, 26 Jul 2013 20:33:16 +0000 (13:33 -0700)]
Add debug menu to enable btsnoop
bug:
8059358
Change-Id: Ib695aa5c9fff96d1676f718a2e3fb0bbf91eca04
Jonathan Dixon [Fri, 26 Jul 2013 02:54:31 +0000 (19:54 -0700)]
Use WebViewFactory accessors to find experimental state
This allows the knowledge of default on/off state to the contained in
the WebViewFactory class.
Change-Id: I5645b403d6232252ef36e45097c6a76e4b693dd4
Jean Chalard [Wed, 24 Jul 2013 08:21:45 +0000 (17:21 +0900)]
Fix a bug with multiple word insertion.
Bug:
7903831
Change-Id: I5202bc529a570292dd78d8503d8e2cc93b43d354
Baligh Uddin [Thu, 25 Jul 2013 03:00:05 +0000 (20:00 -0700)]
am
1d690c8a: (-s ours) am
92ce2809: am
542960fb: Import translations. DO NOT MERGE
* commit '
1d690c8a09603705052da022648ddd18a42de614':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:57:34 +0000 (19:57 -0700)]
am
92ce2809: am
542960fb: Import translations. DO NOT MERGE
* commit '
92ce280985b206acfbfef896db745bc4464a4632':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:56:36 +0000 (19:56 -0700)]
am
110a58ff: (-s ours) am
693abd31: Import translations. DO NOT MERGE
* commit '
110a58ff5d7b58b4a6a1711aeb74199be16e6933':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:54:17 +0000 (19:54 -0700)]
am
693abd31: Import translations. DO NOT MERGE
* commit '
693abd31368cd61266c6d055fbd6ead257eb12cd':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Jul 2013 02:53:29 +0000 (19:53 -0700)]
am
542960fb: Import translations. DO NOT MERGE
* commit '
542960fbbb0c122d7f3a75fd2d5c4710118417ee':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 24 Jul 2013 19:19:37 +0000 (12:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5d5b60ba9f4ebb071940cae5173ed386993dffbd
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:15:51 +0000 (12:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8dd4886617b33c56d57ef050c560a91748b68113
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Jul 2013 19:14:17 +0000 (12:14 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
Satoshi Kataoka [Wed, 24 Jul 2013 07:02:46 +0000 (07:02 +0000)]
Merge "Show all languages if user enables multiple subtypes"
Satoshi Kataoka [Tue, 23 Jul 2013 08:55:48 +0000 (17:55 +0900)]
Show all languages if user enables multiple subtypes
Bug:
8976598
Change-Id: Idbed69da04321a6f27033329686572d452d26f7a
Amith Yamasani [Wed, 24 Jul 2013 00:07:03 +0000 (00:07 +0000)]
Merge "Permission to manage device admins"
Alan Viverette [Tue, 23 Jul 2013 21:16:28 +0000 (21:16 +0000)]
Merge "Move accessibility settings to their own package"
Baligh Uddin [Tue, 23 Jul 2013 17:04:33 +0000 (10:04 -0700)]
am
82c51535: (-s ours) am
0d8bde94: am
6b939fe2: Import translations. DO NOT MERGE
* commit '
82c515357709d2411ceeae296fcc121f7e69d737':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:04:32 +0000 (10:04 -0700)]
am
7d77f1ac: (-s ours) am
dd00b6b0: Import translations. DO NOT MERGE
* commit '
7d77f1ac9e012c2eb64328cf5f2cbeb20100b3e2':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:02:05 +0000 (10:02 -0700)]
am
0d8bde94: am
6b939fe2: Import translations. DO NOT MERGE
* commit '
0d8bde94110681d3cc7288613c7e1204f436736c':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:02:05 +0000 (10:02 -0700)]
am
dd00b6b0: Import translations. DO NOT MERGE
* commit '
dd00b6b013dbacadb9db552b74551c452c8981c7':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 17:00:14 +0000 (10:00 -0700)]
am
6b939fe2: Import translations. DO NOT MERGE
* commit '
6b939fe2c8994acc3e304ec24639d07877a4b255':
Import translations. DO NOT MERGE
Baligh Uddin [Tue, 23 Jul 2013 16:58:50 +0000 (16:58 +0000)]
Merge "Import translations. DO NOT MERGE"
Amith Yamasani [Tue, 23 Jul 2013 16:22:13 +0000 (16:22 +0000)]
Merge "Don't show Restrictions item if it has been disabled for the user."
Satoshi Kataoka [Tue, 23 Jul 2013 08:47:07 +0000 (08:47 +0000)]
Merge "Stop redirecting the user dicitonary settings fragments"
Satoshi Kataoka [Tue, 23 Jul 2013 07:47:40 +0000 (16:47 +0900)]
Stop redirecting the user dicitonary settings fragments
Bug:
9755092
Change-Id: If4443412ca8f33e076edbe2c23c15b07b9b89fa9
Amith Yamasani [Mon, 22 Jul 2013 23:51:39 +0000 (16:51 -0700)]
Don't show Restrictions item if it has been disabled for the user.
Also don't show actual Restrictions content if the fragment was launched
through a different entry point.
Change-Id: I70cb76ca6f68a382e68219053e6f69e7f1fa0150
Amith Yamasani [Mon, 22 Jul 2013 18:23:02 +0000 (18:23 +0000)]
Merge "Remove extra padding in restrictions screen"