OSDN Git Service

android-x86/packages-apps-Settings.git
11 years agoMerge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev
Amith Yamasani [Tue, 9 Apr 2013 18:09:40 +0000 (18:09 +0000)]
Merge "Send app restrictions broadcast to stopped apps as well" into jb-mr2-dev

11 years agoSend app restrictions broadcast to stopped apps as well
Amith Yamasani [Tue, 9 Apr 2013 18:05:18 +0000 (11:05 -0700)]
Send app restrictions broadcast to stopped apps as well

Otherwise the restrictions won't be shown for apps that haven't been
launched yet.

Bug: 8577600
Change-Id: I1d0d93553456dfedfb749e3d8262911af4362a80

11 years agoPotential fix for a monkey-related NPE
Amith Yamasani [Tue, 9 Apr 2013 17:22:47 +0000 (10:22 -0700)]
Potential fix for a monkey-related NPE

Cache the content resolver so that async callbacks, events can
continue to get the cntent resolver when detached from the activity.
This should help with stability.

Bug: 8005271

Change-Id: Ia566bc312ce678b438004bdf4ed7537ac1604608

11 years agoMerge "Allow multiuser use of keystore" into jb-mr2-dev
Kenny Root [Mon, 8 Apr 2013 17:58:37 +0000 (17:58 +0000)]
Merge "Allow multiuser use of keystore" into jb-mr2-dev

11 years agoAllow multiuser use of keystore
Kenny Root [Mon, 8 Apr 2013 16:56:05 +0000 (09:56 -0700)]
Allow multiuser use of keystore

Since keystore has been refactored to let muliple users use it
simultaneously, we can remove all the restrictions put into place to
prevent it.

(cherry picked from commit cc48b0104e4d81592055a578a33f2a59f29bf907)

Bug: 7249554
Change-Id: I419474151380c29e49e50451befbbdf3af65b175

11 years agoFix "no notification listeners" text.
Daniel Sandler [Mon, 8 Apr 2013 16:01:33 +0000 (12:01 -0400)]
Fix "no notification listeners" text.

Bug: 8454150
Change-Id: I6b02367e2be9f31fdf0a54d7fc0c49f8c82922d7

11 years agoInstalledAppDetails: allow revocable permission.
Nick Kralevich [Sat, 6 Apr 2013 01:36:15 +0000 (18:36 -0700)]
InstalledAppDetails: allow revocable permission.

Modify the Settings app so that a user can revoke permissions,
using the new API added in AppSecurityPermissions.

Bug: 8332307
Change-Id: I4d6c10877e2c3cc284dbf9a43f79697914c0b192

11 years agoNotification listeners can be enabled in Settings>Security.
Daniel Sandler [Thu, 4 Apr 2013 18:30:04 +0000 (14:30 -0400)]
Notification listeners can be enabled in Settings>Security.

Also known as android.settings.ACTION_NOTIFICATION_LISTENER_SETTINGS.

Bug: 8454150
Change-Id: I0c2433bf58ba4c78cd461326bd014535c7f67578

11 years agoReference new StatusBarNotification and INotificationListener packages.
Daniel Sandler [Sat, 23 Mar 2013 01:29:51 +0000 (18:29 -0700)]
Reference new StatusBarNotification and INotificationListener packages.

Requires change I1be46f82 in f/b.

