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
The Android Automerger
889f907947
merge in klp-release history after reset to master
2013-07-25 06:01:50 -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
The Android Automerger
602b2bcc13
merge in klp-release history after reset to master
2013-07-24 06:02:20 -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
Baligh Uddin
118479463a
am 7d77f1ac
: (-s ours) am dd00b6b0
: Import translations. DO NOT MERGE
...
* commit '7d77f1ac9e012c2eb64328cf5f2cbeb20100b3e2':
Import translations. DO NOT MERGE
2013-07-23 10:04:32 -07:00
Baligh Uddin
82c5153577
am 0d8bde94
: am 6b939fe2
: Import translations. DO NOT MERGE
...
* commit '0d8bde94110681d3cc7288613c7e1204f436736c':
Import translations. DO NOT MERGE
2013-07-23 10:02:05 -07:00
Baligh Uddin
7d77f1ac9e
am dd00b6b0
: Import translations. DO NOT MERGE
...
* commit 'dd00b6b013dbacadb9db552b74551c452c8981c7':
Import translations. DO NOT MERGE
2013-07-23 10:02:05 -07:00
Baligh Uddin
0d8bde9411
am 6b939fe2
: Import translations. DO NOT MERGE
...
* commit '6b939fe2c8994acc3e304ec24639d07877a4b255':
Import translations. DO NOT MERGE
2013-07-23 10:00:14 -07:00
Baligh Uddin
e8f5c6fce5
Merge "Import translations. DO NOT MERGE"
2013-07-23 16:58:50 +00:00
Amith Yamasani
9ab062b5d5
Merge "Don't show Restrictions item if it has been disabled for the user."
2013-07-23 16:22:13 +00:00
The Android Automerger
ba7d6b2867
merge in klp-release history after reset to master
2013-07-23 06:01:53 -07:00
Satoshi Kataoka
f4f613596c
Merge "Stop redirecting the user dicitonary settings fragments"
2013-07-23 08:47:08 +00:00
Satoshi Kataoka
b355683253
Stop redirecting the user dicitonary settings fragments
...
Bug: 9755092
Change-Id: If4443412ca8f33e076edbe2c23c15b07b9b89fa9
2013-07-23 17:28:07 +09:00
Amith Yamasani
d5b1a291eb
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
2013-07-22 16:51:39 -07:00
Amith Yamasani
fae0db8f21
Merge "Remove extra padding in restrictions screen"
2013-07-22 18:23:02 +00:00
Amith Yamasani
4b5a5b7591
Remove extra padding in restrictions screen
...
Change-Id: Ib45d3161d9f569ba8eadf3abe4001b3047c92b74
2013-07-22 11:22:16 -07:00
Baligh Uddin
a2238e794d
Import translations. DO NOT MERGE
...
Change-Id: I090c37ae4557c04d92abb148272638d634631545
Auto-generated-cl: translation import
2013-07-22 11:13:41 -07:00
Baligh Uddin
dd00b6b013
Import translations. DO NOT MERGE
...
Change-Id: I8c68608b9494ea120e4620cfa3c0027298c0082a
Auto-generated-cl: translation import
2013-07-22 11:10:07 -07:00
Baligh Uddin
6b939fe2c8
Import translations. DO NOT MERGE
...
Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
2013-07-22 11:08:10 -07:00
The Android Automerger
4074558fe4
merge in klp-release history after reset to master
2013-07-22 06:02:14 -07:00
Satoshi Kataoka
a5c08c9a6f
Remove the locale spinner and show the current language
...
Bug: 8976598
Change-Id: I092141d0cc5c6d7af499ab8ceb69275923180e37
2013-07-22 16:34:41 +09:00
Baligh Uddin
f948ecdc61
am 50212d6c
: (-s ours) am a4a2194a
: am 68b87505
: Import translations. DO NOT MERGE
...
* commit '50212d6c5528de767be224a3b68f736ed3cbf65b':
Import translations. DO NOT MERGE
2013-07-19 16:02:37 -07:00
Baligh Uddin
ea9c15927d
am 8d9e3eb0
: (-s ours) am 8180a3a8
: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '8d9e3eb05fc0d39e39ec2fc9ad9233adb23eecb3':
Import translations. DO NOT MERGE
2013-07-19 16:02:35 -07:00
The Android Open Source Project
ad8b4b7250
am 58311f90
: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
...
* commit '58311f908300bff0174f84d06116225c5d985107':
Use ConnectivityManager for mobile provision url
2013-07-19 16:02:29 -07:00
Robert Greenwalt
ff303b4f81
am ea6b5d63
: am 275c1dff
: am 3c087a68
: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
...
* commit 'ea6b5d63d9100f014cdedf438f1750ed65b822b2':
Use ConnectivityManager for mobile provision url
2013-07-19 16:02:13 -07:00
Baligh Uddin
50212d6c55
am a4a2194a
: am 68b87505
: Import translations. DO NOT MERGE
...
* commit 'a4a2194a2f4beb9f29a96249e4b3b2a4f9e80c96':
Import translations. DO NOT MERGE
2013-07-19 15:18:54 -07:00
Baligh Uddin
a4a2194a2f
am 68b87505
: Import translations. DO NOT MERGE
...
* commit '68b87505548be6e6734d4cfe90c450b243950455':
Import translations. DO NOT MERGE
2013-07-19 15:16:17 -07:00
Baligh Uddin
8d9e3eb05f
am 8180a3a8
: Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
...
* commit '8180a3a86a36a7b9ed463f2f162e82ac06a9f1c4':
Import translations. DO NOT MERGE
2013-07-19 15:15:36 -07:00
Baligh Uddin
3fa1658e7f
Merge "Import translations. DO NOT MERGE"
2013-07-19 22:14:26 +00:00
Baligh Uddin
8180a3a86a
Merge "Import translations. DO NOT MERGE" into jb-mr2-ub-dev
2013-07-19 22:14:12 +00:00