OSDN Git Service

android-x86/packages-apps-Settings.git
12 years agoIgnore invalid network forget
Irfan Sheriff [Fri, 27 Apr 2012 22:36:30 +0000 (15:36 -0700)]
Ignore invalid network forget

Bug: 6397063
Change-Id: I066bd45e95b7e8671bc7dfcb83e46246f110b3a9

12 years agoMerge "Make Manage Apps remember which tab was shown." into jb-dev
Amith Yamasani [Fri, 27 Apr 2012 17:47:59 +0000 (10:47 -0700)]
Merge "Make Manage Apps remember which tab was shown." into jb-dev

12 years agoMerge "Allow p2p device rename" into jb-dev
Irfan Sheriff [Fri, 27 Apr 2012 16:55:45 +0000 (09:55 -0700)]
Merge "Allow p2p device rename" into jb-dev

12 years agoAllow p2p device rename
Irfan Sheriff [Wed, 25 Apr 2012 23:32:19 +0000 (16:32 -0700)]
Allow p2p device rename

Change-Id: Ib61425da344f955b0a583716516181bdfbd4b504

12 years agoMake Manage Apps remember which tab was shown.
Amith Yamasani [Thu, 26 Apr 2012 23:27:43 +0000 (16:27 -0700)]
Make Manage Apps remember which tab was shown.

This fixes the forgetfulness on orientation change. The code was
already in, but there was a typo in the key string that saved the tab.

Bug: 6000318
Change-Id: If29f42b83aa0ec9f05061b8690e0bdbe8c4a2812

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 26 Apr 2012 22:48:31 +0000 (15:48 -0700)]
Import translations. DO NOT MERGE

Change-Id: I35b0b64b3819b917c8dc312c93bacb89bf4a7d1e

12 years agoRestore look of Wi-Fi panel for Setup Wizard
Russell Brenner [Mon, 23 Apr 2012 18:38:34 +0000 (11:38 -0700)]
Restore look of Wi-Fi panel for Setup Wizard

As part of the Wi-Fi refresh, this CL hides the action bar, menu, and
Settings icon in the context of the Setup Wizard. Dead code related
to WifiSettingsForSetupWizardXL has also been removed.

Bug: 5364589
Change-Id: Ib6716500153879b939a18a7007f1f6521b73890b

12 years agoMerge "New API to allow third-party apps to bind widgets"
Michael Jurka [Wed, 25 Apr 2012 02:06:17 +0000 (19:06 -0700)]
Merge "New API to allow third-party apps to bind widgets"

12 years agoNew API to allow third-party apps to bind widgets
Michael Jurka [Fri, 20 Apr 2012 08:47:44 +0000 (01:47 -0700)]
New API to allow third-party apps to bind widgets

Change-Id: Ieec9f247fdbfc02c2ad8f5bb7f6b9efe0669af84

12 years agoMerge "Safeguard from monkeys."
Amith Yamasani [Tue, 24 Apr 2012 22:24:25 +0000 (15:24 -0700)]
Merge "Safeguard from monkeys."

12 years agoSafeguard from monkeys.
Amith Yamasani [Tue, 24 Apr 2012 22:09:10 +0000 (15:09 -0700)]
Safeguard from monkeys.

Bug: 6315950
Change-Id: I680b3f0a2cee565a39d58e95a8abe5f62cc7b466

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Tue, 24 Apr 2012 20:55:56 +0000 (13:55 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 24 Apr 2012 20:44:08 +0000 (13:44 -0700)]
Import translations. DO NOT MERGE

Change-Id: Iaccf544def97f82cc295a845a90961dae92c1116

12 years agoMerge "Make home-as-up work in UserDictionarySettings"
Amith Yamasani [Tue, 24 Apr 2012 20:23:12 +0000 (13:23 -0700)]
Merge "Make home-as-up work in UserDictionarySettings"