Bug: 8199624
Change-Id: I2ebf7fde793dd932c5fadb308f8a0b93e18d9afa

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Fri, 5 Apr 2013 18:48:15 +0000 (18:48 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 5 Apr 2013 18:07:06 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ide4cc0e303747966dd29a5c849a2d9023b92e098
Auto-generated-cl: translation import

11 years agoMerge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev
Kristian Monsen [Fri, 5 Apr 2013 17:41:34 +0000 (17:41 +0000)]
Merge "Adding developer toggle for using Chromium WebView." into jb-mr2-dev

11 years agoMerge "More fix for bug #8505156 WiFi properties dialog is having some issues in...
Fabrice Di Meglio [Thu, 4 Apr 2013 17:59:50 +0000 (17:59 +0000)]
Merge "More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 3 Apr 2013 18:14:39 +0000 (11:14 -0700)]
Import translations. DO NOT MERGE

Change-Id: I5b8551dbf8daff54103023c68f8214b135dd07c1
Auto-generated-cl: translation import

11 years agoMore fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode
Fabrice Di Meglio [Wed, 3 Apr 2013 01:36:43 +0000 (18:36 -0700)]
More fix for bug #8505156 WiFi properties dialog is having some issues in RTL mode

- use setPaddingRelative() instead of setPadding()
- add missing android:textAlignment="viewStart"

Change-Id: I8b981fb64686067de5998e4e218b04126bf2b2f8

11 years agoMerge "pre-provide the mvno data of the edited apn" into jb-mr2-dev
Robert Greenwalt [Tue, 2 Apr 2013 19:20:12 +0000 (19:20 +0000)]
Merge "pre-provide the mvno data of the edited apn" into jb-mr2-dev

11 years agopre-provide the mvno data of the edited apn
Sungmin Choi [Thu, 21 Mar 2013 06:42:27 +0000 (15:42 +0900)]
pre-provide the mvno data of the edited apn

For mvno, user can add or edit mvno data field.
Pre-provide the mvno data of the edited apn when the user selects
one of the mvno types.
For example if user choose gid, populate the data field with the
current sim's gid1 data, or if user choose the SPN option, fill
in data with the current carrier string. If IMSI, fill in imsi data.

Change-Id: I1bc280054cc7cd37e78a279866cefd62872a19fb

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 1 Apr 2013 19:37:24 +0000 (19:37 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls."...
Maggie Benthall [Mon, 1 Apr 2013 18:50:29 +0000 (18:50 +0000)]
Merge "When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls." into jb-mr2-dev

11 years agoBetter app filtering for limited users
Amith Yamasani [Mon, 1 Apr 2013 05:40:26 +0000 (22:40 -0700)]
Better app filtering for limited users

Show all system apps that have launchers and widgets.
Show all downloaded apps.
Remove dupes by package name.

Change-Id: Ief59b057e55a55e48ef48c5a638f6daf6a952e4e

11 years agoImplement proper settings restrictions
Amith Yamasani [Mon, 1 Apr 2013 00:50:55 +0000 (17:50 -0700)]
Implement proper settings restrictions

Settings restrictions for limited users translate to user
restrictions specified in UserManager. Added required strings.
TODO: Add NFC restriction.

Change-Id: If1f81319131855f5dc1b27fe5bd54a4fef616d7f

11 years agoRemove Limited users category if empty
Amith Yamasani [Sat, 30 Mar 2013 03:28:28 +0000 (20:28 -0700)]
Remove Limited users category if empty

If there are no users under limited category, in a secondary user,
remove the subheading completely.

Change-Id: I0397b6198c8cfc147e9e7dc30a92a7cb2f5860e3

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Sat, 30 Mar 2013 02:41:06 +0000 (19:41 -0700)]
Import translations. DO NOT MERGE

Change-Id: I846ec473107cdeeb6573445d8faa60ab83fa6946
Auto-generated-cl: translation import

11 years agoMerge "Follow changes to RestrictionEntry API" into jb-mr2-dev
Amith Yamasani [Sat, 30 Mar 2013 01:48:38 +0000 (01:48 +0000)]
Merge "Follow changes to RestrictionEntry API" into jb-mr2-dev

11 years agoFollow changes to RestrictionEntry API
Amith Yamasani [Thu, 28 Mar 2013 21:34:36 +0000 (14:34 -0700)]
Follow changes to RestrictionEntry API

Implement custom restrictions activity.
Fixed some bugs.

Change-Id: I094a6ffcc41c2936f76a8731048d7cb712c1b857

11 years agoWhen user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.
Maggie Benthall [Thu, 28 Mar 2013 18:58:27 +0000 (14:58 -0400)]
When user has DISALLOW_USB_FILE_TRANSFER set, disable settings controls.

Under Settings > Storage, remove the "USB computer connection" menu item.
In case someone launches the UsbSettings screen instead, also disable those checkboxes.

Change-Id: I59ec8b16bed4670beeac8d359e5368e4a659061b

11 years agoMerge "Add KeyStore storage type to Settings UI" into jb-mr2-dev
Kenny Root [Fri, 29 Mar 2013 21:24:47 +0000 (21:24 +0000)]
Merge "Add KeyStore storage type to Settings UI" into jb-mr2-dev

11 years agoAdd KeyStore storage type to Settings UI
Kenny Root [Fri, 29 Mar 2013 18:12:55 +0000 (11:12 -0700)]
Add KeyStore storage type to Settings UI

Give the user an idea of what kind of credential storage is in use on
this device for keystore daemon.

(cherry picked from commit 39b56008be0ad0b50fd65ec8fc1c6f9d81d60959)

Change-Id: Id89a1e210b3627914f080b0925bd0d0585872dd2

11 years agoMerge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode...
Fabrice Di Meglio [Fri, 29 Mar 2013 19:41:12 +0000 (19:41 +0000)]
Merge "Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode" into jb-mr2-dev

11 years agoAdd install support for WIFI UID
Irfan Sheriff [Fri, 29 Mar 2013 18:15:07 +0000 (11:15 -0700)]
Add install support for WIFI UID

Bug: 8472221
Change-Id: If203760fc960b4d8987d745e49ef1d4355c45adf

11 years agoFix bug #8505156 WiFi properties dialog is having some issues in RTL mode
Fabrice Di Meglio [Fri, 29 Mar 2013 03:12:40 +0000 (20:12 -0700)]
Fix bug #8505156 WiFi properties dialog is having some issues in RTL mode

- title should be "viewStart"
- link speed should be also "viewStart"

Change-Id: Ic0389a1e4ddf1b1d6fc1fcbeba50074434fdb52d

11 years agoAdding developer toggle for using Chromium WebView.
Jared Duke [Fri, 15 Mar 2013 22:13:41 +0000 (15:13 -0700)]
Adding developer toggle for using Chromium WebView.

This is hidden by default, and only revealed in device configurations that contain the Chromium WebView implementation.

BUG=8383477

Change-Id: I8fbb0bb55776e384b9bfc4feb6a2d30eed114ece

11 years agoMerge "Display vibrate icon in volume menu" into jb-mr2-dev
Eric Laurent [Thu, 28 Mar 2013 22:27:44 +0000 (22:27 +0000)]
Merge "Display vibrate icon in volume menu" into jb-mr2-dev

11 years agoam 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID"
Kenny Root [Thu, 28 Mar 2013 21:32:50 +0000 (14:32 -0700)]
am 0d52fc18: am 9dc478ec: Merge "Add ability to install credentials as other UID"

* commit '0d52fc184defef46378e7ba095091c7bab1ee459':
  Add ability to install credentials as other UID

11 years agoam 9dc478ec: Merge "Add ability to install credentials as other UID"
Kenny Root [Thu, 28 Mar 2013 21:30:37 +0000 (14:30 -0700)]
am 9dc478ec: Merge "Add ability to install credentials as other UID"

* commit '9dc478ec23944e9b008ab559e2f1360a9e4818b4':
  Add ability to install credentials as other UID

11 years agoMerge "Add ability to install credentials as other UID"
Kenny Root [Thu, 28 Mar 2013 20:57:03 +0000 (20:57 +0000)]
Merge "Add ability to install credentials as other UID"

11 years agoMerge "Respect user restrictions about adding/removing accounts, sideloading" into...
Maggie Benthall [Thu, 28 Mar 2013 19:17:13 +0000 (19:17 +0000)]
Merge "Respect user restrictions about adding/removing accounts, sideloading" into jb-mr2-dev

11 years agoAdd ability to install credentials as other UID
Kenny Root [Thu, 28 Mar 2013 18:05:19 +0000 (11:05 -0700)]
Add ability to install credentials as other UID

We need the ability to install from the system UID to wifi UID
to explicitly bind WiFi credentials to the WiFi profile. This adds the
ability for Wifi Settings to invoke installation of a PKCS12 file for
the wifi UID.

Bug: 8183258
Change-Id: I357c4387baf7e2f6fd6acc9046d9e6b52fdd4bb0

11 years agoRespect user restrictions about adding/removing accounts, sideloading
Maggie Benthall [Thu, 14 Mar 2013 21:41:27 +0000 (17:41 -0400)]
Respect user restrictions about adding/removing accounts, sideloading

Hide or disable options in the settings app when the user is restricted from
making changes.

Remove "Add account" button from Settings menu, and "remove account" option from menu in AccountSyncSettings.
Remove sideloading checkbox in SecuritySettings.

Also handle replacement of UserManager.isShareLocationToggleAllowed() with hasUserRestriction, which takes a restriction key string.

Change-Id: I34c74fd5aed8956ba00f92e3d3c657b608454dfe

11 years agoMerge "Split User settings into limited and trusted." into jb-mr2-dev
Amith Yamasani [Wed, 27 Mar 2013 19:30:55 +0000 (19:30 +0000)]
Merge "Split User settings into limited and trusted." into jb-mr2-dev

11 years agoSplit User settings into limited and trusted.
Amith Yamasani [Wed, 27 Mar 2013 19:27:01 +0000 (12:27 -0700)]
Split User settings into limited and trusted.

Also show avatars with the circular frame like on lockscreen.

Change-Id: I032d842555b2f50a07166460f9cfb1963366dbb1

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 27 Mar 2013 17:41:56 +0000 (17:41 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 27 Mar 2013 17:38:59 +0000 (10:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7b83d0e661e36dfe47e342bf9e6086099c4b6be9
Auto-generated-cl: translation import

11 years agoMerge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev
Jeff Sharkey [Wed, 27 Mar 2013 16:46:33 +0000 (16:46 +0000)]
Merge "Fix padding so TextViews are baseline aligned." into jb-mr2-dev

11 years agoFix padding so TextViews are baseline aligned.
Jeff Sharkey [Wed, 27 Mar 2013 16:44:49 +0000 (09:44 -0700)]
Fix padding so TextViews are baseline aligned.

Also removed unused layout.

Change-Id: I1dd69c3766a58d389fb2fadcf04b23210af3d00a

11 years agoMerge "Allow wildcard for bypass proxy" into jb-mr2-dev
Irfan Sheriff [Tue, 26 Mar 2013 22:41:17 +0000 (22:41 +0000)]
Merge "Allow wildcard for bypass proxy" into jb-mr2-dev

11 years agoMerge "Device Admin Settings changes for Device Owner" into jb-mr2-dev
Amith Yamasani [Tue, 26 Mar 2013 22:27:29 +0000 (22:27 +0000)]
Merge "Device Admin Settings changes for Device Owner" into jb-mr2-dev

11 years agoAllow wildcard for bypass proxy
Irfan Sheriff [Tue, 26 Mar 2013 22:08:52 +0000 (15:08 -0700)]
Allow wildcard for bypass proxy

Allow *.example.com to be bypassed

Bug: 7422561
Change-Id: Ia7bd2d5b0a19794ae3bcccb8d6b78aeb2ba9c5fb

11 years agoMerge "Fix monkey crash" into jb-mr2-dev
Irfan Sheriff [Tue, 26 Mar 2013 21:17:55 +0000 (21:17 +0000)]
Merge "Fix monkey crash" into jb-mr2-dev

11 years agoFix monkey crash
Irfan Sheriff [Tue, 26 Mar 2013 21:11:36 +0000 (14:11 -0700)]
Fix monkey crash

Bug: 8011964
Change-Id: Idafdb7b3bc22d3280e0aa93877b7e09a23270149

11 years agoDevice Admin Settings changes for Device Owner
Amith Yamasani [Mon, 25 Mar 2013 22:38:48 +0000 (15:38 -0700)]
Device Admin Settings changes for Device Owner

Disable the list entry for an active device owner, as it can't be deactivated.

Change-Id: I833561f91ae60dff8226f9118c9e3b012e5e194f

11 years agoDisplay vibrate icon in volume menu
Eric Laurent [Tue, 26 Mar 2013 01:43:39 +0000 (18:43 -0700)]
Display vibrate icon in volume menu

When a tablet is in vibrate mode, the notification
volume icon in the volume menu should be vibrate
and not silent.

Bug 7235006

Change-Id: I460a579a7796f8fb2cac8ff581a98f23e57d1bb0

11 years agoMerge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev
Jeff Sharkey [Mon, 25 Mar 2013 23:13:21 +0000 (23:13 +0000)]
Merge "Fix Data Usage restrict logic, scrolling." into jb-mr2-dev

11 years agoFix Data Usage restrict logic, scrolling.
Jeff Sharkey [Mon, 25 Mar 2013 23:13:00 +0000 (16:13 -0700)]
Fix Data Usage restrict logic, scrolling.

Bug: 8141491
Change-Id: I4e94666c59d91fb112477781ab340fd25d03de27

11 years agoMerge "Read NumberPicker value after finishing edit." into jb-mr2-dev
Jeff Sharkey [Mon, 25 Mar 2013 22:12:34 +0000 (22:12 +0000)]
Merge "Read NumberPicker value after finishing edit." into jb-mr2-dev

11 years agoRead NumberPicker value after finishing edit.
Jeff Sharkey [Mon, 25 Mar 2013 22:11:25 +0000 (15:11 -0700)]
Read NumberPicker value after finishing edit.

Bug: 6881204
Change-Id: I736c9205b69914353f88028a3794db6cd43c4c74

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 25 Mar 2013 20:57:42 +0000 (20:57 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 25 Mar 2013 20:22:50 +0000 (13:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I898d0fd6ce299f2ffb6cc38805baf566e83f501f
Auto-generated-cl: translation import

11 years agoMerge "Do not display volume settings if volume is fixed" into jb-mr2-dev
Eric Laurent [Mon, 25 Mar 2013 17:09:49 +0000 (17:09 +0000)]
Merge "Do not display volume settings if volume is fixed" into jb-mr2-dev

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Fri, 22 Mar 2013 18:37:52 +0000 (11:37 -0700)]
Import translations. DO NOT MERGE

Change-Id: I2a3ca4e806acc10e961d5720761de5f9e608455a
Auto-generated-cl: translation import

11 years agoFix build
Irfan Sheriff [Fri, 22 Mar 2013 00:49:31 +0000 (17:49 -0700)]
Fix build

Change-Id: Ic2eacc240e693cb523c9189c7bd62e1bf17fd85c

11 years agoDo not display volume settings if volume is fixed
Eric Laurent [Wed, 20 Mar 2013 01:24:47 +0000 (18:24 -0700)]
Do not display volume settings if volume is fixed

When the configuration option config_useFixedVolume is true
indicating that stream volumes cannot be modified, the volume
settings submenu is not available.

Bug 8161458

Change-Id: I6d76a2f85c642778ae8c4caa7347b50f659c1def

11 years agoMerge "Notify user that scans are still active" into jb-mr2-dev
Irfan Sheriff [Fri, 22 Mar 2013 00:15:12 +0000 (00:15 +0000)]
Merge "Notify user that scans are still active" into jb-mr2-dev

11 years agoNotify user that scans are still active
Irfan Sheriff [Thu, 21 Mar 2013 19:16:52 +0000 (12:16 -0700)]
Notify user that scans are still active

Bug: 8141918
Change-Id: I115ce2ac57125b8ffbb34245dc25effd4b3bebb0

11 years agoMerge "Add some extra info to the notification list rows." into jb-mr2-dev
Daniel Sandler [Thu, 21 Mar 2013 22:02:40 +0000 (22:02 +0000)]
Merge "Add some extra info to the notification list rows." into jb-mr2-dev

11 years agoMerge "Optimizations in the notification list:" into jb-mr2-dev
Daniel Sandler [Thu, 21 Mar 2013 22:02:36 +0000 (22:02 +0000)]
Merge "Optimizations in the notification list:" into jb-mr2-dev

11 years agoMerge "Keep up with INotificationListener changes." into jb-mr2-dev
Daniel Sandler [Thu, 21 Mar 2013 22:02:20 +0000 (22:02 +0000)]
Merge "Keep up with INotificationListener changes." into jb-mr2-dev

11 years agoMerge "Application restrictions UI" into jb-mr2-dev
Amith Yamasani [Thu, 21 Mar 2013 06:14:39 +0000 (06:14 +0000)]
Merge "Application restrictions UI" into jb-mr2-dev

11 years agoApplication restrictions UI
Amith Yamasani [Sat, 2 Mar 2013 01:05:23 +0000 (17:05 -0800)]
Application restrictions UI

Refactored User Settings UI to have two types of users.
Display a list of apps to select.
Edit user restrictions.
Handle saving and updating RestrictionEntry items via
User Manager.

Change-Id: I3ad5aa71d5ef66dffd39e17ba0556f075ac10a0f

11 years agoMerge "system activity for scan always available setting" into jb-mr2-dev
Irfan Sheriff [Wed, 20 Mar 2013 23:00:03 +0000 (23:00 +0000)]
Merge "system activity for scan always available setting" into jb-mr2-dev

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Wed, 20 Mar 2013 19:51:36 +0000 (19:51 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agosystem activity for scan always available setting
Irfan Sheriff [Mon, 18 Mar 2013 20:11:47 +0000 (13:11 -0700)]
system activity for scan always available setting

Takes user permission via a dialog to enable scans to be always available.

Bug: 8141918
Change-Id: I1e5e45e514726c2cbfd86e747123e477e00fd7ed

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Wed, 20 Mar 2013 18:07:54 +0000 (11:07 -0700)]
Import translations. DO NOT MERGE

Change-Id: I84b3e376481c87e9b202d5a6154dc025048ff184
Auto-generated-cl: translation import

11 years agoam f8db32d8: am 74fd506b: Merge "Enable Ethernet tab in data usage"
Jeff Sharkey [Wed, 20 Mar 2013 17:23:33 +0000 (10:23 -0700)]
am f8db32d8: am 74fd506b: Merge "Enable Ethernet tab in data usage"

* commit 'f8db32d8af46d1cb1a10cf9d49dde7ecd4ce507d':
  Enable Ethernet tab in data usage

11 years agoam 74fd506b: Merge "Enable Ethernet tab in data usage"
Jeff Sharkey [Wed, 20 Mar 2013 17:21:53 +0000 (10:21 -0700)]
am 74fd506b: Merge "Enable Ethernet tab in data usage"

* commit '74fd506bba9643221479ba11ae56a6657ed48279':
  Enable Ethernet tab in data usage

11 years agoMerge "Enable Ethernet tab in data usage"
Jeff Sharkey [Wed, 20 Mar 2013 17:08:25 +0000 (17:08 +0000)]
Merge "Enable Ethernet tab in data usage"

11 years agoEnable Ethernet tab in data usage
Jaewan Kim [Tue, 19 Mar 2013 07:53:45 +0000 (16:53 +0900)]
Enable Ethernet tab in data usage

mStateSession is not initialized at the time hasEthernet is called to
set mShowEthernet, so Ethernet tab is not shown at the startup.
In this case, if the device doesn't support mobile network, user cannot
even select it from the context menu.

Bug: 8365419
Change-Id: I441971f18346c34a3adf3f18d9355075d9dce3f0

11 years agoMerge "Enable Back during setup wizard" into jb-mr2-dev
Russell Brenner [Tue, 19 Mar 2013 21:09:00 +0000 (21:09 +0000)]
Merge "Enable Back during setup wizard" into jb-mr2-dev

11 years agoEnable Back during setup wizard
Russell Brenner [Mon, 18 Mar 2013 18:07:34 +0000 (11:07 -0700)]
Enable Back during setup wizard

Aside from enabling the system back button, updated the result codes
to distinguish back (RESULT_CANCEL) from skip (RESULT_SKIP).

This CL should have been uploaded along with http://ag/284254,
which has already been merged.

Bug: 6477759
Bug: 8409375
Change-Id: I031acda1d675ee79a3166a51073113093211709d

11 years agoAdd some extra info to the notification list rows.
Daniel Sandler [Tue, 19 Mar 2013 03:27:12 +0000 (23:27 -0400)]
Add some extra info to the notification list rows.

Change-Id: Ie6ad130bd0e6daf8562c477f0297ba914d3f22d1

11 years agoOptimizations in the notification list:
Daniel Sandler [Tue, 19 Mar 2013 03:06:15 +0000 (23:06 -0400)]
Optimizations in the notification list:

    - sort notifications by timestamp
- deal with notification bursts better by waiting to
  refresh the list until things settle down

Change-Id: Ie41051afcb0a7a917f2a97a3311628b34626c125

11 years agoKeep up with INotificationListener changes.
Daniel Sandler [Tue, 19 Mar 2013 03:06:05 +0000 (23:06 -0400)]
Keep up with INotificationListener changes.

Requires change Ia69f2ba0 in f/b.

Change-Id: I4a8f719150651bbf94c48ef83fcad2f82db9582b

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Mon, 18 Mar 2013 22:58:18 +0000 (22:58 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoMerge "Allow disabling both MTP and PTP." into jb-mr2-dev
Jeff Sharkey [Mon, 18 Mar 2013 22:48:35 +0000 (22:48 +0000)]
Merge "Allow disabling both MTP and PTP." into jb-mr2-dev

11 years agoAllow disabling both MTP and PTP.
Jeff Sharkey [Mon, 18 Mar 2013 22:46:28 +0000 (15:46 -0700)]
Allow disabling both MTP and PTP.

Require that MTP and PTP are mutually exclusive when enabled, but
allow them to be both disabled.  Users can enable them again under
Storage menu item in Settings.

Bug: 6518257
Change-Id: I43419fa619ce2c62dd5e8c14d6c645d24fd8943a

11 years agoMerge "battery history details: update status bars on any change" into jb-mr2-dev
Todd Poynor [Mon, 18 Mar 2013 20:39:39 +0000 (20:39 +0000)]
Merge "battery history details: update status bars on any change" into jb-mr2-dev

11 years agobattery history details: update status bars on any change
Todd Poynor [Sat, 16 Mar 2013 01:21:12 +0000 (18:21 -0700)]
battery history details: update status bars on any change

Don't apply the "X axis (time) still within previous pixel" optimization
to the status bars below the battery level graph.  Keep the path cursor
position and previous state variables up-to-date in this case.

Bug: 8132455
Change-Id: I09390256e3e71d34813de655a1d01ec054ee778a

11 years agoImport translations. DO NOT MERGE
Baligh Uddin [Mon, 18 Mar 2013 18:23:00 +0000 (11:23 -0700)]
Import translations. DO NOT MERGE

Change-Id: Id441dc46429d64536d92ce8ad25805aa1780975a
Auto-generated-cl: translation import

11 years agoam cd1c38cf: am ae9ebfd1: Merge "add MVNO field for APN Editor"
Robert Greenwalt [Sun, 17 Mar 2013 16:31:04 +0000 (09:31 -0700)]
am cd1c38cf: am ae9ebfd1: Merge "add MVNO field for APN Editor"

* commit 'cd1c38cf23e640d878767e189e10dbf26b6a0141':
  add MVNO field for APN Editor

11 years agoam ae9ebfd1: Merge "add MVNO field for APN Editor"
Robert Greenwalt [Sun, 17 Mar 2013 16:26:13 +0000 (09:26 -0700)]
am ae9ebfd1: Merge "add MVNO field for APN Editor"

* commit 'ae9ebfd153d63beb03c018786cb3a7ca7610ce64':
  add MVNO field for APN Editor

11 years agoMerge "add MVNO field for APN Editor"
Robert Greenwalt [Sat, 16 Mar 2013 00:55:30 +0000 (00:55 +0000)]
Merge "add MVNO field for APN Editor"

11 years agoMerge "Allow user to change scan always available setting" into jb-mr2-dev
Irfan Sheriff [Thu, 14 Mar 2013 21:32:42 +0000 (21:32 +0000)]
Merge "Allow user to change scan always available setting" into jb-mr2-dev

11 years agoam 93692c36: am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePicker...
Elliott Hughes [Thu, 14 Mar 2013 06:10:56 +0000 (23:10 -0700)]
am 93692c36: am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"

* commit '93692c363213736f1c37413ac35a95d4be9a3bea':
  use date from 1970-01-01 to 2037-12-31 in DatePickerDialog

11 years agoMerge "Import translations. DO NOT MERGE" into jb-mr2-dev
Baligh Uddin [Thu, 14 Mar 2013 04:44:10 +0000 (04:44 +0000)]
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev

11 years agoam 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
Elliott Hughes [Thu, 14 Mar 2013 01:17:56 +0000 (18:17 -0700)]
am 53309365: Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"

* commit '53309365f60b317b032e55643e9eb0122c6fbb3f':
  use date from 1970-01-01 to 2037-12-31 in DatePickerDialog

11 years agoMerge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"
Elliott Hughes [Thu, 14 Mar 2013 00:12:48 +0000 (00:12 +0000)]
Merge "use date from 1970-01-01 to 2037-12-31 in DatePickerDialog"

11 years agouse date from 1970-01-01 to 2037-12-31 in DatePickerDialog
Sungmin Choi [Fri, 1 Mar 2013 12:20:46 +0000 (21:20 +0900)]
use date from 1970-01-01 to 2037-12-31 in DatePickerDialog

In case of using DatePickerDialog, user could select any date
before 1970-01-01. However, the system clock cannot be set to
a date before 1970-01-01.
As a result, user couldn't select date before 1970-01-01.
So, use date from 1970-01-01 to 2037-12-31 of DatePickerDialog.

Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1970 and Done

Change-Id: I075b3fcaa86df1c314c85dd3dd85474a28b8c637

11 years agoMerge "allow daydream settings to be keyboard driven." into jb-mr2-dev
Chris Wren [Wed, 13 Mar 2013 13:44:42 +0000 (13:44 +0000)]
Merge "allow daydream settings to be keyboard driven." into jb-mr2-dev

11 years agoAllow user to change scan always available setting
Irfan Sheriff [Wed, 13 Mar 2013 00:57:57 +0000 (17:57 -0700)]
Allow user to change scan always available setting

Bug: 8141918
Change-Id: I3595812eccf5f7760f7521b9cbe6dece6fd658f1

11 years agoam 8749f35f: am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"
Amith Yamasani [Tue, 12 Mar 2013 22:46:56 +0000 (15:46 -0700)]
am 8749f35f: am 506b68e1: Merge "Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY"

* commit '8749f35f71c984a189a50e65625983b5cf7274f3':
  Moved KEY_VIBRATE to NEED_VOICE_CAPABILITY