Commit Graph

10904 Commits

Author SHA1 Message Date
Baligh Uddin
06a9300f97 Merge "Import translations. DO NOT MERGE" 2013-08-02 16:58:47 +00:00
Satoshi Kataoka
d3e8bed913 Fix ime settings
Bug: 8364845
Change-Id: I1c9b30fa64682b905ef32c10bda0c9f93e8be975
2013-08-02 20:52:12 +09:00
Satoshi Kataoka
c6fc8e46f2 Allow the users to disable system IME
Bug: 8364845
Change-Id: Icc5173a68fa00b2895c0768ff8f8b9dcf30e6171
2013-08-02 20:06:34 +09:00
Baligh Uddin
15885f4998 Merge commit '99d5938c'
Resolve conflict per ag/326799

Conflicts:
	AndroidManifest.xml
2013-08-01 15:04:30 -07:00
Sascha Prueter
99d5938cf2 am df195650: am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit 'df195650191ba2d5a6090ff0721242b044b9b010':
  Completely remove app ops activity.
2013-08-01 14:01:13 -07:00
Baligh Uddin
21914a7c9c Import translations. DO NOT MERGE
Change-Id: I619da6bcb74ebdb1bbb94878f62966870bf6ca64
Auto-generated-cl: translation import
2013-08-01 13:59:46 -07:00
Sascha Prueter
df19565019 am d346fce2: Merge "Completely remove app ops activity." into jb-mr2-dev
* commit 'd346fce2687237d30677b69e66c76ba6cba8622b':
  Completely remove app ops activity.
2013-08-01 13:58:23 -07:00
Sascha Prueter
d346fce268 Merge "Completely remove app ops activity." into jb-mr2-dev 2013-08-01 20:55:38 +00:00
David Christie
34605e1dcf Merge "Add Strings for the new high power location monitoring app op." 2013-08-01 19:26:08 +00:00
Amith Yamasani
e990420f52 Add import for recently moved class
Change-Id: Iee617cf00271344bd6494824ca980c96e6df72bf
2013-08-01 10:26:14 -07:00
Amith Yamasani
a7fd2a5d66 Merge "Whitelist fragments appropriate for an activity" 2013-08-01 17:18:39 +00:00
Lifu Tang
fc86f69d3b Implemented RadioButtonPreference
Change-Id: I047b6a95f3001b60e7500f85c25d507e1ca1ad0f
2013-07-31 11:07:27 -07:00
Amith Yamasani
a677ee210c Whitelist fragments appropriate for an activity
Change-Id: If4f8c4e9d9949b652946cffe0ebb09b587e5a042
2013-07-30 16:24:58 -07:00
Lifu Tang
040ce60582 Merge "Moved LocationSettings into location sub-package" 2013-07-30 18:43:16 +00:00
David Christie
4a06e4cc43 Add Strings for the new high power location monitoring app op.
Change-Id: I36b59fb0c18de1718c8fd2cfe30d713aed59c562
2013-07-30 11:27:55 -07:00
Baligh Uddin
44214d46ec am 781458b3: (-s ours) am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '781458b374bf0914ca96993b19f5cc52c572ff65':
  Import translations. DO NOT MERGE
2013-07-30 10:28:21 -07:00
Baligh Uddin
0d62b245f5 am 539552e1: (-s ours) am 3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '539552e17c08359f1c1fd07c8b730854a9c68487':
  Import translations. DO NOT MERGE
2013-07-30 10:28:19 -07:00
Baligh Uddin
781458b374 am bdf28a18: (-s ours) am 0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit 'bdf28a1892e0116a8d6774d9c9d47033eb354368':
  Import translations. DO NOT MERGE
2013-07-30 09:19:30 -07:00
Baligh Uddin
bdf28a1892 am 0cb57011: (-s ours) Import translations. DO NOT MERGE
* commit '0cb57011065dd06e5faba2f4d72bbb1d31a3c309':
  Import translations. DO NOT MERGE
2013-07-30 09:15:32 -07:00
Baligh Uddin
539552e17c am 3ddbe519: (-s ours) Import translations. DO NOT MERGE
* commit '3ddbe519f44292e33292a9aea08a5894456a3118':
  Import translations. DO NOT MERGE
2013-07-30 09:12:51 -07:00
Baligh Uddin
9c93e5ab74 Merge "Import translations. DO NOT MERGE" 2013-07-30 16:09:20 +00:00
Satoshi Kataoka
4e46424761 Merge "Refactor ime settings" 2013-07-30 08:10:58 +00:00
Satoshi Kataoka
993f6ecf40 Refactor ime settings
Bug: 8364845
Change-Id: Ie8db248314f2014278e1006b4b37aa64ce76f893
2013-07-30 16:21:27 +09:00
Satoshi Kataoka
1ccd78cd68 Merge "Fix the displayed name of the personal dictionary" 2013-07-30 03:52:42 +00:00
Satoshi Kataoka
4b6603cb79 Fix the displayed name of the personal dictionary
Bug: 8976598
Change-Id: I3a8b50790b6da1658f32ff89df222127cb310da6
2013-07-30 12:42:43 +09:00
Robert Greenwalt
7e9d6a8e55 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
2013-07-29 16:53:10 -07:00
Robert Greenwalt
5b7bf112f5 am 35a2d796: Merge "Fix "Add Network" show last selected WiFi AP Dialog"
* commit '35a2d796e3afbd7c2572c16f5c8655d89078198b':
  Fix "Add Network" show last selected WiFi AP Dialog