12 years agoMake home-as-up work in UserDictionarySettings
Amith Yamasani [Tue, 24 Apr 2012 20:06:39 +0000 (13:06 -0700)]
Make home-as-up work in UserDictionarySettings

Since the home-as-up icon is delivered through onOptionsItemSelected,
need to check the ID.

Bug: 6388649
Change-Id: I00041b1a15e102826d05a40fdd288a9d8712dc48

12 years agoMerge "Fix NPE due to delayed event handling."
Amith Yamasani [Tue, 24 Apr 2012 18:53:31 +0000 (11:53 -0700)]
Merge "Fix NPE due to delayed event handling."

12 years agoMerge "Fix data usage settings button visibility."
Jeff Sharkey [Tue, 24 Apr 2012 18:36:38 +0000 (11:36 -0700)]
Merge "Fix data usage settings button visibility."

12 years agoFix data usage settings button visibility.
Jeff Sharkey [Tue, 24 Apr 2012 18:35:43 +0000 (11:35 -0700)]
Fix data usage settings button visibility.

Also check that fragment is attached before launching intent.

Bug: 6385040
Change-Id: If857758acbf6fe17c8ffbd75226114346ffe6c62

12 years agoFix NPE due to delayed event handling.
Amith Yamasani [Tue, 24 Apr 2012 18:35:38 +0000 (11:35 -0700)]
Fix NPE due to delayed event handling.

a.k.a., annoying monkeys.

Bug: 6336430
Change-Id: Ie038a71d0ae66b3f30ccd704529f767fa2058542

12 years agoMerge "Deal correctly with an unset brightness adjustment."
Dianne Hackborn [Tue, 24 Apr 2012 01:55:32 +0000 (18:55 -0700)]
Merge "Deal correctly with an unset brightness adjustment."

12 years agoDeal correctly with an unset brightness adjustment.
Dianne Hackborn [Tue, 24 Apr 2012 01:22:13 +0000 (18:22 -0700)]
Deal correctly with an unset brightness adjustment.

Change-Id: I191051989bad68f31210bbc717fbabd59d4585a1

12 years agoDelay calling setHasOptionsMenu() to avoid a crash in Wifi Settings
Amith Yamasani [Tue, 24 Apr 2012 01:03:52 +0000 (18:03 -0700)]
Delay calling setHasOptionsMenu() to avoid a crash in Wifi Settings

If it is called in onCreate(), it's too early for Wifi Settings,
which does its initialization in onActivityCreated().

Change-Id: I3d9b49f63d342e724fd4795fbca48d08faa3c3cc

12 years agoMerge "Help menus for several screens."
Amith Yamasani [Mon, 23 Apr 2012 22:38:50 +0000 (15:38 -0700)]
Merge "Help menus for several screens."

12 years agoHelp menus for several screens.
Amith Yamasani [Mon, 23 Apr 2012 22:35:36 +0000 (15:35 -0700)]
Help menus for several screens.

