Commit Graph

4853 Commits

Author SHA1 Message Date
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
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
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
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
Alan Viverette
36abe5d62c Merge "Move accessibility settings to their own package" 2013-07-23 21:16:29 +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
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
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
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
Robert Greenwalt
ea6b5d63d9 am 275c1dff: am 3c087a68: Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
* commit '275c1dff7dbec58588b0c696fc5ff4dc80ca6942':
  Use ConnectivityManager for mobile provision url
2013-07-19 13:43:04 -07:00
Amith Yamasani
a28787a1cb Remove spurious import
Change-Id: I91172626f4ec64c0fc7497f9f7d11244ca49a341
2013-07-19 13:21:35 -07:00
Amith Yamasani
0ee32a1254 Merge "Apply restrictions right away instead of on exit" 2013-07-19 19:49:16 +00:00
Robert Greenwalt
638bfd9e87 am ba32c249: resolved conflicts for merge of 4d9f670b to stage-aosp-master
* commit 'ba32c249addded770c288771748aa25d554352a0':
  Fix issue 52986: Wifi settings abnormal when screen rotation
2013-07-18 21:16:01 -07:00
Robert Greenwalt
ba32c249ad resolved conflicts for merge of 4d9f670b to stage-aosp-master
Change-Id: Ia5bb368dbbd857c6e201b821ae7c03a9f6f5006b
2013-07-18 20:52:47 -07:00
Alan Viverette
341ff66e03 Move accessibility settings to their own package
Change-Id: I5822bf4a81f5ade4ee0649ed30c2daa40d7e8fe2
2013-07-18 17:49:33 -07:00
Amith Yamasani
7eedcf4a50 Apply restrictions right away instead of on exit
Use usermanager to clear restrictions, as it needs to do a bunch of
book keeping.

Apply PIN restriction to master clear button.

Changing existing PIN now includes verifying the PIN, so it doesn't
need to be cleared here in Settings.

Removed automatic persisting of restrictions on receiving them unless
it is a restricted profile.

Make apps that are signed with platform certs immutable and ON.

Change-Id: Iffd1bf2eb0d18202fb66ddcf80668baa8e6b84ed
2013-07-18 11:37:32 -07:00
Robert Greenwalt
4929e912c0 Use ConnectivityManager for mobile provision url
bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
2013-07-16 14:39:50 -07:00
Amith Yamasani
6cb5630c17 Potential fix for Settings instability on x-large.
Bug: 9752185
Change-Id: I1b2af6661a601e1d487a35a53f5d01e58529a34d
2013-07-15 15:35:29 -07:00
Wink Saville
5c2075037d am eeb90735: am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit 'eeb90735dd7accfa34d77bcc8023412dab84bf9d':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:14:02 -07:00
Wink Saville
eeb90735dd am 95c2a4a4: am 80bfbd53: Merge "VZW wants the phoneNumber to be 10 zero\'s if there isn\'t one." into jb-mr2-dev
* commit '95c2a4a43039705f573b346026908369aa5df2b6':
  VZW wants the phoneNumber to be 10 zero's if there isn't one.
2013-07-12 12:03:54 -07:00
Wink Saville
b464478664 VZW wants the phoneNumber to be 10 zero's if there isn't one.
Bug: 9784059
Change-Id: I41bba908855648d2560440655d8a75a7cb2e0859
2013-07-10 22:19:26 -07:00
Chen Hong
3f9e2aec2e Fix issue 52986: Wifi settings abnormal when screen rotation
When checked "Show Advanced settings" in wifi setup wifi setup wizard, and rotate the phone to landscape, the advanced settings are gone, but the checkbox is still checked. It's because of checkbox is set click listener but not checked changed listener, it can't handle checkbox's status properly.

Change-Id: I2930cab4d0878c3d91db46560f837ca21d45da4d
2013-07-11 11:19:00 +08:00
Satoshi Kataoka
bc453345ce Merge "Use InputMethodUtils in input method settings" 2013-07-11 03:04:28 +00:00
Dianne Hackborn
1dd1a9363f Merge "Update to show new location monitoring op." 2013-07-10 18:46:04 +00:00
Satoshi Kataoka
1ecdb22b4e Use InputMethodUtils in input method settings
Change-Id: Ifd054c86b7099db3984e559feb5fadf1df5ca227
2013-07-11 02:20:04 +09:00
Brian Carlstrom
f32ba13a76 Add developer option for switching between Dalvik and ART
Change-Id: Ia5a8649e52b607b31429fca258a8fdf62217426c
2013-07-10 09:49:07 -07:00
Dianne Hackborn
15ab7758df Update to show new location monitoring op.
Change-Id: I921e95327c743c5b9b89bfe5a94beca67bfdb7de
2013-07-09 18:50:44 -07:00
Amith Yamasani
9e9c77c130 Fix accidental creation of restriction entry for required apps
When entering Settings->Restrictions, don't automatically query restriction entries
for required apps.

