Commit Graph

4718 Commits

Author SHA1 Message Date
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
Amith Yamasani
0ca80fe4cd Single-user restrictions
New restrictions panel for restricting list of available apps for the user.
Apps that support restrictions can also be configured here.
Restrictions screen is PIN protected and will ask you to create a PIN the
first time you use it.

Change-Id: I7a5267df4272521ad80e6a8b6a18932d07179eb8
2013-06-25 16:49:38 -07:00
Elliott Hughes
d3b689984f am 2295035a: am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '2295035a85b02d1b876bb76093cfcafa890ff0fb':
  Clamp date setting for the SetupWizard as well as Settings.
2013-06-25 16:30:45 -07:00
Elliott Hughes
81faf895d7 Use SimpleDateFormat for time zone formatting.
There's no need to do time zone formatting manually.

Change-Id: Ibef222d11d04a327e9ef64ddc48322558028555d
2013-06-25 10:16:27 -07:00
Elliott Hughes
2295035a85 am b17fef80: am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit 'b17fef801f4c26fdf116d706c3b9e30b522cb229':
  Clamp date setting for the SetupWizard as well as Settings.
2013-06-25 09:57:43 -07:00
Elliott Hughes
b17fef801f am 02e23fb0: Merge "Clamp date setting for the SetupWizard as well as Settings."
* commit '02e23fb0eb96280c7874d8b5d65b56bb9fc284ba':
  Clamp date setting for the SetupWizard as well as Settings.
2013-06-25 09:56:06 -07:00
Dianne Hackborn
c911bbe247 Merge "Use FastPrintWriter." 2013-06-25 01:19:25 +00:00
Dianne Hackborn
6e28a4d70a Use FastPrintWriter.
Change-Id: If7f77185d7a76f14ac63f9c2af9911fb67ad97d9
2013-06-24 17:54:06 -07:00
Svetoslav
51a671c3f2 Fix broken strings in Settings
Change-Id: I97b3b140b96894982d5d7753b6b3fc6dde2994a8
2013-06-24 17:49:38 -07:00
Elliott Hughes
b85d48fa43 Clamp date setting for the SetupWizard as well as Settings.
We fixed this for Settings in 7ccfa0614c,
but @sonymobile.com point out that it's still broken for SetupWizard.

Change-Id: I59348200105246f3ed7c0892e5f19b901d3e95ac
2013-06-24 17:24:01 -07:00
Svetoslav Ganov
d4c7b497fb Print - Settings
Change-Id: Id662a41fb189823c6d06aafc7e98996f3ef6c930
2013-06-21 17:46:37 -07:00
Dianne Hackborn
ef2cfa7ad3 am 7f74dea7: am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '7f74dea7a833b7c9c0370ce81decc21d44bda7b3':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
2013-06-20 14:42:18 -07:00
Dianne Hackborn
7f74dea7a8 am 67571084: am 5da4c907: Merge "Fix issue #9486022: Disabled Apps column doesn\'t always show up in Manage Apps" into jb-mr2-dev
* commit '675710849a1209f929e387b19e3a7705f702f5bd':
  Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
2013-06-20 14:40:57 -07:00
Satoshi Kataoka
71c915b672 Show subtype locales in the personal dictionary
...and change the destination of the intent

Bug: 9117704
Bug: 8856930

Change-Id: I39e55d2c5ca9a602f9a586625dcf25d5fb065a0a
2013-06-20 19:28:34 +09:00
Dianne Hackborn
f5f08628cc Fix issue #9486022: Disabled Apps column doesn't always show up in Manage Apps
We need to resume the current tab before checking to see if
there are any disabled apps and deciding from that the number
of tabs to show.

Change-Id: I95037f15ff7a97f0234143d10ebcee79224a3114
2013-06-19 17:01:51 -07:00
Dianne Hackborn
d55de16354 Merge "Following renaming of battery stats." 2013-06-15 00:39:49 +00:00
Chong Zhang
8d42ac22de Merge "wifi-display: use new getDisplays() method of WifiDisplayStatus" 2013-06-15 00:36:34 +00:00
Chong Zhang
94417b41c0 wifi-display: use new getDisplays() method of WifiDisplayStatus
which returns a list of all displays including currently availabe
and remembered ones, each display has properties indicating it's
availability, remembered and canConnect status

Bug 9229799

