OSDN Git Service
Tony Mantler [Tue, 9 Jun 2015 17:32:39 +0000 (17:32 +0000)]
am
8c39a9c6: Merge "Move ApplicationsState to SettingsLib" into mnc-dev
* commit '
8c39a9c6f28f2b31635cae77d045b38fd3b7c2d9':
Move ApplicationsState to SettingsLib
Tony Mantler [Tue, 9 Jun 2015 17:20:16 +0000 (17:20 +0000)]
Merge "Move ApplicationsState to SettingsLib" into mnc-dev
Sudheer Shanka [Tue, 9 Jun 2015 16:35:22 +0000 (16:35 +0000)]
am
b259b384: Merge "Update some strings." into mnc-dev
* commit '
b259b3845739f6b66a77b0fb9a14069cb7ff9122':
Update some strings.
Sudheer Shanka [Tue, 9 Jun 2015 16:24:13 +0000 (16:24 +0000)]
Merge "Update some strings." into mnc-dev
Chris Wren [Tue, 9 Jun 2015 16:23:32 +0000 (16:23 +0000)]
am
c7581e81: instrument display rotation settings
* commit '
c7581e8126cefcbac599e95db664dd675c95ef18':
instrument display rotation settings
Chris Wren [Tue, 9 Jun 2015 16:23:31 +0000 (16:23 +0000)]
am
18213459: don\'t double set the dropdown value
* commit '
182134595b9ba63607afceca9c77d62a6ac74066':
don't double set the dropdown value
Chris Wren [Tue, 9 Jun 2015 16:07:14 +0000 (12:07 -0400)]
instrument display rotation settings
Bug:
21530764
Change-Id: Iee36addb7cf3cb6abbbf1ac90727e0fce22121cb
Chris Wren [Tue, 9 Jun 2015 16:06:54 +0000 (12:06 -0400)]
don't double set the dropdown value
idion: set the default value, and then add a callback
actual: spinner posts the change to a handler: so it posts after the callback is set.
This makes it hard to count actual user interactions without counting the initialization.
Bug:
21530764
Change-Id: I3ff8319edb374d8d7c10982512054f303c69a5ec
Sudheer Shanka [Tue, 9 Jun 2015 13:26:27 +0000 (14:26 +0100)]
Update some strings.
Bug:
20518822
Change-Id: I871a45fe66bd3a3524adcf907c3253c3275d9745
Jim Miller [Tue, 9 Jun 2015 12:49:16 +0000 (12:49 +0000)]
am
fa47bc02: Update and cleanup FingerprintManager API to new spec
* commit '
fa47bc02900d407e1a730039e94221c2efc160d0':
Update and cleanup FingerprintManager API to new spec
Jim Miller [Wed, 27 May 2015 01:26:11 +0000 (18:26 -0700)]
Update and cleanup FingerprintManager API to new spec
Fixes bug
21040383
Change-Id: Ic2b279ffad47d31a6ad3beed7b3af5ad0a61e815
Tony Mantler [Mon, 8 Jun 2015 21:41:02 +0000 (14:41 -0700)]
Move ApplicationsState to SettingsLib
Also take InterestingConfigChanges along for the ride
and delete unused AppPermissionSettings
b/
21328967
Change-Id: I4d0c1a27054845a54cf68e95a92024d2e46f636e
John Spurlock [Mon, 8 Jun 2015 21:12:23 +0000 (21:12 +0000)]
am
9a583610: Merge "Settings: Update notification listener user prompt strings." into mnc-dev
* commit '
9a5836107664b796c3ae37c25c89cbf070243edb':
Settings: Update notification listener user prompt strings.
John Spurlock [Mon, 8 Jun 2015 21:04:16 +0000 (21:04 +0000)]
Merge "Settings: Update notification listener user prompt strings." into mnc-dev
John Spurlock [Mon, 8 Jun 2015 20:50:36 +0000 (16:50 -0400)]
Settings: Update notification listener user prompt strings.
Bug:
20926937
Change-Id: I85e1e103511155f854478b773ddc45dc88c96c12
Jorim Jaggi [Mon, 8 Jun 2015 18:49:06 +0000 (18:49 +0000)]
am
7e38eea8: Merge "Fix settings overdraw" into mnc-dev
* commit '
7e38eea8170249ca13c54748d6ba4c615528cad6':
Fix settings overdraw
Jorim Jaggi [Mon, 8 Jun 2015 18:39:24 +0000 (18:39 +0000)]
Merge "Fix settings overdraw" into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 18:22:37 +0000 (18:22 +0000)]
am
abe74683: Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
* commit '
abe74683c13f05cc7143c7d4073fcf9a5a829f43':
Switch from KeyStore.saw to KeyStore.list.
Alex Klyubin [Mon, 8 Jun 2015 18:11:15 +0000 (18:11 +0000)]
Merge "Switch from KeyStore.saw to KeyStore.list." into mnc-dev
John Spurlock [Mon, 8 Jun 2015 16:52:01 +0000 (16:52 +0000)]
am
178d46a9: Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
* commit '
178d46a9b5cccfa5106028375877b2eb0bf005f7':
Settings: Update DND access dialog to new user flow.
Geoff Mendal [Mon, 8 Jun 2015 16:44:22 +0000 (16:44 +0000)]
am
0053802f: (-s ours) Import translations. DO NOT MERGE
* commit '
0053802f23cfad9116f05716d2d5f651c19159ae':
Import translations. DO NOT MERGE
Martijn Coenen [Mon, 8 Jun 2015 16:42:41 +0000 (16:42 +0000)]
am
1276b213: Merge "Add NFC payment "how it works" screens." into mnc-dev
* commit '
1276b21317d0f86bbd3f59b14d9c0c745cecfa56':
Add NFC payment "how it works" screens.
Martijn Coenen [Mon, 8 Jun 2015 16:42:40 +0000 (16:42 +0000)]
am
63f7fc88: Merge "NFC: don\'t use dynamic resources." into mnc-dev
* commit '
63f7fc8847afe5029cabe5f07cc9e3ffce9f65c9':
NFC: don't use dynamic resources.
John Spurlock [Mon, 8 Jun 2015 16:39:32 +0000 (16:39 +0000)]
Merge "Settings: Update DND access dialog to new user flow." into mnc-dev
Alex Klyubin [Mon, 8 Jun 2015 16:30:08 +0000 (09:30 -0700)]
Switch from KeyStore.saw to KeyStore.list.
KeyStore.saw was renamed to KeyStore.list for clarity. The
implementation of both methods is exactly the same.
Bug:
18088752
Change-Id: I2f171a4b7479683d5af898ebdf1b6f8a741536d1
John Spurlock [Thu, 4 Jun 2015 17:01:59 +0000 (13:01 -0400)]
Settings: Update DND access dialog to new user flow.
- Only list apps in the DND access list that have included
the corresponding permission in their manifest.
- Show a scary user warning before enabling access per app.
- Update manifest to follow framework intent action rename.
Bug:
21621663
Change-Id: I76c6893928092bdbb58d62bc3aba31ec8a609fc6
Geoff Mendal [Mon, 8 Jun 2015 14:59:45 +0000 (07:59 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0fb7a99f74e15a5bf9842cf30eedaa8443164bc5
Auto-generated-cl: translation import
Martijn Coenen [Mon, 8 Jun 2015 08:02:28 +0000 (08:02 +0000)]
Merge "Add NFC payment "how it works" screens." into mnc-dev
Martijn Coenen [Mon, 8 Jun 2015 08:01:45 +0000 (08:01 +0000)]
Merge "NFC: don't use dynamic resources." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 02:09:10 +0000 (02:09 +0000)]
am
547089c3: Merge "Fix wifi network strings shown in Settings." into mnc-dev
* commit '
547089c3768f3266a1f18e6d1f42a81aeb0b3bcf':
Fix wifi network strings shown in Settings.
Sanket Padawe [Sat, 6 Jun 2015 01:58:18 +0000 (01:58 +0000)]
Merge "Fix wifi network strings shown in Settings." into mnc-dev
Sanket Padawe [Sat, 6 Jun 2015 01:49:12 +0000 (18:49 -0700)]
Fix wifi network strings shown in Settings.
Bug:
21575915
Change-Id: I09d938aa03790119ebf6dc28fb6e00accab7d11d
Jorim Jaggi [Sat, 6 Jun 2015 00:42:32 +0000 (17:42 -0700)]
Fix settings overdraw
Bug:
17185183
Change-Id: Ide5adf1e61f727a49bc70e0adc754eeb09321122
Ruben Brunk [Sat, 6 Jun 2015 00:16:22 +0000 (00:16 +0000)]
am
e35df2ff: Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
* commit '
e35df2ff3b8188bdf710f84390f0fc60ec329ab5':
Add UI for camera + flashlight battery reporting.
Ruben Brunk [Sat, 6 Jun 2015 00:04:17 +0000 (00:04 +0000)]
Merge "Add UI for camera + flashlight battery reporting." into mnc-dev
Ruben Brunk [Thu, 4 Jun 2015 01:53:40 +0000 (18:53 -0700)]
Add UI for camera + flashlight battery reporting.
Bug:
11694505
Change-Id: Idca51a2e8cc7c2fb3e9d10f84f94e66600dee6fa
Martijn Coenen [Fri, 5 Jun 2015 19:28:17 +0000 (21:28 +0200)]
Add NFC payment "how it works" screens.
Bug:
21239081
Bug:
21305138
Bug:
21305420
Change-Id: Ic9ea1b7e9b842299f2fb6b26f61a927855981e67
Maurice Lam [Fri, 5 Jun 2015 19:22:46 +0000 (19:22 +0000)]
am
26a42d10: Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
* commit '
26a42d1099fece0bc388db2b923ad5c5411bd4f3':
Update Setup Wizard redaction interstitial styles
Maurice Lam [Fri, 5 Jun 2015 19:13:17 +0000 (19:13 +0000)]
Merge "Update Setup Wizard redaction interstitial styles" into mnc-dev
Jorim Jaggi [Fri, 5 Jun 2015 18:26:21 +0000 (18:26 +0000)]
am
5ae7cf3a: Merge "Fix lockpattern weirdness" into mnc-dev
* commit '
5ae7cf3a144d1a55fcd40e84567408caf1ced9f4':
Fix lockpattern weirdness
Jorim Jaggi [Fri, 5 Jun 2015 18:12:16 +0000 (18:12 +0000)]
Merge "Fix lockpattern weirdness" into mnc-dev
ztenghui [Fri, 5 Jun 2015 16:50:14 +0000 (16:50 +0000)]
am
167a6bcd: Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
* commit '
167a6bcdb74f9f47943a8f16b52e7d1b5ac35589':
Setup the animation callback for AnimatedVectorDrawable
ztenghui [Fri, 5 Jun 2015 16:37:04 +0000 (16:37 +0000)]
Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:48:13 +0000 (13:48 +0000)]
am
1b93ef1d: Merge "Settings > Apps list style updates" into mnc-dev
* commit '
1b93ef1d9b1af8a8b897dfe4b4f1730f4e64f450':
Settings > Apps list style updates
Jason Monk [Fri, 5 Jun 2015 13:36:27 +0000 (13:36 +0000)]
Merge "Settings > Apps list style updates" into mnc-dev
Jason Monk [Fri, 5 Jun 2015 13:31:00 +0000 (13:31 +0000)]
am
d7dbe161: Merge "Fix some dark theme issues (Take 2)" into mnc-dev
* commit '
d7dbe16142b0fc3faf448a81f3be13af7e95909f':
Fix some dark theme issues (Take 2)
Jason Monk [Fri, 5 Jun 2015 13:23:12 +0000 (13:23 +0000)]
Merge "Fix some dark theme issues (Take 2)" into mnc-dev
Martijn Coenen [Fri, 5 Jun 2015 09:36:50 +0000 (11:36 +0200)]
NFC: don't use dynamic resources.
Also fixed talk-back for the default
payment app selection.
Bug:
21343778
Bug:
21588534
Change-Id: I2886b73edae507c7861351bac4610dbf3bebe027
Jorim Jaggi [Fri, 5 Jun 2015 01:00:34 +0000 (18:00 -0700)]
Fix lockpattern weirdness
- Pass back correct result when pressing cancel.
- Make sure the start the interstitial activity after checking so
we don't preempt the async thread we are still running.
Bug:
21621918
Change-Id: I5558089abf02a00a268050fc48894cea86692fa0
Maurice Lam [Fri, 5 Jun 2015 00:17:07 +0000 (17:17 -0700)]
Update Setup Wizard redaction interstitial styles
Adhere to the setup wizard design guidelines for the redaction
interstitial shown during setup wizard.
Bug:
21561511
Change-Id: Id6c4f0d4b0075b0cbbbb4f8ab77db6f00ea72b70
Ye Wen [Thu, 4 Jun 2015 22:45:02 +0000 (22:45 +0000)]
am
1cb267ae: Enhance change default SMS app dialog to show list of apps
* commit '
1cb267ae67fdff22e2058eb3ee1e6b32994f24d6':
Enhance change default SMS app dialog to show list of apps
Ye Wen [Tue, 2 Jun 2015 23:02:23 +0000 (16:02 -0700)]
Enhance change default SMS app dialog to show list of apps
Settings shows a dialog to android.provider.Telephony.ACTION_CHANGE_DEFAULT
intent to confirm if user wants to change default SMS app to a new one.
This is used by SMS apps to obtain default status. In the opposite direction,
i.e. giving up default status, SMS apps have to bring up the wireless
settings page where the default SMS app setting was originally located.
MNC moved this setting to a different location therefore broke the
function. This change enhances the SmsDefaultDialog to display a list of
SMS apps so that user can choose a different default SMS app, when the
new default SMS app package name is not specified within the above
intent.
b/
20430567
Change-Id: I75d518900a7cf17f51b0d466bc2d062c470790bb
ztenghui [Tue, 26 May 2015 21:53:41 +0000 (14:53 -0700)]
Setup the animation callback for AnimatedVectorDrawable
b/
21341096
Change-Id: Id8e334c541b69edb643b5b45682de6285fbf08e4
Jason Monk [Thu, 4 Jun 2015 19:17:16 +0000 (15:17 -0400)]
Settings > Apps list style updates
Bug:
21472824
Change-Id: If4c9c7f5b9bd3bdaaf2007fca09baee4ea2c1b3c
Jason Monk [Thu, 4 Jun 2015 18:43:28 +0000 (18:43 +0000)]
am
0ad408e6: Merge "Fix apps/memory screen\'s spinner alignment" into mnc-dev
* commit '
0ad408e646fe6d8f75286a2838bf640d79fcf2ea':
Fix apps/memory screen's spinner alignment
Jason Monk [Wed, 3 Jun 2015 14:53:03 +0000 (10:53 -0400)]
Fix some dark theme issues (Take 2)
Now with visible lock patterns! Both light and dark!
Bug:
21117509
Bug:
21077345
Bug:
21480587
Bug:
21621900
Change-Id: Ibcf822faf7cbc83be43d757e0a6a9432ef3346af
Jason Monk [Thu, 4 Jun 2015 18:09:08 +0000 (18:09 +0000)]
Merge "Fix apps/memory screen's spinner alignment" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 17:54:06 +0000 (13:54 -0400)]
Fix apps/memory screen's spinner alignment
Bug:
21587762
Change-Id: I80d7f2622330b02e63281aca8bd53261c0ad4d9b
Jason Monk [Thu, 4 Jun 2015 16:21:43 +0000 (16:21 +0000)]
am
34784ec8: Merge "Fix dashboard shadows on tablets" into mnc-dev
* commit '
34784ec862d86e2f3b3b115e7c065b052b7bc888':
Fix dashboard shadows on tablets
Jason Monk [Thu, 4 Jun 2015 16:14:31 +0000 (16:14 +0000)]
Merge "Fix dashboard shadows on tablets" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 16:04:30 +0000 (12:04 -0400)]
Fix dashboard shadows on tablets
Bug:
19600778
Change-Id: I45a773dfa5c6c8cb03f0175c043b836e03a42581
John Spurlock [Thu, 4 Jun 2015 15:51:05 +0000 (15:51 +0000)]
am
1a1181ed: Merge "Settings: Add zen rule name warning text." into mnc-dev
* commit '
1a1181edde0d8d941161e941f12e6783f25ae43d':
Settings: Add zen rule name warning text.
John Spurlock [Thu, 4 Jun 2015 15:41:58 +0000 (15:41 +0000)]
Merge "Settings: Add zen rule name warning text." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 15:37:36 +0000 (11:37 -0400)]
Settings: Add zen rule name warning text.
Bug:
21307309
Change-Id: Id08e3bdebb9a87dc474f2551f17268d655c8b4ea
Jason Monk [Thu, 4 Jun 2015 15:33:07 +0000 (15:33 +0000)]
am
cd5b97df: Merge "Fix updates of the enable/disable button" into mnc-dev
* commit '
cd5b97dfad920ca5f84e42f3e0dbb648550637e6':
Fix updates of the enable/disable button
Jason Monk [Thu, 4 Jun 2015 15:24:27 +0000 (15:24 +0000)]
Merge "Fix updates of the enable/disable button" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 15:09:08 +0000 (15:09 +0000)]
am
bdf3ddad: Merge "Fix crash in battery screen" into mnc-dev
* commit '
bdf3ddadd51daef78434351d341954a0ae3fc56e':
Fix crash in battery screen
Jason Monk [Thu, 4 Jun 2015 14:58:57 +0000 (14:58 +0000)]
Merge "Fix crash in battery screen" into mnc-dev
John Spurlock [Thu, 4 Jun 2015 14:58:01 +0000 (14:58 +0000)]
am
34a78be5: Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
* commit '
34a78be5844f3e12fb6abccef12646d3c800fe7a':
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
Jason Monk [Thu, 4 Jun 2015 14:57:31 +0000 (10:57 -0400)]
Fix updates of the enable/disable button
Make the entire ApplicationsState resume and do way too much work
so that we can get a little bit of state.
ApplicationsState could use some refactoring.
Bug:
21518528
Change-Id: Ibb6a2c15948f9bc69490426d4004dc83582087b4
Jason Monk [Thu, 4 Jun 2015 14:50:25 +0000 (10:50 -0400)]
Fix crash in battery screen
Also add a fake app item
Bug:
21624653
Change-Id: I1a8598472e014f773d2396a9a08fd03e8e32b400
John Spurlock [Thu, 4 Jun 2015 14:48:01 +0000 (14:48 +0000)]
Merge "Settings: Enable "ok" dialog button for no-op changes to existing zen rules." into mnc-dev
John Spurlock [Thu, 4 Jun 2015 14:44:45 +0000 (10:44 -0400)]
Settings: Enable "ok" dialog button for no-op changes to existing zen rules.
Bug:
21307309
Change-Id: Ic7a9cc124e26340e93a08da45c9f1a0043beee76
Jason Monk [Thu, 4 Jun 2015 13:20:27 +0000 (13:20 +0000)]
am
41012d5e: Merge "Disable owner info when no lock screen" into mnc-dev
* commit '
41012d5e7b37fe5c2373f3215612d26331f40ba0':
Disable owner info when no lock screen
Jason Monk [Thu, 4 Jun 2015 13:08:48 +0000 (13:08 +0000)]
Merge "Disable owner info when no lock screen" into mnc-dev
Jason Monk [Thu, 4 Jun 2015 13:07:02 +0000 (13:07 +0000)]
am
58148481: Merge "Protect against monkey crash" into mnc-dev
* commit '
58148481a53381cff75ed74421716690055a2f1d':
Protect against monkey crash
Jason Monk [Thu, 4 Jun 2015 12:55:44 +0000 (12:55 +0000)]
Merge "Protect against monkey crash" into mnc-dev
The Android Automerger [Thu, 4 Jun 2015 08:05:02 +0000 (01:05 -0700)]
merge in mnc-release history after reset to mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:59:20 +0000 (02:59 +0000)]
am
471da569: Merge "Revert "Fix some dark theme issues"" into mnc-dev
* commit '
471da56938c2ca8102f7740b3eb5704f48d86aff':
Revert "Fix some dark theme issues"
Jim Miller [Thu, 4 Jun 2015 02:52:11 +0000 (02:52 +0000)]
Merge "Revert "Fix some dark theme issues"" into mnc-dev
Jim Miller [Thu, 4 Jun 2015 02:45:40 +0000 (02:45 +0000)]
Revert "Fix some dark theme issues"
This breaks the pattern entry screens of SecuritySettings. Reverting until we can take a closer look.
This reverts commit
cb8ccbb3b5907eb6deb9fbc74fb3b3de141028fb.
Change-Id: Ifb3c46198de30914aff3a33df84971b1b31ab227
Sanket Padawe [Thu, 4 Jun 2015 01:58:07 +0000 (01:58 +0000)]
am
215e3f03: Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
* commit '
215e3f03766de0b72aed471d0b22c06e48ab03b2':
Display softKeyboard when entering pin for pairing BT device.
Sanket Padawe [Thu, 4 Jun 2015 01:47:49 +0000 (01:47 +0000)]
Merge "Display softKeyboard when entering pin for pairing BT device." into mnc-dev
Sanket Padawe [Thu, 4 Jun 2015 01:47:25 +0000 (18:47 -0700)]
Display softKeyboard when entering pin for pairing BT device.
Bug:
18784238
Change-Id: I73bec83aa099a4f63fa055cb67afb095f37dee28
Stuart Scott [Thu, 4 Jun 2015 01:03:15 +0000 (01:03 +0000)]
am
fcf64237: Merge "Re-add a string which was accidently removed." into mnc-dev
* commit '
fcf64237b72b506d6f45717d8f7252fb656c5fa4':
Re-add a string which was accidently removed.
Stuart Scott [Thu, 4 Jun 2015 00:51:13 +0000 (00:51 +0000)]
Merge "Re-add a string which was accidently removed." into mnc-dev
Stuart Scott [Thu, 4 Jun 2015 00:01:42 +0000 (17:01 -0700)]
Re-add a string which was accidently removed.
bug:
20051165
Change-Id: I43214f30650565499ffbdddb3819e96ac957ebf1
Nicolas Prevot [Wed, 3 Jun 2015 22:25:16 +0000 (22:25 +0000)]
am
41dbc14e: Merge "In Settings, don\'t allow to disable an app which is profile/device owner." into mnc-dev
* commit '
41dbc14eda952203320bc9a64c3d42d98bacee9f':
In Settings, don't allow to disable an app which is profile/device owner.
Nicolas Prevot [Wed, 3 Jun 2015 22:17:10 +0000 (22:17 +0000)]
Merge "In Settings, don't allow to disable an app which is profile/device owner." into mnc-dev
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.
Nicolas Prevot [Wed, 3 Jun 2015 21:36:35 +0000 (14:36 -0700)]
In Settings, don't allow to disable an app which is profile/device owner.
In the App Info section of Settings:
If the app is device owner or profile owner of at least one user, disable the
disable button.
BUG:
20831525
Change-Id: Iff00314108caf8c0b209f66060e6655ef06f2aa0
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
Jason Monk [Wed, 3 Jun 2015 20:37:07 +0000 (16:37 -0400)]
Disable owner info when no lock screen
Bug:
20514900
Change-Id: I10108d7300e5aa9379c8e8cc7d1b1bb11b8f121e
Jason Monk [Wed, 3 Jun 2015 19:43:46 +0000 (15:43 -0400)]
Protect against monkey crash
Bug:
19541028
Change-Id: Ia8e477b3c2843b2e841c429ce090ff388958bfcb
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