OSDN Git Service
Sanket Padawe [Wed, 3 Jun 2015 22:06:01 +0000 (22:06 +0000)]
am
3d32af26: Fix Wifi Settings crash on continuous wifi toggling.
* commit '
3d32af264254660150c5f2d63a64b3462a9378dd':
Fix Wifi Settings crash on continuous wifi toggling.
Sanket Padawe [Wed, 3 Jun 2015 21:16:13 +0000 (14:16 -0700)]
Fix Wifi Settings crash on continuous wifi toggling.
Bug:
21591640
Change-Id: I17aa385a1e5fb3edfdb054234ab20b3dbc6fea60
Sanket Padawe [Wed, 3 Jun 2015 19:09:08 +0000 (19:09 +0000)]
am
fb619a87: Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
* commit '
fb619a8726cf912e9c9156d8ca06760b641c5171':
Fix Wifi Signal strength icon issues in WifiSettings.
Sanket Padawe [Wed, 3 Jun 2015 18:57:39 +0000 (18:57 +0000)]
Merge "Fix Wifi Signal strength icon issues in WifiSettings." into mnc-dev
Sanket Padawe [Wed, 3 Jun 2015 18:54:41 +0000 (11:54 -0700)]
Fix Wifi Signal strength icon issues in WifiSettings.
Bug:
21591392
Bug:
21592509
Change-Id: I6612ef62c17e6279b06f80a67bee345e913f1927
Geoff Mendal [Wed, 3 Jun 2015 18:32:09 +0000 (18:32 +0000)]
am
26e8b0bf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev
* commit '
26e8b0bf7d62c0a9baed5c1b72b5c992d8209377':
Import translations. DO NOT MERGE
Geoff Mendal [Wed, 3 Jun 2015 18:18:43 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 18:12:58 +0000 (18:12 +0000)]
am
0732a646: Merge "Fix some dark theme issues" into mnc-dev
* commit '
0732a646020d97ab38c247cce21674838715c322':
Fix some dark theme issues
Nicolas Prevot [Wed, 3 Jun 2015 18:12:54 +0000 (18:12 +0000)]
am
bc9a3630: Merge "Don\'t allow secondary users apps to start restricted Settings fragment." into mnc-dev
* commit '
bc9a3630bc6dac8f1ba7ecfbb2ec65589519d437':
Don't allow secondary users apps to start restricted Settings fragment.
Jason Monk [Wed, 3 Jun 2015 18:12:53 +0000 (18:12 +0000)]
am
e6d7623c: Merge "Reorder device category" into mnc-dev
* commit '
e6d7623ca704e0d42d433e573423611a82d7cd5c':
Reorder device category
Geoff Mendal [Wed, 3 Jun 2015 18:04:23 +0000 (11:04 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id0f8d1901b248c78ee0903628bde034c9f8addd5
Auto-generated-cl: translation import
Barnaby James [Wed, 3 Jun 2015 17:42:34 +0000 (17:42 +0000)]
am
ef0b4362: Merge "Fix TTS for Zen mode voice activity." into mnc-dev
* commit '
ef0b43625c8aa3e8519888e4e185daa77b33dc2a':
Fix TTS for Zen mode voice activity.
Xiyuan Xia [Wed, 3 Jun 2015 17:41:16 +0000 (17:41 +0000)]
am
d9e92ea5: Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
* commit '
d9e92ea551af6b65deb88ea68a229fac03030d03':
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
Jason Monk [Wed, 3 Jun 2015 17:30:54 +0000 (17:30 +0000)]
Merge "Fix some dark theme issues" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 14:53:03 +0000 (10:53 -0400)]
Fix some dark theme issues
Bug:
21117509
Bug:
21077345
Bug:
21480587
Change-Id: I61bcd6631288b0e51204ac8bf134c44b2800e0fe
Nicolas Prevot [Wed, 3 Jun 2015 17:28:34 +0000 (17:28 +0000)]
Merge "Don't allow secondary users apps to start restricted Settings fragment." into mnc-dev
Jason Monk [Wed, 3 Jun 2015 17:21:59 +0000 (17:21 +0000)]
Merge "Reorder device category" into mnc-dev
Jason Monk [Wed, 3 Jun 2015 17:18:07 +0000 (13:18 -0400)]
Reorder device category
Bug:
21588753
Change-Id: Ie01ad44b3bc9d2d3cac165e25b72a112896d4d2c
Barnaby James [Wed, 3 Jun 2015 17:09:45 +0000 (17:09 +0000)]
Merge "Fix TTS for Zen mode voice activity." into mnc-dev
Xiyuan Xia [Wed, 3 Jun 2015 16:07:41 +0000 (16:07 +0000)]
Merge "Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText" into mnc-dev
Nicolas Prevot [Tue, 2 Jun 2015 21:27:49 +0000 (22:27 +0100)]
Don't allow secondary users apps to start restricted Settings fragment.
On a secondary user, the fragments ApnSettings, TetherSettings and VpnSettings
should not be started.
But an app can still send an intent to start these fragments.
Prevent this by checkin the userId in these fragments.
BUG:
15313261
BUG:
15312781
BUG:
15312494
Change-Id: I2a36bb89a8e37e4440aa28372d7a1800b33dae37
Sanket Padawe [Tue, 2 Jun 2015 23:15:42 +0000 (23:15 +0000)]
am
fb32790a: Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
* commit '
fb32790adc9ed647ad4e77c9613a860f9b76e855':
Fix Bluetooth device Settings checkbox issue on clicking "Input device"
Sanket Padawe [Tue, 2 Jun 2015 23:04:23 +0000 (23:04 +0000)]
Merge "Fix Bluetooth device Settings checkbox issue on clicking "Input device"" into mnc-dev
Sanket Padawe [Tue, 2 Jun 2015 23:00:43 +0000 (16:00 -0700)]
Fix Bluetooth device Settings checkbox issue on clicking "Input device"
Bug:
19937357
Change-Id: I6f74577a062df407e50972b84dd4e5d7d2da529b
Jason Monk [Tue, 2 Jun 2015 22:48:49 +0000 (22:48 +0000)]
am
6a051168: Merge "Hide search from everywhere but the dashboard" into mnc-dev
* commit '
6a05116804c9b849bf3aa634df3e90cc216abc88':
Hide search from everywhere but the dashboard
Jason Monk [Tue, 2 Jun 2015 22:39:07 +0000 (22:39 +0000)]
Merge "Hide search from everywhere but the dashboard" into mnc-dev
Xiyuan Xia [Tue, 2 Jun 2015 22:21:51 +0000 (15:21 -0700)]
Use accessibilityLiveRegion for ConfirmLockPassword/Pattern errorText
- Revert previous "Add announceForAccessibility to ConfirmLockPattern";
- Add android:accessibilityLiveRegion="polite" for errorText in
ConfirmLockPassword/Pattern;
Bug:
20282779
Change-Id: I4b9c0d461d0dd0504bd88a8a2144e09a42d5f64e
Adrian Roos [Tue, 2 Jun 2015 20:55:01 +0000 (20:55 +0000)]
am
96e25b8d: Merge "Only show emergency app preference if enabled" into mnc-dev
* commit '
96e25b8d938082715f93bd071eb386a2174b910d':
Only show emergency app preference if enabled
Jason Monk [Tue, 2 Jun 2015 20:54:59 +0000 (20:54 +0000)]
am
0d7d9272: Change DeviceProfilesSettings to DialogFragment
* commit '
0d7d927216e536ead911f4949134ca362af345ab':
Change DeviceProfilesSettings to DialogFragment
Adrian Roos [Tue, 2 Jun 2015 20:50:34 +0000 (20:50 +0000)]
Merge "Only show emergency app preference if enabled" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 20:46:34 +0000 (16:46 -0400)]
Hide search from everywhere but the dashboard
Because it is too confusing what it does/doesn't search.
Bug:
21556767
Change-Id: Ib162177ce3eea816344d8d0fd5d71f85bfc94183
Jason Monk [Tue, 2 Jun 2015 18:05:55 +0000 (14:05 -0400)]
Change DeviceProfilesSettings to DialogFragment
This makes the lifecycle simpler to fix a crash after rotation.
Also do some adjusting of alignment while here.
Bug:
21444336
Bug:
21205689
Change-Id: I67eccf4833f53b5e5088ae5e6038d041e8653565
Jason Monk [Tue, 2 Jun 2015 20:22:17 +0000 (20:22 +0000)]
am
1b7bff11: Merge "Fix battery usage screen issues" into mnc-dev
* commit '
1b7bff11af6eba5e16dc4ef37dd18d4360c0e03f':
Fix battery usage screen issues
Jason Monk [Tue, 2 Jun 2015 20:09:16 +0000 (20:09 +0000)]
Merge "Fix battery usage screen issues" into mnc-dev
Jason Monk [Tue, 2 Jun 2015 17:03:24 +0000 (13:03 -0400)]
Fix battery usage screen issues
Tint icons properly
Bug:
21077770
Show better icons for wifi and bt (remove the old ones)
Bug:
21172936
Also add a way to show fake items in power list for testing.
Change-Id: I6b6804673a68190ebc3f2ea32802e30811a7f5b2
Sanket Padawe [Tue, 2 Jun 2015 18:22:48 +0000 (18:22 +0000)]
am
6a6ae2dc: Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
* commit '
6a6ae2dc8401eafdb1710c97c4b07aa53c797ba1':
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
Sanket Padawe [Tue, 2 Jun 2015 18:14:30 +0000 (18:14 +0000)]
Merge "Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings." into mnc-dev
Sanket Padawe [Tue, 2 Jun 2015 18:13:01 +0000 (11:13 -0700)]
Fix UI checkbox issue while disabling "Phone Audio" in Blueotooth Settings.
Bug:
18048121
Change-Id: If837a58a4840be3d5b9f3cc16ecb261d9ab4420a
Xiyuan Xia [Tue, 2 Jun 2015 15:50:28 +0000 (15:50 +0000)]
am
279c7ad7: Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
* commit '
279c7ad7f02d466ac0959dcd90cbd4102afff4fb':
Add announceForAccessibility to ConfirmLockPattern
Robin Lee [Tue, 2 Jun 2015 15:50:27 +0000 (15:50 +0000)]
am
81ae7913: Merge "Clear connected legacy VPN during rescan" into mnc-dev
* commit '
81ae79132f022fe93be24aa419ad1dd28ba86fd7':
Clear connected legacy VPN during rescan
Xiyuan Xia [Tue, 2 Jun 2015 15:45:17 +0000 (15:45 +0000)]
Merge "Add announceForAccessibility to ConfirmLockPattern" into mnc-dev
Robin Lee [Tue, 2 Jun 2015 15:37:19 +0000 (15:37 +0000)]
Merge "Clear connected legacy VPN during rescan" into mnc-dev
Hemant Gupta [Tue, 2 Jun 2015 09:44:39 +0000 (09:44 +0000)]
am
b8df8a29: Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
* commit '
b8df8a29bf26a500d2f83a79bc09e78c8811041b':
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
Andre Eisenbach [Tue, 2 Jun 2015 09:44:38 +0000 (09:44 +0000)]
am
7292d892: Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
* commit '
7292d89280f7c4814e8fa93903dc73e3515b6558':
Bluetooth PAN: Set isPreferred to true (2/2)
Hemant Gupta [Thu, 17 Apr 2014 14:40:28 +0000 (20:10 +0530)]
Bluetooth: Acquire wakelock to turn on LCD for MAP authorization
This patch acquires a wakelock to turn on the LCD display if the screen
is off during an access request for MAP. Without this patch it was
observed that if the screen was off, the LCD remained off for incoming
connection access request from remote devices and the user only heard
the notification sound without the LDC being lit up.
Change-Id: I87c296fce4cd8e0c133f74169d991eee263fed08
Andre Eisenbach [Tue, 2 Jun 2015 09:00:29 +0000 (09:00 +0000)]
Merge "Bluetooth PAN: Set isPreferred to true (2/2)" into mnc-dev
Andre Eisenbach [Tue, 2 Jun 2015 08:48:29 +0000 (01:48 -0700)]
Bluetooth PAN: Set isPreferred to true (2/2)
isPreferred must always be true for PAN so that the DUT can initiate
a PANU connection with the remote device not only from the internet
access menu in the profile setting, but also from the paired device
list menu.
Currently isPreferred is only true when PAN is in connected state
for the PANU role, so it will return false when the PAN profile is
not connected and the PANU connection will never be initiated
from the paired device list menu.
Change-Id: I3d52d89136269508ac6416b695b22842f4bb557a
Robin Lee [Tue, 2 Jun 2015 01:45:40 +0000 (18:45 -0700)]
Clear connected legacy VPN during rescan
Change-Id: I0fec37b3f73ce5b538721d79e78e1128d7667380
Andres Morales [Tue, 2 Jun 2015 01:20:32 +0000 (01:20 +0000)]
am
6c91ae68: Merge "[MasterClear] fix race in showing dialog" into mnc-dev
* commit '
6c91ae68d98431142a5ea3a92601535e5d6c91f0':
[MasterClear] fix race in showing dialog
Andres Morales [Tue, 2 Jun 2015 01:09:31 +0000 (01:09 +0000)]
Merge "[MasterClear] fix race in showing dialog" into mnc-dev
Andres Morales [Mon, 1 Jun 2015 23:23:41 +0000 (16:23 -0700)]
[MasterClear] fix race in showing dialog
Wiping the PDB effectively starves all other threads from
accessing flash, and freezes the UI. We throw up a dialog
but there's a race between drawing the dialog and starting the
wipe.
Show the dialog in onPreExecute to fix this.
Bug:
20854355
Change-Id: I8462f5ed3ff53ed574ebc1be416a821c2086b4f5
Sanket Padawe [Mon, 1 Jun 2015 22:34:20 +0000 (22:34 +0000)]
am
afa6361d: Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
* commit '
afa6361d36f522b4361c4a91a33edd39d322363a':
Fix scrolling issue for Wifi hotspot setup layout.
Sanket Padawe [Mon, 1 Jun 2015 22:21:51 +0000 (22:21 +0000)]
Merge "Fix scrolling issue for Wifi hotspot setup layout." into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 22:18:48 +0000 (15:18 -0700)]
Fix scrolling issue for Wifi hotspot setup layout.
Bug:
19856113
Change-Id: Id49ac7c452f10e0de43b18ecdecc68619faecbc3
Xiyuan Xia [Mon, 1 Jun 2015 22:05:54 +0000 (15:05 -0700)]
Add announceForAccessibility to ConfirmLockPattern
This makes Talkback in ConfirmLockPattern works similarly as
in ConfirmLockPassword to read out error messages.
Bug:
20282779
Change-Id: Ied05c284e959539cfbff965f33edd51c3bdfc9f9
Jason Monk [Mon, 1 Jun 2015 20:06:52 +0000 (20:06 +0000)]
am
ef1d4b66: Merge "Make Theme a DropDownPreference" into mnc-dev
* commit '
ef1d4b66abd4e3c1ff4759a4dba7f7f5947af2d3':
Make Theme a DropDownPreference
Jason Monk [Mon, 1 Jun 2015 19:55:14 +0000 (19:55 +0000)]
am
0d2eea38: Merge "Change name of search menu item to be more descriptive" into mnc-dev
* commit '
0d2eea38bf79a76a3179259442116a995dcb2e6f':
Change name of search menu item to be more descriptive
Jason Monk [Mon, 1 Jun 2015 19:54:52 +0000 (19:54 +0000)]
Merge "Make Theme a DropDownPreference" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:12:22 +0000 (15:12 -0400)]
Make Theme a DropDownPreference
Also make DropDownPreference support xml lists defined the same
way as ListPreferences.
Bug:
21300431
Change-Id: I1698e8ddcd6134034c3367a6afe36f9740e9efec
Jason Monk [Mon, 1 Jun 2015 19:45:26 +0000 (19:45 +0000)]
Merge "Change name of search menu item to be more descriptive" into mnc-dev
Jason Monk [Mon, 1 Jun 2015 19:21:07 +0000 (15:21 -0400)]
Change name of search menu item to be more descriptive
(for accessibility)
Bug:
20345352
Change-Id: Id8c74f4bf3753dc36153965923859315ecc07a9a
Maurice Lam [Mon, 1 Jun 2015 18:49:41 +0000 (18:49 +0000)]
am
6cd24c68: Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
* commit '
6cd24c687d9bdc2a69796e795fa86d6d95c9b60d':
[WifiSetup] Add + icon to Add another network
Maurice Lam [Mon, 1 Jun 2015 18:40:46 +0000 (18:40 +0000)]
Merge "[WifiSetup] Add + icon to Add another network" into mnc-dev
Sanket Padawe [Mon, 1 Jun 2015 18:05:17 +0000 (18:05 +0000)]
am
0be403db: Merge "Send sim change notification based on sim state change." into mnc-dev
* commit '
0be403dbeddefc2cbb98235518aac7fdc47ad93a':
Send sim change notification based on sim state change.
Sanket Padawe [Mon, 1 Jun 2015 17:55:10 +0000 (17:55 +0000)]
Merge "Send sim change notification based on sim state change." into mnc-dev
Maurice Lam [Mon, 1 Jun 2015 17:32:34 +0000 (17:32 +0000)]
am
83d636a3: Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
* commit '
83d636a3fbe89131d111085cc68b54e323f09259':
[WifiSettings] Remove unused Wi-Fi icon
Sanket Padawe [Mon, 1 Jun 2015 17:25:46 +0000 (10:25 -0700)]
Send sim change notification based on sim state change.
+ Send sim change notifications based on Sim state change rather then based
on subscription change.
+ Make SimSettings dynamically update based on subscriptions changed. Would
support hotswap which was not supported before this.
Bug:
20739298
Bug:
18385348
Change-Id: I5bb4b05f55b94eb0ed2a1a83fe2f168192b2b684
Maurice Lam [Mon, 1 Jun 2015 17:17:17 +0000 (17:17 +0000)]
Merge "[WifiSettings] Remove unused Wi-Fi icon" into mnc-dev
Stuart Scott [Mon, 1 Jun 2015 16:44:06 +0000 (16:44 +0000)]
am
47ed6ca0: Network Reset should have a lockdown like Factory Reset.
* commit '
47ed6ca004dcfe9498269602b109b1e667fae287':
Network Reset should have a lockdown like Factory Reset.
Stuart Scott [Mon, 20 Apr 2015 18:05:43 +0000 (11:05 -0700)]
Network Reset should have a lockdown like Factory Reset.
bug:
20332322
Change-Id: I645ad0d226869042c11225630e4de5968ebb7a0d
(cherry picked from commit
176f512c5ad8d8478db88fad4c14ffca52102ade)
Geoff Mendal [Mon, 1 Jun 2015 16:28:59 +0000 (16:28 +0000)]
am
b16d2a02: (-s ours) Import translations. DO NOT MERGE
* commit '
b16d2a0242e1709e7abe3683f96703ec576719da':
Import translations. DO NOT MERGE
Geoff Mendal [Mon, 1 Jun 2015 16:09:54 +0000 (09:09 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idf3b09809f2f964abef75349083eb11a2bfc7a8c
Auto-generated-cl: translation import
Geoff Mendal [Sat, 30 May 2015 22:42:32 +0000 (22:42 +0000)]
am
b777c6e2: (-s ours) Import translations. DO NOT MERGE
* commit '
b777c6e20541a01f4219e1020445d091fbfe3217':
Import translations. DO NOT MERGE
Geoff Mendal [Sat, 30 May 2015 22:28:38 +0000 (17:28 -0500)]
Import translations. DO NOT MERGE
Change-Id: I2a83b506d2d5c74818178dbc76b07b2f97ff2c87
Auto-generated-cl: translation import
Maurice Lam [Mon, 4 May 2015 03:08:43 +0000 (20:08 -0700)]
[WifiSettings] Remove unused Wi-Fi icon
wifi_signal_light was replaced by wifi_signal (which can take any
color via theme attributes). Remove the unused assets.
Change-Id: If1823f9fa74ddaeb54f4a79a5d42db3b24f723d9
Xiyuan Xia [Sat, 30 May 2015 03:38:09 +0000 (03:38 +0000)]
am
dc6bd8d2: Merge "Ignore fp error message when not listening" into mnc-dev
* commit '
dc6bd8d2f1b2b5f28d59d00ef178e64229ab59ef':
Ignore fp error message when not listening
Maurice Lam [Wed, 20 May 2015 22:16:47 +0000 (15:16 -0700)]
[WifiSetup] Add + icon to Add another network
Add the + icon to "Add another network" in Wi-Fi screen in setup
wizard, and make the text black and sentence case.
Bug:
21089864
Change-Id: Iccfc5fc4ff5e50a599f3004a20e5cfa24a13043a
Xiyuan Xia [Sat, 30 May 2015 03:28:49 +0000 (03:28 +0000)]
Merge "Ignore fp error message when not listening" into mnc-dev
Xiyuan Xia [Fri, 29 May 2015 23:17:24 +0000 (16:17 -0700)]
Ignore fp error message when not listening
Bug:
21413567
Change-Id: I66cde924f77d1df13a3cabd2b118439d59ef1d88
Fyodor Kupolov [Fri, 29 May 2015 21:42:41 +0000 (21:42 +0000)]
am
097936ad: Hide guest entry if the user is not allowed to create guest
* commit '
097936ad1b6632787127cbefe38373e9696e377d':
Hide guest entry if the user is not allowed to create guest
Fyodor Kupolov [Fri, 22 May 2015 01:31:45 +0000 (18:31 -0700)]
Hide guest entry if the user is not allowed to create guest
Don't show the Guest entry for a secondary user if the user is not allowed to
create a guest and there is currently no guest already created.
Bug:
19035769
Change-Id: Icf4a778533affaec0658af4da5ce000eda261f38
Fyodor Kupolov [Fri, 29 May 2015 20:58:17 +0000 (20:58 +0000)]
am
01f35ce4: Merge "Use DimmableIconPreference for Add user action" into mnc-dev
* commit '
01f35ce46e584e0fd699c3330eba564eb6811dc5':
Use DimmableIconPreference for Add user action
Fyodor Kupolov [Fri, 29 May 2015 20:52:07 +0000 (20:52 +0000)]
am
2defc457: Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
* commit '
2defc457bdd0a13f6ece49a20d5120616ca3eaaf':
Hide the collapse/expand icon if text fits the screen
Fyodor Kupolov [Fri, 29 May 2015 20:42:55 +0000 (20:42 +0000)]
Merge "Use DimmableIconPreference for Add user action" into mnc-dev
Fyodor Kupolov [Fri, 29 May 2015 20:27:14 +0000 (20:27 +0000)]
Merge "Hide the collapse/expand icon if text fits the screen" into mnc-dev
Tony Mantler [Fri, 29 May 2015 19:20:49 +0000 (19:20 +0000)]
am
3e7f2b44: Merge "Move ZoneGetter into SettingsLib" into mnc-dev
* commit '
3e7f2b445875ffbbbab2e3586985a247ebaec03a':
Move ZoneGetter into SettingsLib
Geoff Mendal [Fri, 29 May 2015 19:19:32 +0000 (19:19 +0000)]
am
d6242009: (-s ours) Import translations. DO NOT MERGE
* commit '
d6242009d6f0754083eee1a8d9da7e89bc2d3aec':
Import translations. DO NOT MERGE
John Spurlock [Fri, 29 May 2015 19:18:40 +0000 (19:18 +0000)]
am
00e39238: Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
* commit '
00e392387b8989a52e6fc66f14582ae709594852':
Settings: Migrate zen event conditions to use calendar name.
Fyodor Kupolov [Fri, 29 May 2015 18:17:32 +0000 (11:17 -0700)]
Hide the collapse/expand icon if text fits the screen
Icon should be hidden if explanation text fits the screen, otherwise user
should be able to click the image to collapse/expand the text.
Bug:
20554398
Change-Id: I7fb06be6e6c195a5c1bcac504f4af2d67ef4211e
Tony Mantler [Fri, 29 May 2015 16:44:28 +0000 (16:44 +0000)]
Merge "Move ZoneGetter into SettingsLib" into mnc-dev
Geoff Mendal [Fri, 29 May 2015 14:22:09 +0000 (09:22 -0500)]
Import translations. DO NOT MERGE
Change-Id: I317a9af71a1ab755f032066f7239c6e1e2f6e5ec
Auto-generated-cl: translation import
John Spurlock [Fri, 29 May 2015 13:22:31 +0000 (13:22 +0000)]
Merge "Settings: Migrate zen event conditions to use calendar name." into mnc-dev
John Spurlock [Fri, 29 May 2015 02:20:44 +0000 (22:20 -0400)]
Settings: Migrate zen event conditions to use calendar name.
And make sure any existing calendar value always appears in the
picker, even before it exists in the calendar provider.
Bug:
17755700
Change-Id: I8aa298a0d5804c288e2596f18c2dc7318f752121
Tony Mantler [Thu, 28 May 2015 21:48:29 +0000 (14:48 -0700)]
Move ZoneGetter into SettingsLib
Change-Id: Ia998ae0bd7fc4c974e03df7c8fc380d98a3e71de
Paul Lawrence [Thu, 28 May 2015 19:53:08 +0000 (19:53 +0000)]
am
750648c5: Merge "Disable back button on crypto screen" into mnc-dev
* commit '
750648c5ae2b975d7aea45601d17f4c0796e8db4':
Disable back button on crypto screen
Paul Lawrence [Thu, 28 May 2015 19:37:27 +0000 (19:37 +0000)]
Merge "Disable back button on crypto screen" into mnc-dev
Jason Monk [Thu, 28 May 2015 16:48:46 +0000 (16:48 +0000)]
am
7c3b9f28: Merge "Make use of WifiTracker\'s WorkerThread support" into mnc-dev
* commit '
7c3b9f28b5b547fcdfb78d9e24f4d9b694c91c28':
Make use of WifiTracker's WorkerThread support
Jason Monk [Thu, 28 May 2015 16:37:38 +0000 (16:37 +0000)]
Merge "Make use of WifiTracker's WorkerThread support" into mnc-dev
Jason Monk [Thu, 28 May 2015 15:42:28 +0000 (11:42 -0400)]
Make use of WifiTracker's WorkerThread support
Let the AccessPoint callbacks come in on a BG thread and do more
of the handling there.
Bug:
21486080
Change-Id: I529152d9f5c429b790a669b75b6d955ce4336caf
Jason Monk [Thu, 28 May 2015 14:33:50 +0000 (14:33 +0000)]
am
a7fe759d: Merge "More memory updates" into mnc-dev
* commit '
a7fe759de7c021b0d3467c75422acb14c62f90bd':
More memory updates