Bug: 5144896
Change-Id: Ib2f5146f6f62f2a33261bb165c3bf1bf13b22f38

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 23 Apr 2012 20:56:20 +0000 (13:56 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoDon't let monkeys launch storage management activities.
Amith Yamasani [Mon, 23 Apr 2012 20:46:10 +0000 (13:46 -0700)]
Don't let monkeys launch storage management activities.

Guard against monkeys in two places where intents to other activities are
launched.

Bug: 5415988
Change-Id: Ia3c5514c02423f7b249f655296bb02e279789dfd

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 23 Apr 2012 20:29:34 +0000 (13:29 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ibf98cce0aba64bd356fffb7de80ca13bbab3cacd

12 years agoMerge "Use statfs() in IMediaContainerService."
Jeff Sharkey [Mon, 23 Apr 2012 17:08:06 +0000 (10:08 -0700)]
Merge "Use statfs() in IMediaContainerService."

12 years agoAdd notification shutoff switch to app details page.
Daniel Sandler [Thu, 19 Apr 2012 05:47:45 +0000 (01:47 -0400)]
Add notification shutoff switch to app details page.

Requires change Ieccac574.

Bug: 5547401
Change-Id: I9856658cc638723414a5c2c3c6807241c3ce6166

12 years agoUse statfs() in IMediaContainerService.
Jeff Sharkey [Mon, 23 Apr 2012 01:57:44 +0000 (18:57 -0700)]
Use statfs() in IMediaContainerService.

Since Settings runs in system UID, it needs to export statfs()
operations to IMediaContainerService.

Bug: 6346248
Change-Id: I5801948211f0e55040da4850e3dd55b93f80798f

12 years agoFix menu string lengths.
Jeff Sharkey [Sun, 22 Apr 2012 23:06:22 +0000 (16:06 -0700)]
Fix menu string lengths.

Bug: 5497620
Change-Id: I0b4c2cbae8a5cc83ba67355c465c30e5177e8a01

12 years agoHide tab when disabled, metered strings, fixes.
Jeff Sharkey [Sat, 21 Apr 2012 22:41:48 +0000 (15:41 -0700)]
Hide tab when disabled, metered strings, fixes.

Hide "Data usage" item when kernel support isn't available and
enabled.  Change "restrict background" strings to reflect metered
status.  Hide app settings button when no package found.  Always
start limit sweep above any warning.  Imply metered state for
networks with limits.

Bug: 630336454656435379686637627663683296376276
Change-Id: I4faccc9a50f2f741fd937bb8c361a3ca055135e2

12 years agoMerge "Leave unmetered Wi-Fi network policies intact."
Jeff Sharkey [Fri, 20 Apr 2012 23:03:31 +0000 (16:03 -0700)]
Merge "Leave unmetered Wi-Fi network policies intact."

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 20 Apr 2012 21:27:19 +0000 (14:27 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 20 Apr 2012 20:56:13 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I03e7d4c13f555abb9d97b420ceb7cf0dfe345089

12 years agoMerge "Update to follow API change."
Dianne Hackborn [Fri, 20 Apr 2012 20:44:51 +0000 (13:44 -0700)]
Merge "Update to follow API change."

12 years agoMerge "Data usage limit label font size fixed"
Gilles Debunne [Fri, 20 Apr 2012 18:15:45 +0000 (11:15 -0700)]
Merge "Data usage limit label font size fixed"

12 years agoUpdate to follow API change.
Dianne Hackborn [Fri, 20 Apr 2012 17:37:42 +0000 (10:37 -0700)]
Update to follow API change.

Change-Id: Ife399fb336016cfa8faadf655d887ae611c6ad9b

12 years agoLeave unmetered Wi-Fi network policies intact.
Jeff Sharkey [Fri, 20 Apr 2012 06:02:09 +0000 (23:02 -0700)]
Leave unmetered Wi-Fi network policies intact.

They are now removed when the WifiConfiguration is deleted.

Bug: 63448216369307
Change-Id: Id411fa06cec10435501ef03c56d0bcb96ed229db

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 19 Apr 2012 20:49:46 +0000 (13:49 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ie819b67b4146aac858ccaf31aa9630a2745aec30

12 years agoMerge "Add Nsd settings checkbox"
Irfan Sheriff [Thu, 19 Apr 2012 16:57:33 +0000 (09:57 -0700)]
Merge "Add Nsd settings checkbox"

12 years agoAdd Nsd settings checkbox
Irfan Sheriff [Wed, 18 Apr 2012 06:17:46 +0000 (23:17 -0700)]
Add Nsd settings checkbox

Change-Id: I58e54a8bed02ed7bd99b0f284279b6c799e3369f

12 years agoRestore deleted string still referenced from XML.
Eric Fischer [Wed, 18 Apr 2012 22:24:57 +0000 (15:24 -0700)]
Restore deleted string still referenced from XML.

Change-Id: I2a1384db53b5670815503076f28b89712b8c9c00

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 18 Apr 2012 21:42:42 +0000 (14:42 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1f5bf9b21d66376e163cb4a32fb0a55ebba66cb3

12 years agoData usage limit label font size fixed
Gilles Debunne [Wed, 18 Apr 2012 01:14:36 +0000 (18:14 -0700)]
Data usage limit label font size fixed

Bug 6326750

The font size around the text was removed when its content is replaced.
This is WAI since the spans created from <font> html tags have a
SPAN_EXCLUSIVE_EXCLUSIVE flag. These are removed when their length
becomes 0. The bug came from a recent enforcement of this constraint.

The fix is to change the flags of these AbsoluteSizeSpan spans.

This CL also changes the code to avoid the creation of the int[] array.

Change-Id: Ib58270bb9d1cf0c7609ba1e36d6c0cca841300db

12 years agoMerge "Add label for default keyboard layout."
Jeff Brown [Tue, 17 Apr 2012 21:29:29 +0000 (14:29 -0700)]
Merge "Add label for default keyboard layout."

12 years agoAdd label for default keyboard layout.
Jeff Brown [Tue, 17 Apr 2012 20:55:15 +0000 (13:55 -0700)]
Add label for default keyboard layout.

Bug: 6110399
Change-Id: I2431b99884cbd01de32f8cd6c14a3afbd18b5020

12 years agoMerge "Remove "Searching/Tap To Pair" text from Bluetooth Settings."
Jake Hamby [Tue, 17 Apr 2012 01:10:33 +0000 (18:10 -0700)]
Merge "Remove "Searching/Tap To Pair" text from Bluetooth Settings."

12 years agoRemove "Searching/Tap To Pair" text from Bluetooth Settings.
Jake Hamby [Mon, 16 Apr 2012 23:30:14 +0000 (16:30 -0700)]
Remove "Searching/Tap To Pair" text from Bluetooth Settings.

The second text field next to "Available devices" in the Bluetooth
Settings device list creates a cluttered heading that wraps to multiple
lines in some locales. It's unnecessary because there's a graphical
progress spinner when searching for devices, and "Touch to pair" is
easily discoverable. Remove the second text field and the "Searching"
and "Touch to pair" string resources.

Bug: 5496221
Change-Id: I7b71222415152014426cf54fc112fe5379d350dc

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 16 Apr 2012 21:40:19 +0000 (14:40 -0700)]
Import translations. DO NOT MERGE

Change-Id: I58fdf383ccd986cb56187d098365dab7b1ec4462

12 years agoMerge "Wifi: Update message when scan result is empty"
Irfan Sheriff [Sat, 14 Apr 2012 05:12:57 +0000 (22:12 -0700)]
Merge "Wifi: Update message when scan result is empty"

12 years agoWifi: Update message when scan result is empty
Vishal Mahaveer [Mon, 9 Apr 2012 13:06:47 +0000 (08:06 -0500)]
Wifi: Update message when scan result is empty

Handle case when Wi-Fi scan result is empty

Change-Id: I03ccbf2603367efa3c6dfe20514e8c7c5a68b5d9
Signed-off-by: Vishal Mahaveer <vishalm@ti.com>
12 years agoMerge "Add setting to redirect vibrator to game controller."
Jeff Brown [Sat, 14 Apr 2012 03:40:06 +0000 (20:40 -0700)]
Merge "Add setting to redirect vibrator to game controller."

12 years agoMerge "Use new input device listener API to refresh keyboards."
Jeff Brown [Sat, 14 Apr 2012 03:31:37 +0000 (20:31 -0700)]
Merge "Use new input device listener API to refresh keyboards."

12 years agoAdd setting to redirect vibrator to game controller.
Jeff Brown [Sat, 14 Apr 2012 03:27:45 +0000 (20:27 -0700)]
Add setting to redirect vibrator to game controller.

Bug: 6334179
Change-Id: I62c9c163aa4ee2c88286daee77641418869a1dab

12 years agoMerge "Show data restricted apps, unify strings."
Jeff Sharkey [Sat, 14 Apr 2012 03:16:00 +0000 (20:16 -0700)]
Merge "Show data restricted apps, unify strings."

12 years agoShow data restricted apps, unify strings.
Jeff Sharkey [Fri, 13 Apr 2012 23:04:07 +0000 (16:04 -0700)]
Show data restricted apps, unify strings.

Always show apps with background data restricted, even when not
used in selected time period.  Combine measurement disclaimer into
single string, and only show for mobile networks.  Unify limit
dialog string.

Bug: 6007276550501054950205456087
Change-Id: I0ec307b330838dc9528d7e63e0ac1edd14ba122c

12 years agoUse new input device listener API to refresh keyboards.
Jeff Brown [Sat, 14 Apr 2012 01:04:23 +0000 (18:04 -0700)]
Use new input device listener API to refresh keyboards.

Bug: 6110399
Change-Id: Ibb0bbeb40af2ee7204e4682bc7493262407fd83f

12 years agoam dad12ddb: (-s ours) am 6ce339f6: Import translations. DO NOT MERGE
Eric Fischer [Sat, 14 Apr 2012 00:29:02 +0000 (17:29 -0700)]
am dad12ddb: (-s ours) am 6ce339f6: Import translations. DO NOT MERGE

* commit 'dad12ddbe6425b031002c2f2e646f78789de36ac':
  Import translations. DO NOT MERGE

12 years agoam 6ce339f6: Import translations. DO NOT MERGE
Eric Fischer [Sat, 14 Apr 2012 00:26:34 +0000 (17:26 -0700)]
am 6ce339f6: Import translations. DO NOT MERGE

* commit '6ce339f6788a8e95c6e412e1704499b4ba15dcf2':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Sat, 14 Apr 2012 00:25:45 +0000 (17:25 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoam ee365b41: (-s ours) Import translations. DO NOT MERGE
Eric Fischer [Sat, 14 Apr 2012 00:25:43 +0000 (17:25 -0700)]
am ee365b41: (-s ours) Import translations. DO NOT MERGE

* commit 'ee365b411d98aa693506e88f2d73ebf09e81d098':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 13 Apr 2012 21:00:36 +0000 (14:00 -0700)]
Import translations. DO NOT MERGE

Change-Id: I1addf893fc64101dca482c89e2b0e286f679d7bf

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 13 Apr 2012 20:58:45 +0000 (13:58 -0700)]
Import translations. DO NOT MERGE

Change-Id: I88661d0e666de6dca93aa2b55dd1ecd38040b7b3

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 13 Apr 2012 20:56:55 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I7a7ab730f6d513c7a32e84a3536d8aa1dbd010bd

12 years agoMerge "Handle READ_EXTERNAL enforced by default."
Jeff Sharkey [Fri, 13 Apr 2012 17:42:37 +0000 (10:42 -0700)]
Merge "Handle READ_EXTERNAL enforced by default."

12 years agoHandle READ_EXTERNAL enforced by default.
Jeff Sharkey [Thu, 12 Apr 2012 22:58:57 +0000 (15:58 -0700)]
Handle READ_EXTERNAL enforced by default.

Bug: 6131916
Change-Id: Icbdaf6c7febfb8f93992a1f32732d104c8c1848c

12 years agoAdding Text-To-Speech under Accessibility.
Svetoslav Ganov [Fri, 13 Apr 2012 02:37:58 +0000 (19:37 -0700)]
Adding Text-To-Speech under Accessibility.

1. Adding text to speech (TTS) settings link under accessibility since
   the TTS settings are buried under language and input, therefore it is
   hard to find for a blind user. Note that TTS settings are some of the most
   important for a visually impaired user.

bug:5713535

Change-Id: I60aed1aeec5d40aa633dbac6e6149ad12366e9e6

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Wed, 11 Apr 2012 21:06:11 +0000 (14:06 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Wed, 11 Apr 2012 20:56:16 +0000 (13:56 -0700)]
Import translations. DO NOT MERGE

Change-Id: I9259a45cd35d2404b4a4111092e62e0d20bf0ec9

12 years agoMerge "Hide body immediately when no tabs."
Jeff Sharkey [Wed, 11 Apr 2012 18:04:00 +0000 (11:04 -0700)]
Merge "Hide body immediately when no tabs."

12 years agoHide body immediately when no tabs.
Jeff Sharkey [Wed, 11 Apr 2012 18:03:25 +0000 (11:03 -0700)]
Hide body immediately when no tabs.

Also check for valid SIM card when checking 4G radio status.

Bug: 6311752
Change-Id: Ic148f052429cc66bb51237bdc93c09f7c8ba3df1

12 years agoUpdate use of input manager API in settings.
Jeff Brown [Mon, 9 Apr 2012 20:24:34 +0000 (13:24 -0700)]
Update use of input manager API in settings.

Change-Id: I7aa033df8b5eec69cc6002b0bcc20b1d9902e4e0

12 years agoam 13741f2f: (-s ours) Import translations. DO NOT MERGE
Eric Fischer [Tue, 10 Apr 2012 22:13:44 +0000 (15:13 -0700)]
am 13741f2f: (-s ours) Import translations. DO NOT MERGE

* commit '13741f2fa6f950f718b60077c32c4b88025d9a22':
  Import translations. DO NOT MERGE

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 10 Apr 2012 21:38:57 +0000 (14:38 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia88d79197d3af7e2bc17e42c5717de7fb74de306

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Tue, 10 Apr 2012 21:34:32 +0000 (14:34 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ia2e68c14354bee036c6508af492e6a4eff376f17

12 years agoUpdate Settings for new Dreams architecture.
Daniel Sandler [Wed, 1 Feb 2012 19:14:18 +0000 (14:14 -0500)]
Update Settings for new Dreams architecture.

Additionally, hide all Dreams settings if the feature is
disabled (R.bool.config_enableDreams).

(Depends on change Idfe9d430)

Change-Id: Ifa05f125e411ca58605c33481de26cd29a926807

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Mon, 9 Apr 2012 22:46:21 +0000 (15:46 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Mon, 9 Apr 2012 22:02:34 +0000 (15:02 -0700)]
Import translations. DO NOT MERGE

Change-Id: Icf78d443b9bd55cab09bead04c8046bcecab171d

12 years agoMerge "Add support for cancelling connection"
Irfan Sheriff [Mon, 9 Apr 2012 21:29:14 +0000 (14:29 -0700)]
Merge "Add support for cancelling connection"

12 years agoMigrate to @Override to remove warnings.
Jeff Sharkey [Mon, 9 Apr 2012 17:53:09 +0000 (10:53 -0700)]
Migrate to @Override to remove warnings.

Bug: 6303344

Change-Id: I8f17edc3b12d50cedab2c5f555c63bc07d85bca2

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Fri, 6 Apr 2012 23:42:13 +0000 (16:42 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoAdd support for cancelling connection
Irfan Sheriff [Fri, 6 Apr 2012 22:24:26 +0000 (15:24 -0700)]
Add support for cancelling connection

Change-Id: Iba4a002ab86e62d87ae1175b75c203d3a86ad7c6

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Fri, 6 Apr 2012 21:08:15 +0000 (14:08 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8bdd165249129d85855fc43b738fb970f132ce8b

12 years agoMerge "Move to INetworkStatsSession with lifecycle."
Jeff Sharkey [Fri, 6 Apr 2012 20:40:45 +0000 (13:40 -0700)]
Merge "Move to INetworkStatsSession with lifecycle."

12 years agoMerge "Update strings and character limits for some new strings"
Amith Yamasani [Fri, 6 Apr 2012 19:00:01 +0000 (12:00 -0700)]
Merge "Update strings and character limits for some new strings"

12 years agoUpdate strings and character limits for some new strings
Amith Yamasani [Thu, 29 Mar 2012 03:38:06 +0000 (20:38 -0700)]
Update strings and character limits for some new strings

Bug: 6243599
Bug: 6247318
Change-Id: Iaab4f6a2b55b7ee18804a3dcf8a0d00e67627e57

12 years agoMove to INetworkStatsSession with lifecycle.
Jeff Sharkey [Fri, 6 Apr 2012 18:21:28 +0000 (11:21 -0700)]
Move to INetworkStatsSession with lifecycle.

Explicitly communicate lifecycle, enabling system_server to cache
stats when actively being used.

Bug: 6236498
Change-Id: Ieecc4b1d4fd46aeb5207c4ba9b450e04e9438d00

12 years agoMerge "Use new input manager API."
Jeff Brown [Fri, 6 Apr 2012 02:34:58 +0000 (19:34 -0700)]
Merge "Use new input manager API."

12 years agoUse new input manager API.
Jeff Brown [Fri, 6 Apr 2012 01:50:14 +0000 (18:50 -0700)]
Use new input manager API.

Bug: 6110399
Change-Id: I13f23b5d0aa5dc461a135303fc47432a6d57cbb4

12 years agoMerge "Update the delete asset with a more modern one."
Jean Chalard [Fri, 6 Apr 2012 01:18:49 +0000 (18:18 -0700)]
Merge "Update the delete asset with a more modern one."

12 years agoMerge "Specify up navigation behavior"
Adam Powell [Thu, 5 Apr 2012 23:24:19 +0000 (16:24 -0700)]
Merge "Specify up navigation behavior"

12 years agoMerge "Controls to set expensive (metered) networks."
Jeff Sharkey [Thu, 5 Apr 2012 23:18:00 +0000 (16:18 -0700)]
Merge "Controls to set expensive (metered) networks."

12 years agoSpecify up navigation behavior
Adam Powell [Tue, 27 Mar 2012 00:28:38 +0000 (17:28 -0700)]
Specify up navigation behavior

Don't use the split action bar for manage apps

Change-Id: I5587b8efe63858c4cb38197391245740c2a055ac

12 years agoam a3b3f7e8: (-s ours) am d52d02bf: Import translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 23:01:10 +0000 (16:01 -0700)]
am a3b3f7e8: (-s ours) am d52d02bf: Import translations. DO NOT MERGE

* commit 'a3b3f7e8c11bc6da7c42afac06ebd70cc8b093db':
  Import translations. DO NOT MERGE

12 years agoam d52d02bf: Import translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 22:58:26 +0000 (15:58 -0700)]
am d52d02bf: Import translations. DO NOT MERGE

* commit 'd52d02bf5fee5ab902fd46f069b3e4e1691f804d':
  Import translations. DO NOT MERGE

12 years agoMerge "Import translations. DO NOT MERGE"
Eric Fischer [Thu, 5 Apr 2012 22:55:39 +0000 (15:55 -0700)]
Merge "Import translations. DO NOT MERGE"

12 years agoMerge "Add new settings UI to select keyboard layout."
Jeff Brown [Thu, 5 Apr 2012 22:29:37 +0000 (15:29 -0700)]
Merge "Add new settings UI to select keyboard layout."

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 22:25:01 +0000 (15:25 -0700)]
Import translations. DO NOT MERGE

Change-Id: Ib2b5e77f887d3e650b93c336303d43110a031740

12 years agoImport translations. DO NOT MERGE
Eric Fischer [Thu, 5 Apr 2012 22:22:58 +0000 (15:22 -0700)]
Import translations. DO NOT MERGE

Change-Id: I8302ec88e121e98ad9e576fa8b8e86fa769701f7