Change-Id: I1f74b9c41abdfecc10e7bc1853929e982c44be2f
2013-06-14 15:48:02 -07:00
Dianne Hackborn
b05bc1454a Following renaming of battery stats.
Change-Id: I889680dddf18fb2a480017199cc072a2d1469c27
2013-06-14 15:22:18 -07:00
Jean Chalard
8385f1c622 Fix a bug where a user dict entry is too long
Since there is a maxLength attribute to the text field, if the
requested entry is too long for the text field it will be truncated,
then setSelection will crash with an IOOB exception.

Bug: 9410958
Change-Id: I7e916b4d77d338f49db7d3dab4e536d27ec76bc1
2013-06-14 13:10:07 +09:00
Amith Yamasani
7b5aa58de8 Merge "Don't show tether settings in shortcut picker" 2013-06-11 18:28:04 +00:00
Amith Yamasani
394eaa21e7 Don't show tether settings in shortcut picker
On devices that don't have tethering options, don't allow user
to create a shortcut to the tether settings.

Bug: 6865610
Change-Id: I2ebbd6ef98391ef3fe74130570bd9b70108a2aa9
2013-06-11 11:16:10 -07:00
Vinit Deshapnde
343bc6176e Merge "Fix an NPE in WifiP2pSettings UI" 2013-06-11 17:45:54 +00:00
Amith Yamasani
6cc92aff1c Merge "Remove Battery settings if battery is not present" 2013-06-11 17:10:50 +00:00
Vinit Deshapnde
1a9819df16 Fix an NPE in WifiP2pSettings UI
The NPE happens becase we save a references to the group that is to be
deleted, when the confirmation dialog is being shown to the user. We lose
that reference if orientation is changed (because the UI creates a new
WifiP2pSettings to interact with).

The fix is to save the name of the group that is being deleted in
persistent store, and re-select the group based on that.

Bug: 9004915
Change-Id: I1387a5b17fa2773748f4c8b34adddfc9516cfcf3
2013-06-10 12:28:48 -07:00
Chong Zhang
02717449e6 Merge "wifi-display: change string to "In use" instead of "Busy"" 2013-06-07 19:20:16 +00:00
Amith Yamasani
47d8a5f13b am 893bdcd5: am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev
* commit '893bdcd5312f314da7925f22345cb4efe0e1c442':
  Allow hidden apps to opt-out
2013-06-07 10:49:23 -07:00
Amith Yamasani
893bdcd531 am 1b79c5c8: Merge "Allow hidden apps to opt-out" into jb-mr2-dev
* commit '1b79c5c804e53fc63f602a5c4dcd876a0d2c7ab9':
  Allow hidden apps to opt-out
2013-06-07 10:47:24 -07:00
Amith Yamasani
1b79c5c804 Merge "Allow hidden apps to opt-out" into jb-mr2-dev 2013-06-07 17:45:26 +00:00
Chong Zhang
5e1367f63a wifi-display: change string to "In use" instead of "Busy"
Bug 9229799

Change-Id: Id87987812e3d65ef2a2196668f5d67b4417368d3
2013-06-07 10:29:34 -07:00
Jaewan Kim
a3fe77b2e4 Remove Battery settings if battery is not present
Bug: 8051556
Change-Id: I044b24e26dc3d6351c19168a2fcd085a1e761796
2013-06-07 14:32:02 +09:00
Chong Zhang
d390f6c6c6 Merge "wifi-display: grey out display if it's unavailable" 2013-06-07 03:28:46 +00:00
Alex Klyubin
48d6b270dd am 3c862fb5: am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev
* commit '3c862fb5b66666c96011d065af5d7bf14ed1a2fc':
  Permit deactivation of malformed Device Admins.
2013-06-06 17:54:40 -07:00
Alex Klyubin
3c862fb5b6 am 681b21f3: resolved conflicts for merge of 5d21820a to jb-mr2-dev
* commit '681b21f3e4ef0a63d982eca0e9d1896422bc30ff':
  Permit deactivation of malformed Device Admins.
2013-06-06 17:51:57 -07:00
Chong Zhang
017d82af8a wifi-display: grey out display if it's unavailable
Bug 9229799

Change-Id: I981423257a6ddff9deaea7f8339944cf46c1a0ba
2013-06-06 15:50:57 -07:00
Alex Klyubin
681b21f3e4 resolved conflicts for merge of 5d21820a to jb-mr2-dev
Change-Id: If371a4571c5440ce2a0b4339f97893bf78832b31
2013-06-06 15:45:23 -07:00