Bug: 9681399
Change-Id: Idcc773bf4793b3e7e2b328a15881b7ecf930c6c3
2013-07-09 11:28:40 -07:00
Wink Saville
41f3c55226 am 17f1fa42: am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings.
* commit '17f1fa4207e45276a11e52bbc65dc26a25911006':
  Add Manage mobile plan to Settings.
2013-07-01 17:01:28 -07:00
Wink Saville
17f1fa4207 am 7319f2b1: am 5d5a269f: Add Manage mobile plan to Settings.
* commit '7319f2b123772d72417cd09e8f3f04441c93d13d':
  Add Manage mobile plan to Settings.
2013-07-01 16:33:01 -07:00
Wink Saville
5d5a269f59 Add Manage mobile plan to Settings.
Bug: 9279964
Change-Id: I42c326a21e05aa301e9d974ed9ac1d59472780ec
2013-07-01 16:27:10 -07:00
Amith Yamasani
902d1bc484 Merge "Don't start the loader task if one is already running" 2013-06-28 22:35:54 +00:00
Amith Yamasani
ab72687b15 Don't start the loader task if one is already running
This should appease the monkeys.

Bug: 9619255
Change-Id: Idbac0bd86acafbdb636b0b18e09fcbb9eea15cc4
2013-06-28 15:30:08 -07:00
Robert Greenwalt
7a2466b511 am 50702355: am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '50702355f23d5e270727018c2af7cc76a1bd91eb':
  Dont enable Wi-Fi if it's not toggleable in flight mode
2013-06-28 10:48:40 -07:00
Robert Greenwalt
50702355f2 am 5d3ef571: am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit '5d3ef5715c43ca9c3c969deaf25c76a7d3e27624':
  Dont enable Wi-Fi if it's not toggleable in flight mode
2013-06-28 08:08:17 -07:00
Robert Greenwalt
5d3ef5715c am a1454529: Merge "Dont enable Wi-Fi if it\'s not toggleable in flight mode"
* commit 'a1454529c3eb6d0e87b254888abfea3bb714f7fe':
  Dont enable Wi-Fi if it's not toggleable in flight mode
2013-06-28 08:06:25 -07:00
Robert Greenwalt
a1454529c3 Merge "Dont enable Wi-Fi if it's not toggleable in flight mode" 2013-06-28 15:05:16 +00:00
Johan Redestig
2acaf22ad1 Dont enable Wi-Fi if it's not toggleable in flight mode
Dont enable Wi-Fi if it's not toggleable in flight mode
by restoring the return which was removed by
e78c187905

Change-Id: I8ca5a3e9b3f36f148f08ce97b8a2b854bf7de21c
2013-06-28 10:37:07 +02:00
Elliott Hughes
74a14ed364 am 29bed78d: am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '29bed78df624789d951eb6f491742bd29d7859ff':
  Use SimpleDateFormat for time zone formatting.
2013-06-27 15:02:35 -07:00
Elliott Hughes
29bed78df6 am add37ef4: am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit 'add37ef4f2721bc791319e6794b310cfbd802533':
  Use SimpleDateFormat for time zone formatting.
2013-06-27 14:59:08 -07:00
Elliott Hughes
add37ef4f2 am 5f6e4339: Merge "Use SimpleDateFormat for time zone formatting."
* commit '5f6e43394dd89432b241f32cd2c96d87c3ad5040':
  Use SimpleDateFormat for time zone formatting.
2013-06-27 14:55:54 -07:00
Satoshi Kataoka
f64e3b7b92 Improve the language list in the personal dictionary
Bug: 9117704
Change-Id: I0b0fdb9418baa634eeaf4b8a65aebabe291aa005
2013-06-27 20:29:01 +09:00
Amith Yamasani
18d2b2816a Merge "Single-user restrictions" 2013-06-26 23:05:38 +00:00