2013-07-29 16:50:30 -07:00
Robert Greenwalt
35a2d796e3 Merge "Fix "Add Network" show last selected WiFi AP Dialog" 2013-07-29 23:43:33 +00:00
Lifu Tang
83ab7c932e Moved LocationSettings into location sub-package
Change-Id: I55b30df5b6889576539b8cb880e3032f417ddfd7
2013-07-29 12:13:48 -07:00
Jonathan Dixon
0125d032ef Merge "Use WebViewFactory accessors to find experimental state" 2013-07-29 18:51:33 +00:00
Baligh Uddin
21c0ea4f69 Import translations. DO NOT MERGE
Change-Id: Ie50baba5f53ab5e0f5894f9966c7abccdadf5a1d
Auto-generated-cl: translation import
2013-07-29 10:58:35 -07:00
Baligh Uddin
3ddbe519f4 Import translations. DO NOT MERGE
Change-Id: I0ca4e8fc4396ac28c5c6d7857a988a6191e36f2c
Auto-generated-cl: translation import
2013-07-29 10:54:51 -07:00
Baligh Uddin
0cb5701106 Import translations. DO NOT MERGE
Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
2013-07-29 10:53:05 -07:00
Birdson_Chen
2dcf6083f7 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
2013-07-29 10:37:36 +08:00
Zhihai Xu
84bbb548a6 Add debug menu to enable btsnoop
bug: 8059358
Change-Id: Ib695aa5c9fff96d1676f718a2e3fb0bbf91eca04
2013-07-26 13:33:16 -07:00
Jonathan Dixon
c79f26f1ec 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
2013-07-25 19:54:31 -07:00
Jean Chalard
1fb887f264 Fix a bug with multiple word insertion.
Bug: 7903831
Change-Id: I5202bc529a570292dd78d8503d8e2cc93b43d354
2013-07-25 16:07:31 +09:00
Baligh Uddin
895fedcb04 am 1d690c8a: (-s ours) am 92ce2809: am 542960fb: Import translations. DO NOT MERGE
* commit '1d690c8a09603705052da022648ddd18a42de614':
  Import translations. DO NOT MERGE
2013-07-24 20:00:05 -07:00
Baligh Uddin
1d690c8a09 am 92ce2809: am 542960fb: Import translations. DO NOT MERGE
* commit '92ce280985b206acfbfef896db745bc4464a4632':
  Import translations. DO NOT MERGE
2013-07-24 19:57:34 -07:00
Baligh Uddin
e1d372455d am 110a58ff: (-s ours) am 693abd31: Import translations. DO NOT MERGE
* commit '110a58ff5d7b58b4a6a1711aeb74199be16e6933':
  Import translations. DO NOT MERGE
2013-07-24 19:56:36 -07:00
Baligh Uddin
110a58ff5d am 693abd31: Import translations. DO NOT MERGE
* commit '693abd31368cd61266c6d055fbd6ead257eb12cd':
  Import translations. DO NOT MERGE
2013-07-24 19:54:17 -07:00
Baligh Uddin
92ce280985 am 542960fb: Import translations. DO NOT MERGE
* commit '542960fbbb0c122d7f3a75fd2d5c4710118417ee':
  Import translations. DO NOT MERGE
2013-07-24 19:53:29 -07:00
Baligh Uddin
721edda55d Import translations. DO NOT MERGE
Change-Id: I5d5b60ba9f4ebb071940cae5173ed386993dffbd
Auto-generated-cl: translation import
2013-07-24 12:19:37 -07:00
Baligh Uddin
693abd3136 Import translations. DO NOT MERGE
Change-Id: I8dd4886617b33c56d57ef050c560a91748b68113
Auto-generated-cl: translation import
2013-07-24 12:15:51 -07:00
Baligh Uddin
542960fbbb Import translations. DO NOT MERGE
Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
2013-07-24 12:14:17 -07:00
Satoshi Kataoka
cb8c084baf Merge "Show all languages if user enables multiple subtypes" 2013-07-24 07:02:46 +00:00
Satoshi Kataoka
bac2974dd0 Show all languages if user enables multiple subtypes
Bug: 8976598
Change-Id: Idbed69da04321a6f27033329686572d452d26f7a
2013-07-24 15:26:26 +09:00
Amith Yamasani
e5965f4a06 Merge "Permission to manage device admins" 2013-07-24 00:07:03 +00:00
Alan Viverette
36abe5d62c Merge "Move accessibility settings to their own package" 2013-07-23 21:16:29 +00:00
Baligh Uddin
efea0a9e75 am 82c51535: (-s ours) am 0d8bde94: am 6b939fe2: Import translations. DO NOT MERGE
* commit '82c515357709d2411ceeae296fcc121f7e69d737':
  Import translations. DO NOT MERGE
2013-07-23 10:04:33 -07:00