OSDN Git Service
Baligh Uddin [Fri, 2 Nov 2012 08:40:39 +0000 (01:40 -0700)]
Import translations. DO NOT MERGE
Change-Id: I43bce84488cadd7c2c8637e9bac2fdf0d7a1ea58
Auto-generated-cl: translation import
Michael Jurka [Tue, 30 Oct 2012 22:32:27 +0000 (15:32 -0700)]
New widget picker for keyguard widgets
New layout for widget picker is still not up to
final design, but this change prepares all the
backend work
Also, remove use of features filter from the
picker, since this is being removed from the API
Change-Id: I9b332e22cf34b98c20c720602c920d28aed01d6c
Eric Laurent [Tue, 30 Oct 2012 21:14:40 +0000 (14:14 -0700)]
am
f79daa94: Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
* commit '
f79daa942005608e56a4a0d7f414fedccd56e467':
display audio dialog when connecting low end dock
Eric Laurent [Tue, 30 Oct 2012 21:12:22 +0000 (14:12 -0700)]
Merge "display audio dialog when connecting low end dock" into jb-mr1-dev
Justin Ho [Tue, 30 Oct 2012 18:17:54 +0000 (11:17 -0700)]
am
29c4c88b: Merge "Whoops, missed a \'Sleep Mode\' -> \'Daydream\' string." into jb-mr1-dev
* commit '
29c4c88be2c2f225a1daff551b4e32ed03cc1bda':
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Justin Ho [Tue, 30 Oct 2012 18:16:44 +0000 (11:16 -0700)]
Merge "Whoops, missed a 'Sleep Mode' -> 'Daydream' string." into jb-mr1-dev
Eric Laurent [Tue, 30 Oct 2012 00:56:46 +0000 (17:56 -0700)]
display audio dialog when connecting low end dock
Display a dialog to enable the use of the dock audio connection
when a low end dock is connected for the first time.
Modify DockService to process docked and undocked messages even if
the device indicated is null (meaning the dock is not a bluetooth dock)
only for low end docks.
Bug
7302106.
Change-Id: I331d83a74fecf5f26b24bfc178342df414bd8153
Daniel Sandler [Tue, 30 Oct 2012 13:59:16 +0000 (09:59 -0400)]
Whoops, missed a 'Sleep Mode' -> 'Daydream' string.
Change-Id: I7ed00811e2c31459aaa32336dba4ff75b095f5ef
Jeff Sharkey [Mon, 29 Oct 2012 23:37:17 +0000 (16:37 -0700)]
am
c2c9d5bd: Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
* commit '
c2c9d5bde11113d3fc86f1ea25b41e7446e3d833':
Selectively enable bugreport in power menu.
Jeff Sharkey [Mon, 29 Oct 2012 23:35:07 +0000 (16:35 -0700)]
Merge "Selectively enable bugreport in power menu." into jb-mr1-dev
Baligh Uddin [Mon, 29 Oct 2012 22:22:47 +0000 (15:22 -0700)]
am
2e0679ed: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
2e0679ed54cda79fa3f5ae6f75fb2a71aeb40f54':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 29 Oct 2012 22:20:29 +0000 (15:20 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 29 Oct 2012 22:19:59 +0000 (15:19 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Vikram Aggarwal [Mon, 29 Oct 2012 22:14:23 +0000 (15:14 -0700)]
am
8d028a87: Allow wireless charging during encrypt
* commit '
8d028a87e97f9420f9db31a6b8aa80859fe393b3':
Allow wireless charging during encrypt
Jeff Sharkey [Mon, 29 Oct 2012 20:59:07 +0000 (13:59 -0700)]
Selectively enable bugreport in power menu.
The underlying bugreport init service depends on USB debugging being
turned on for user builds. This change makes the developer options
UI reflect this constraint.
Bug:
7427434
Change-Id: I8dc16cc53ec4a97a3b39ee631694456be3bde081
Baligh Uddin [Mon, 29 Oct 2012 20:31:03 +0000 (13:31 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ifdee0ced0a57d8ccf512e12166ea1ec66418a6c2
Auto-generated-cl: translation import
Baligh Uddin [Mon, 29 Oct 2012 20:24:42 +0000 (13:24 -0700)]
Import translations. DO NOT MERGE
Change-Id: Iab4a9535ce1e86eb842f82bcbb9a7e689a168064
Auto-generated-cl: translation import
Vikram Aggarwal [Mon, 29 Oct 2012 18:00:01 +0000 (11:00 -0700)]
Allow wireless charging during encrypt
Bug:
7426476 Cant Encrypt mako device using Charging pad as charging
source
Change-Id: I6584a9e7a1533e06f0b0d55c1afd42641ee7ac3d
Baligh Uddin [Mon, 29 Oct 2012 01:36:02 +0000 (18:36 -0700)]
am
e42e7b85: (-s ours) Import translations. DO NOT MERGE
* commit '
e42e7b85285963cd959cec701689deaefbe44898':
Import translations. DO NOT MERGE
Baligh Uddin [Sun, 28 Oct 2012 19:43:44 +0000 (12:43 -0700)]
Import translations. DO NOT MERGE
Change-Id: I60f85bd27cdf76663190767052c90db3c521848f
Auto-generated-cl: translation import
Baligh Uddin [Sun, 28 Oct 2012 19:42:08 +0000 (12:42 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ida5a2fe0251fde7f8ad846aa94564a5be6c5fe0b
Auto-generated-cl: translation import
Eric Laurent [Sat, 27 Oct 2012 21:43:39 +0000 (14:43 -0700)]
Merge "added dock audio settings for non bluetooth docks" into jb-mr1-dev
Eric Laurent [Sat, 27 Oct 2012 01:55:16 +0000 (18:55 -0700)]
added dock audio settings for non bluetooth docks
This is a quick implementation allowing support for non bluetooth
audio docks.
Longer term it would be better to generalize DockService to support
all kinds of docks.
Bug
7302106.
Change-Id: I2df31ddbd8057a7297b244ea6a9e2d5a6a39bf7f
Daniel Sandler [Fri, 26 Oct 2012 12:46:14 +0000 (05:46 -0700)]
am
4cf289ad: Merge "Wording change for Daydream setting" into jb-mr1-dev
* commit '
4cf289ad4d2d4f6ef0950b8542f53366f7e6f923':
Wording change for Daydream setting
Daniel Sandler [Fri, 26 Oct 2012 11:46:13 +0000 (04:46 -0700)]
Merge "Wording change for Daydream setting" into jb-mr1-dev
Michael Jurka [Thu, 25 Oct 2012 23:05:10 +0000 (16:05 -0700)]
Add ability to add clock widget to keyguard
Change-Id: I70e6fbb664181efc2906ed33d732695279462a95
Amith Yamasani [Thu, 25 Oct 2012 05:48:41 +0000 (22:48 -0700)]
am
b02771ef: Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
* commit '
b02771eff35cccf03202e4b8e27a44681a5f7570':
Reduce jank in security lock selection by finishing on return
Amith Yamasani [Thu, 25 Oct 2012 05:47:17 +0000 (22:47 -0700)]
Merge "Reduce jank in security lock selection by finishing on return" into jb-mr1-dev
Daniel Sandler [Thu, 25 Oct 2012 03:34:28 +0000 (23:34 -0400)]
Wording change for Daydream setting
Bug:
7410881
Change-Id: I5970254f2ffc33ab34fa61c08acaf1564e2556ca
Michael Jurka [Thu, 25 Oct 2012 01:28:27 +0000 (18:28 -0700)]
Merge "Adding ability to add multiple keyguard widgets" into jb-mr1-lockscreen-dev
Michael Jurka [Wed, 24 Oct 2012 19:26:41 +0000 (12:26 -0700)]
Adding ability to add multiple keyguard widgets
Bug:
7381803
Change-Id: I099f47a5cc43199635fed9ad2c4d03d79004e4f4
Baligh Uddin [Thu, 25 Oct 2012 00:33:28 +0000 (17:33 -0700)]
am
b8a97822: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
b8a9782221c27646ade69141e09a4faa3473422e':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 25 Oct 2012 00:32:33 +0000 (17:32 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Thu, 25 Oct 2012 00:31:11 +0000 (17:31 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Wed, 24 Oct 2012 23:19:55 +0000 (16:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5e09f5b9727a8c8121eb2243bc519b99eb313903
Auto-generated-cl: translation import
Baligh Uddin [Wed, 24 Oct 2012 23:15:53 +0000 (16:15 -0700)]
Import translations. DO NOT MERGE
Change-Id: I5a5f54816579e0aef799b0a695bae71deb69eb69
Auto-generated-cl: translation import
Amith Yamasani [Wed, 24 Oct 2012 17:27:05 +0000 (10:27 -0700)]
Reduce jank in security lock selection by finishing on return
Earlier the finish of the chooser was happening before the pattern/pin chooser
was started, resulting in two transitions.
This change defers the finish to after returning from the other activity. There
is still sometimes a very small glitch on the way back, but much smaller than
the current problem.
Bug:
7342594
Change-Id: I5f4f4393b841ce31dc7236074381283155ebddbd
Amith Yamasani [Wed, 24 Oct 2012 20:29:28 +0000 (13:29 -0700)]
am
5749ce09: Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
* commit '
5749ce0903cad3160a5cf907af3a9a4cbc4b1d4e':
Use given name instead of full name for the initial population of User name.
Amith Yamasani [Wed, 24 Oct 2012 20:26:38 +0000 (13:26 -0700)]
Merge "Use given name instead of full name for the initial population of User name." into jb-mr1-dev
Amith Yamasani [Tue, 23 Oct 2012 22:36:16 +0000 (15:36 -0700)]
Use given name instead of full name for the initial population of User name.
Bug:
7406217
Change-Id: I5006039ef146369f569445d0fcbaf82fd163343e
Baligh Uddin [Tue, 23 Oct 2012 22:17:59 +0000 (15:17 -0700)]
am
e508a26e: Remove blank translation string from en-GB, so it can show English.
* commit '
e508a26e037c1b0a813575f1154da0ede7644979':
Remove blank translation string from en-GB, so it can show English.
Baligh Uddin [Tue, 23 Oct 2012 20:25:55 +0000 (13:25 -0700)]
Remove blank translation string from en-GB, so it can show English.
Change-Id: I124abc4113f38b8fbd3ff164af5f0d47970f5471
Baligh Uddin [Tue, 23 Oct 2012 18:24:40 +0000 (11:24 -0700)]
am
50ab4b47: Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
* commit '
50ab4b47bc776c257c1491cb4a68ee8afc5599e5':
Manually enter translations for msgid:
9014073093293520112
Baligh Uddin [Tue, 23 Oct 2012 18:22:38 +0000 (11:22 -0700)]
Merge "Manually enter translations for msgid:
9014073093293520112" into jb-mr1-dev
Russell Brenner [Tue, 23 Oct 2012 18:02:59 +0000 (11:02 -0700)]
am
26bb2398: Merge "Fix layout with no access points" into jb-mr1-dev
* commit '
26bb2398cf8ebe1879adfb3043709467474858ec':
Fix layout with no access points
Baligh Uddin [Mon, 22 Oct 2012 21:42:21 +0000 (14:42 -0700)]
Manually enter translations for msgid:
9014073093293520112
Per discussion with Maarten / pbrady, enter empty string for
untranslated languages.
Bug:
7383934
Change-Id: I0faa661820e1cb39603327f8d7d748535249e75d
Russell Brenner [Tue, 23 Oct 2012 18:00:00 +0000 (11:00 -0700)]
Merge "Fix layout with no access points" into jb-mr1-dev
Russell Brenner [Tue, 23 Oct 2012 17:45:03 +0000 (10:45 -0700)]
Fix layout with no access points
The "Searching for Wi-Fi" message was filling it's view parent,
pushing the "Other network..." option and Skip button out of view.
Bug:
7335738
Change-Id: I6fd1ceff67e04385c6e325ec4bb8a2e30f38c924
Daniel Sandler [Tue, 23 Oct 2012 15:17:28 +0000 (08:17 -0700)]
am
769b4711: Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
* commit '
769b4711c94cc9093012e51e0101659d712b99ee':
Dreams/Sleep Mode is now Daydreams.
Daniel Sandler [Tue, 23 Oct 2012 15:15:47 +0000 (08:15 -0700)]
Merge "Dreams/Sleep Mode is now Daydreams." into jb-mr1-dev
Daniel Sandler [Tue, 23 Oct 2012 05:22:36 +0000 (01:22 -0400)]
Dreams/Sleep Mode is now Daydreams.
Bug:
7395321
Change-Id: Ifac4eca70e83c8b90e0cd2d16809dd117e279790
Amith Yamasani [Tue, 23 Oct 2012 00:59:11 +0000 (17:59 -0700)]
am
b80b8bb2: Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
* commit '
b80b8bb2535504bada0664a7255b5fa61c2c3947':
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
Amith Yamasani [Tue, 23 Oct 2012 00:56:54 +0000 (17:56 -0700)]
Merge "Fixes an AIOOBE when device admin enforces a small timeout for screen lock" into jb-mr1-dev
Amith Yamasani [Mon, 22 Oct 2012 23:38:02 +0000 (16:38 -0700)]
Fixes an AIOOBE when device admin enforces a small timeout for screen lock
Bug:
7378871
If the timeout choices are empty, set an empty summary.
Change-Id: I20dbe61af56f9c41337a7c284580511322e5a45e
Baligh Uddin [Mon, 22 Oct 2012 21:01:14 +0000 (14:01 -0700)]
am
a7acb166: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
a7acb166b282e3aa178eb1f6d1c8ece877d2c64d':
Import translations. DO NOT MERGE
Baligh Uddin [Mon, 22 Oct 2012 20:59:28 +0000 (13:59 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-lockscreen-dev
Baligh Uddin [Mon, 22 Oct 2012 20:58:38 +0000 (13:58 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Mon, 22 Oct 2012 19:11:35 +0000 (12:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: I8c6dd26846136e2c70a725bddde0bf26e44b1509
Auto-generated-cl: translation import
Baligh Uddin [Mon, 22 Oct 2012 19:09:26 +0000 (12:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia49c8378454cc2af782efffce6aa70c60568f3fd
Auto-generated-cl: translation import
Guang Zhu [Mon, 22 Oct 2012 18:53:22 +0000 (11:53 -0700)]
am
a023f4f6: Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
* commit '
a023f4f6404027c3525af2cc48535a208e33b1d8':
Prevent sync state changes when user is a monkey
Guang Zhu [Mon, 22 Oct 2012 18:50:38 +0000 (11:50 -0700)]
Merge "Prevent sync state changes when user is a monkey" into jb-mr1-dev
Guang Zhu [Sat, 20 Oct 2012 00:55:05 +0000 (17:55 -0700)]
Prevent sync state changes when user is a monkey
Bug:
7385019
Change-Id: Icf305683e57b83b3260f2587ae0a3d1a6dc3c21d
Russell Brenner [Sun, 21 Oct 2012 15:05:17 +0000 (08:05 -0700)]
am
56a166e9: Added info about why Wi-Fi is required
* commit '
56a166e9e3cac96246bd724ceea96846fc9e41e1':
Added info about why Wi-Fi is required
Russell Brenner [Sat, 20 Oct 2012 01:55:14 +0000 (18:55 -0700)]
Added info about why Wi-Fi is required
Added a new optional textview to wifi settings, informing that wifi
is required during setup. For use on Nakasi 3G.
Bug:
7383934
Change-Id: I231472438e61ccddedc1e680a362f90738d64a2d
John Spurlock [Fri, 19 Oct 2012 18:06:26 +0000 (11:06 -0700)]
am
d983e1d1: Settings: Use new shared dream setting defaults.
* commit '
d983e1d1a52af2ab85d10f1a15c8387a6b6a3ba9':
Settings: Use new shared dream setting defaults.
John Spurlock [Thu, 18 Oct 2012 20:41:09 +0000 (16:41 -0400)]
Settings: Use new shared dream setting defaults.
Bug:
7373284
Change-Id: I12d00b45d0bada5207af3a7bda906370e7a87413
Jeff Sharkey [Fri, 19 Oct 2012 06:25:23 +0000 (23:25 -0700)]
am
5a740ab1: Merge "More migration to Global settings." into jb-mr1-dev
* commit '
5a740ab1b9d5757d684f6a798932f0b4729cc9a7':
More migration to Global settings.
Jeff Sharkey [Fri, 19 Oct 2012 06:23:07 +0000 (23:23 -0700)]
Merge "More migration to Global settings." into jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 01:12:00 +0000 (18:12 -0700)]
am
8b982465: Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
* commit '
8b98246559c7422e507458a63c8dfc2783bd0afc':
Control OpenGL traces from Developer Options in Settings
Romain Guy [Fri, 19 Oct 2012 01:09:48 +0000 (18:09 -0700)]
Merge "Control OpenGL traces from Developer Options in Settings" into jb-mr1-dev
Romain Guy [Fri, 19 Oct 2012 00:37:43 +0000 (17:37 -0700)]
Control OpenGL traces from Developer Options in Settings
This change adds a new entry to the developer options screen in
settings that lets you choose what OpenGL traces you want.
Change-Id: Ie789fa20dbbabee1e509b697106072464e9f9d2b
Jeff Sharkey [Thu, 18 Oct 2012 22:38:42 +0000 (15:38 -0700)]
More migration to Global settings.
Bug:
7375796
Change-Id: I43079368c32e91e8bb75b00377cd57d1766f15d4
Zhihai Xu [Thu, 18 Oct 2012 22:09:45 +0000 (15:09 -0700)]
am
8346107d: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '
8346107d25a05580fa98adaaff9d28c025d3faed':
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
Zhihai Xu [Thu, 18 Oct 2012 22:07:48 +0000 (15:07 -0700)]
Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
Zhihai Xu [Thu, 18 Oct 2012 20:03:10 +0000 (13:03 -0700)]
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
The root cause is normally when change the airplane mode, the bluetooth setting UI
will not be foreground. No listener is setup for bluetooth setting UI when it is
in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
won't be called. But for manta, airplane mode setting and bluetooth setting UI both
will show on the foreground due to bigger screen size. When we turn ariplane mode on,
bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.
Don't need to consider thread synchronization, because everything is running on the main thread.
bug
7366814
Change-Id: I138d1904df6cb17c7828295caa51a7d80abf99f2
Daniel Sandler [Thu, 18 Oct 2012 17:27:04 +0000 (10:27 -0700)]
am
deb5a843: Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
* commit '
deb5a843c9feb39d8ea564347a97417b34a5e9a1':
More descriptive summary for "Sleep Mode" pref.
Daniel Sandler [Thu, 18 Oct 2012 17:24:42 +0000 (10:24 -0700)]
Merge "More descriptive summary for "Sleep Mode" pref." into jb-mr1-dev
Fabrice Di Meglio [Thu, 18 Oct 2012 17:14:35 +0000 (10:14 -0700)]
am
c14d1134: Merge "Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
* commit '
c14d1134a06324ece490f7ace3337c692b2ea542':
Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
Fabrice Di Meglio [Thu, 18 Oct 2012 17:13:18 +0000 (10:13 -0700)]
Merge "Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )" into jb-mr1-dev
Daniel Sandler [Thu, 18 Oct 2012 14:33:59 +0000 (10:33 -0400)]
More descriptive summary for "Sleep Mode" pref.
It will either show "Off" or the name of the selected dream.
Also, move "When to sleep" out onto the visible part of the
action bar if there's room, making it much easier to discover.
Bug:
7320701
Change-Id: I1d4e2c17b764b8ee054dbb17c23f559d735e3450
Baligh Uddin [Thu, 18 Oct 2012 05:40:07 +0000 (22:40 -0700)]
am
f6d4b290: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
f6d4b29088eb9c12f144828f905cee64bd4e0358':
Import translations. DO NOT MERGE
Baligh Uddin [Thu, 18 Oct 2012 05:35:16 +0000 (22:35 -0700)]
Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
Baligh Uddin [Thu, 18 Oct 2012 05:19:25 +0000 (22:19 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ia0b02f13e3dd75052d20687605be5856f635aa67
Auto-generated-cl: translation import
Brian Muramatsu [Thu, 18 Oct 2012 04:53:36 +0000 (21:53 -0700)]
am
c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
* commit '
c30a6712f266b9d4cf0c68b4a708ae6ae95911f4':
Show regulatory info within a ScrollView
Brian Muramatsu [Thu, 18 Oct 2012 04:51:27 +0000 (21:51 -0700)]
Merge "Show regulatory info within a ScrollView" into jb-mr1-dev
John Huang [Thu, 18 Oct 2012 02:55:32 +0000 (19:55 -0700)]
am
50023033: Merge "Revert "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
* commit '
5002303399341d7d442856a30df9080b896d7c55':
Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
John Huang [Thu, 18 Oct 2012 02:53:46 +0000 (19:53 -0700)]
Merge "Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"" into jb-mr1-dev
Casey Burkhardt [Thu, 18 Oct 2012 02:29:08 +0000 (19:29 -0700)]
am
91ecf27a: Correcting content description in Wifi network selection activity. Bug:
7362208
* commit '
91ecf27ab6713fa18be509c9ec4d143789a0ca5f':
Correcting content description in Wifi network selection activity. Bug:
7362208
Irfan Sheriff [Thu, 18 Oct 2012 01:43:37 +0000 (18:43 -0700)]
Revert "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)"
This reverts commit
0b21b3d725935c03a4ca4ab8476da2b0675a53cd.
Bug:
7366814
Change-Id: I0992e9ca1a6e36ebc3a717137a6c494835fad712
Brian Muramatsu [Thu, 18 Oct 2012 01:27:02 +0000 (18:27 -0700)]
Show regulatory info within a ScrollView
Bug
7200143
Some images won't fit in portrait and landscape mode.
Change-Id: I06016ec5dd85db9801120ac20dfedc249e94c20f
Fabrice Di Meglio [Thu, 18 Oct 2012 00:50:05 +0000 (17:50 -0700)]
Fix bug #
7356946 The Data Usage app details contain titles that are not RTL align. ( Hebrew Only )
- use "viewStart" as text alignment
Change-Id: Iaff5eec130fcb57e8352f16f87faaf3bd980e994
Casey Burkhardt [Wed, 17 Oct 2012 23:50:50 +0000 (16:50 -0700)]
Correcting content description in Wifi network selection activity.
Bug:
7362208
Change-Id: I12a65657e95d1510c388e7f18e0af753f0680533
Zhihai Xu [Wed, 17 Oct 2012 23:35:14 +0000 (16:35 -0700)]
am
6ec44ff0: Merge "bluetooth won\'t turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
* commit '
6ec44ff0642bdca94c12f849552aa101e93313b9':
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
Zhihai Xu [Wed, 17 Oct 2012 23:32:56 +0000 (16:32 -0700)]
Merge "bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)" into jb-mr1-dev
Amith Yamasani [Wed, 17 Oct 2012 21:09:24 +0000 (14:09 -0700)]
am
7a1c4cdf: Fix check for multiple users
* commit '
7a1c4cdfae66e8b110de3988e65586871a969c04':
Fix check for multiple users
Zhihai Xu [Wed, 17 Oct 2012 19:35:14 +0000 (12:35 -0700)]
bluetooth won't turn on after turn Airplane mode off on setting screen on manta(tablet)
The root cause is normally when change the airplane mode, the bluetooth setting UI
will not be foreground. No listener is setup for bluetooth setting UI when it is
in background. So the onCheckedChanged won't be called and mLocalAdapter.setBluetoothEnabled
won't be called. But for manta, airplane mode setting and bluetooth setting UI both
will show on the foreground due to bigger screen size. When we turn ariplane mode on,
bluetooth manager service will disable bluetooth without changing the persist bluetooth setting.
But bluetooth setting UI will listen to the bluetooth state change intent, it will receive
bluetooth state turn-off intent then it will call mSwitch.setChecked(false) in handleStateChanged,
which cause checked status changed from true to false to trigger the listener (onCheckedChanged)
being called. The listener will call mAdapter.disable() which will call mManagerService.disable(true)
to change bluetooth persist state to OFF. So when we turn back airplane more to OFF,
due to the bluetooth persist state is OFF, we won't turn back bluetooth to ON.
bug
7366814
Change-Id: I07d4a2dfe03fc6775cfeabb28cd3a0cc1fded44e
Amith Yamasani [Wed, 17 Oct 2012 20:27:19 +0000 (13:27 -0700)]
Fix check for multiple users
Bug:
7365839
Remove the Uninstall for all users option if less than 2 users on the device.
Change-Id: I5d2d853e05e1d505b67f8b83b1d5ea7f9c6e7215
Michael Jurka [Wed, 17 Oct 2012 19:33:21 +0000 (12:33 -0700)]
am
7d078f94: Fix crash when viewing installed app details page
* commit '
7d078f942f51f12bde6dbe1f2acd122f81ed0e07':
Fix crash when viewing installed app details page
Michael Jurka [Wed, 17 Oct 2012 19:08:33 +0000 (21:08 +0200)]
Fix crash when viewing installed app details page
Change-Id: I6b4f644d5208c8ac0254bcc8348b87575c431c06
Baligh Uddin [Wed, 17 Oct 2012 18:09:40 +0000 (11:09 -0700)]
am
8e3f8d3a: (-s ours) Merge "Import translations. DO NOT MERGE" into jb-mr1-dev
* commit '
8e3f8d3af576648cc73181d3ba2a89c107dffc75':
Import translations. DO NOT MERGE