OSDN Git Service
Pavlin Radoslavov [Sat, 11 Feb 2017 01:34:12 +0000 (01:34 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values" am:
6f7437580c am:
bd3f96703c am:
fae23e1e00
am:
73aa2c6b3f
Change-Id: Iac81cb29671c198414a53c517deb6db962294d0a
Pavlin Radoslavov [Sat, 11 Feb 2017 01:31:52 +0000 (01:31 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values" am:
6f7437580c am:
bd3f96703c
am:
fae23e1e00
Change-Id: I55f901bee2b1a7368cf28cf0b2c6a89e8af27342
Pavlin Radoslavov [Sat, 11 Feb 2017 01:28:22 +0000 (01:28 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values" am:
6f7437580c
am:
bd3f96703c
Change-Id: I04f7187c23a0f17c5ef2d37f75d892e4da54111e
Pavlin Radoslavov [Sat, 11 Feb 2017 01:25:50 +0000 (01:25 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values"
am:
6f7437580c
Change-Id: I567042ca38e74e2ce228e4bb03c73095c8cf6513
Treehugger Robot [Sat, 11 Feb 2017 01:21:25 +0000 (01:21 +0000)]
Merge "Add null pointer checks when updating A2DP configuration values"
Fan Zhang [Fri, 10 Feb 2017 21:58:33 +0000 (21:58 +0000)]
Merge "Update storage setting summary text format."
Pavlin Radoslavov [Fri, 10 Feb 2017 20:52:04 +0000 (12:52 -0800)]
Add null pointer checks when updating A2DP configuration values
Under expected circumstances, those null pointer checks are not
needed: onCreate() is always called before onCreateView(),
and the former creates the objects: mBluetoothSelectA2dpCodec,
mBluetoothSelectA2dpSampleRate, mBluetoothSelectA2dpBitsPerSample,
mBluetoothSelectA2dpChannelMode, mBluetoothSelectA2dpLdacPlaybackQuality .
For some unknown reason, somehow the following chain of calls is executed
before onCreate() :
onCreateView() ->
getActivity().registerReceiver(mBluetoothA2dpReceiver, ...) ->
mBluetoothA2dpReceiver.onReceive(...) ->
updateBluetoothA2dpConfigurationValues()
Adding the null pointer checks until the issue is understood.
Test: Code compilation
Bug:
35204511
Change-Id: I7c1d81015e66b26544b7b26f36cbc75f11713496
TreeHugger Robot [Fri, 10 Feb 2017 20:10:38 +0000 (20:10 +0000)]
Merge "Distribute all the hidden items to apps"
Marie Janssen [Fri, 10 Feb 2017 18:23:00 +0000 (18:23 +0000)]
Merge "Remove Bluetooth autoconnect on dock" am:
b65c7fc810 am:
e7d5b13f53 am:
deb32c220b
am:
76405153d1
Change-Id: I5d4283ec0aa65b8faf6a97693dcdb40df353c48a
Marie Janssen [Fri, 10 Feb 2017 18:20:28 +0000 (18:20 +0000)]
Merge "Remove Bluetooth autoconnect on dock" am:
b65c7fc810 am:
e7d5b13f53
am:
deb32c220b
Change-Id: I9742b1388b6b8702df0459e77414e3eb273115a8
Marie Janssen [Fri, 10 Feb 2017 18:18:00 +0000 (18:18 +0000)]
Merge "Remove Bluetooth autoconnect on dock" am:
b65c7fc810
am:
e7d5b13f53
Change-Id: I696af3c6b2c3a2538e93356041c16f9c7149265c
Marie Janssen [Fri, 10 Feb 2017 18:15:28 +0000 (18:15 +0000)]
Merge "Remove Bluetooth autoconnect on dock"
am:
b65c7fc810
Change-Id: Id3cf62ca55ff39867041b495aa832e220fbf70ee
Treehugger Robot [Fri, 10 Feb 2017 18:12:00 +0000 (18:12 +0000)]
Merge "Remove Bluetooth autoconnect on dock"
TreeHugger Robot [Fri, 10 Feb 2017 18:11:56 +0000 (18:11 +0000)]
Merge "Prompt credentials for installing/deleting sounds"
Julia Reynolds [Fri, 10 Feb 2017 16:05:07 +0000 (16:05 +0000)]
Merge "Link back to app settings from channel page"
Robin Lee [Fri, 10 Feb 2017 15:32:49 +0000 (15:32 +0000)]
Prompt credentials for installing/deleting sounds
Actually we probably want to confirm credentials in all locked cases
not just when starting the user -- fewer corners to special case.
Fix:
34734809
Test: manual. set a work profile lock, screen off/on, open sound settings, try to set a work ringtone. first attempt should prompt for credentials, second attempt should not until next screen-off.
Change-Id: I1fea94f3b0d1b768b22741b887d9891f5e318549
Sooraj Sasindran [Fri, 10 Feb 2017 06:02:08 +0000 (06:02 +0000)]
Merge "Provide calling package name in cell info APIs" am:
5c365f9b54 am:
f040f78303 -s ours am:
56741e2f41 -s ours
am:
8bf0c2bce9 -s ours
Change-Id: Iccade74b97d0c1869a7c986422970ad6db3df19f
Sooraj Sasindran [Fri, 10 Feb 2017 05:57:31 +0000 (05:57 +0000)]
Merge "Provide calling package name in cell info APIs" am:
5c365f9b54 am:
f040f78303 -s ours
am:
56741e2f41 -s ours
Change-Id: Icdde072f471c1c5823235cb6608bcfc87b629325
Sooraj Sasindran [Fri, 10 Feb 2017 05:50:27 +0000 (05:50 +0000)]
Merge "Provide calling package name in cell info APIs" am:
5c365f9b54
am:
f040f78303 -s ours
Change-Id: Ia62560a2bd59edee436ee71338495e45d50b68be
Sooraj Sasindran [Fri, 10 Feb 2017 05:45:18 +0000 (05:45 +0000)]
Merge "Provide calling package name in cell info APIs"
am:
5c365f9b54
Change-Id: I342921d22c83aadd77b75078f5d5e9191c8b683f
Sooraj Sasindran [Fri, 10 Feb 2017 05:38:40 +0000 (05:38 +0000)]
Merge "Provide calling package name in cell info APIs"
Marie Janssen [Fri, 10 Feb 2017 04:02:52 +0000 (20:02 -0800)]
Remove Bluetooth autoconnect on dock
Test: compiles
Change-Id: I31305c70269c685893132f14975c32a051280afc
Fix:
35219649
TreeHugger Robot [Fri, 10 Feb 2017 03:13:50 +0000 (03:13 +0000)]
Merge "Don't truncate the GB used string."
Sooraj Sasindran [Fri, 10 Feb 2017 03:10:32 +0000 (03:10 +0000)]
Provide calling package name in cell info APIs am:
63d90ed55d
am:
0ed4162914 -s ours
Change-Id: Idb3b6e4e5ef7636696d9278dcd78a6178d1674c0
Sooraj Sasindran [Fri, 10 Feb 2017 03:04:08 +0000 (03:04 +0000)]
Provide calling package name in cell info APIs
am:
63d90ed55d
Change-Id: Ia2a1d01f2bb8fb257f756f7df6dfbedb755e87b1
Fan Zhang [Fri, 10 Feb 2017 01:27:01 +0000 (01:27 +0000)]
Merge "Update top level menu items summary text."
TreeHugger Robot [Fri, 10 Feb 2017 01:11:28 +0000 (01:11 +0000)]
Merge "Removing one all-purpose developer tile and replacing it with 4 separate tiles, for individual actions. Also adding a section in Developer Options for enabling these individual tiles."
Fan Zhang [Fri, 10 Feb 2017 00:33:48 +0000 (16:33 -0800)]
Update storage setting summary text format.
New format: 38% used - 19.80 GB free
Bug:
34975053
Test: make RunSettingRoboTests
Change-Id: I7c8f5f0fe825eade8167764622c940e8234be6a9
Sooraj Sasindran [Thu, 18 Aug 2016 22:49:49 +0000 (15:49 -0700)]
Provide calling package name in cell info APIs
Provide calling package name in cell info APIs
BUG=
31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
TreeHugger Robot [Thu, 9 Feb 2017 23:57:33 +0000 (23:57 +0000)]
Merge "Increasing char limit for string"
Fan Zhang [Thu, 9 Feb 2017 21:06:58 +0000 (13:06 -0800)]
Update top level menu items summary text.
- Use static summary for most items
- Move summary for user setting to user&account setting
Bug:
34975053
Test: RunSettingsRoboTests
Change-Id: I9bf87267778dc5933f97f5d3b9ae0f4f0b8da1a8
Fan Zhang [Thu, 9 Feb 2017 22:36:57 +0000 (22:36 +0000)]
Merge "Convert auto-fill default selector to full screen pattern."
TreeHugger Robot [Thu, 9 Feb 2017 22:33:48 +0000 (22:33 +0000)]
Merge "Remove Downloads backup options."
Sooraj Sasindran [Thu, 18 Aug 2016 22:49:49 +0000 (15:49 -0700)]
Provide calling package name in cell info APIs
Provide calling package name in cell info APIs
BUG=
31041780
Merged-In: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
Change-Id: Iad6e5c67ead2bf50d83d1ccad48c3f0341f53712
TreeHugger Robot [Thu, 9 Feb 2017 21:18:47 +0000 (21:18 +0000)]
Merge "Don't show multiple wipe warning dialogs"
Fan Zhang [Thu, 9 Feb 2017 00:16:14 +0000 (16:16 -0800)]
Convert auto-fill default selector to full screen pattern.
Bug:
34280137
Test: RunSettingsRoboTests
Change-Id: Icde3bcaf11615010d481f39d8b32d28dfc120018
Fan Zhang [Thu, 9 Feb 2017 19:34:48 +0000 (11:34 -0800)]
Code clean up
- Remove unused DashboardTilePreference class
- Use FooterPreference in ManageAssist fragment
- reformat manage_assist xml file
Bug:
35203386
Test: visual
Change-Id: If3dbbd0fb1977d6f3c7dbf4544d71f5e6e801327
Robin Lee [Mon, 6 Feb 2017 18:19:40 +0000 (18:19 +0000)]
Don't show multiple wipe warning dialogs
Stacking them on top of each other like that does not count as defence
in depth and we should not do it.
Bug:
32934848
Test: make RunSettingsRoboTests # added one specifically for this
Change-Id: I9490652c05a630e7c3f9164a9144fadfc0f41ea1
Antony Sargent [Thu, 9 Feb 2017 18:02:37 +0000 (18:02 +0000)]
Merge "Infrastructure for showing instant app metadata in app header"
jackqdyulei [Thu, 9 Feb 2017 00:01:13 +0000 (16:01 -0800)]
Distribute all the hidden items to apps
1. Add screen check in the shouldHideSipper()
2. remove all the battery usage for hiddenSipper from
percentage calculation, in this way we can distribute
hidden sippers to all the apps
Bug:
35153599
Test: RunSettingsRoboTests
Change-Id: I82673b282c14c92269d7f8bc71e07de90a37720c
Gustav Sennton [Thu, 9 Feb 2017 17:36:32 +0000 (17:36 +0000)]
Merge "Have WebView Implementation Dev Setting use DefaultAppPickerFragment."
Julia Reynolds [Thu, 9 Feb 2017 15:06:34 +0000 (10:06 -0500)]
Link back to app settings from channel page
Test: manual
Change-Id: Ieb1118bd662a662bd34027f2ef44b420d4c94183
Gustav Sennton [Fri, 3 Feb 2017 16:19:02 +0000 (16:19 +0000)]
Have WebView Implementation Dev Setting use DefaultAppPickerFragment.
Make the WebView Implementation Dev Setting look like the fullscreen
settings deriving from DefaultAppPickerFragment.
Point the Activity opened through Settings.ACTION_WEBVIEW_SETTINGS to
the class WebViewAppPicker which is our new implementation of the
WebView Implementation setting.
Ensure the new setting closes if it is reached from a user that isn't an
admin of the device.
Bug:
34806477
Bug:
34966439
Test: Ensure WebView implementation Dev Setting looks ok (disabled
packages should have a text showing why they cannot be chosen).
Test: Start Intent with action Settings.ACTION_WEBVIEW_SETTINGS and
ensure the started Activity looks similar to the WebView Implementation
Dev Setting.
Test: Ensure picking a package that is no longer active, updates the
setting (so that package isn't visible anymore).
Change-Id: I08007c515193739ad61dfd735bb5130fc07bd6e6
Bill Yi [Thu, 9 Feb 2017 07:52:33 +0000 (07:52 +0000)]
Import translations. DO NOT MERGE am:
f9ef17c68e -s ours
am:
041604d96c -s ours
Change-Id: I76874501b061b686216005345c77a2b9f2af54f3
Bill Yi [Thu, 9 Feb 2017 07:50:02 +0000 (07:50 +0000)]
Import translations. DO NOT MERGE
am:
f9ef17c68e -s ours
Change-Id: I513f51ecded981e02286080868d12e12e008c5d9
TreeHugger Robot [Thu, 9 Feb 2017 07:43:03 +0000 (07:43 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Thu, 9 Feb 2017 02:55:40 +0000 (18:55 -0800)]
Import translations. DO NOT MERGE
Change-Id: I48c8f3d9a4b34c83e0bc5737446c002584ef86a7
Auto-generated-cl: translation import
Suprabh Shukla [Tue, 7 Feb 2017 01:15:15 +0000 (17:15 -0800)]
Increasing char limit for string
Translation in other languages requires more characters and the ui
element is reasonably wide to accommodate more characters. Also removed
an unused string.
Test: N/A
Bug:
34720313
Change-Id: I059bea0d768ee50267f865e55915f4cec8e883ba
Bill Yi [Thu, 9 Feb 2017 02:50:10 +0000 (18:50 -0800)]
Import translations. DO NOT MERGE
Change-Id: I9af5e9aadd1a56c25e96c7e476f266a4e5e27e2d
Auto-generated-cl: translation import
Fan Zhang [Thu, 9 Feb 2017 00:00:56 +0000 (16:00 -0800)]
Move GearPreference to widget package.
- This is step1 of making gear preference more flexible to use.
Bug:
33579296
Test: builds
Change-Id: I30ac6c75f7ad16ec5c732fbb93170e5fab0eacb7
Antony Sargent [Tue, 7 Feb 2017 19:28:58 +0000 (11:28 -0800)]
Infrastructure for showing instant app metadata in app header
This adds infrastructure for displaying the following instant app
metadata in the app header:
-Developer title
-Maturity Rating icon and description string
-Monetization notice (eg ads and/or in-app purchases)
Bug:
35098444
Test: includes new robotests in AppHeaderControllerTest.java
Change-Id: Ifadfedc7f5f349869d6616aeb5ed19eb2b22a038
Fan Zhang [Wed, 8 Feb 2017 20:52:48 +0000 (12:52 -0800)]
Checke radio on default app screen if there's 1 option only
Change-Id: Ib091eb033ce541dc6a6d97ef45a15a5eb957e405
Fix:
34746591
Test: make RunSettingsRoboTests -j40
TreeHugger Robot [Wed, 8 Feb 2017 23:12:54 +0000 (23:12 +0000)]
Merge "Hide "Use network recommendations" in Settings."
TreeHugger Robot [Wed, 8 Feb 2017 22:58:52 +0000 (22:58 +0000)]
Merge "Change PreferenceCategory margins."
Daniel Nishi [Wed, 8 Feb 2017 22:45:17 +0000 (14:45 -0800)]
Don't truncate the GB used string.
Bug:
34690731
Test: Settings robotest
Change-Id: I2d809c0f80dad48a3bfecf6a6f2240129d54370e
TreeHugger Robot [Wed, 8 Feb 2017 21:55:08 +0000 (21:55 +0000)]
Merge "Fix wrong pref text on default apps"
Stephen Chen [Wed, 8 Feb 2017 20:41:12 +0000 (12:41 -0800)]
Hide "Use network recommendations" in Settings.
Bug:
35141347
Test: make -j40 RunSettingsRoboTests, manual inspection
Change-Id: I7661ef141aeb95d5ec707b8a066818892c3fa870
TreeHugger Robot [Wed, 8 Feb 2017 21:32:14 +0000 (21:32 +0000)]
Merge "Notification app screen updates"
Daniel Nishi [Wed, 8 Feb 2017 21:23:01 +0000 (21:23 +0000)]
Merge "Use the "fast track" storage calculation for all categories."
Lei Yu [Wed, 8 Feb 2017 20:33:35 +0000 (20:33 +0000)]
Merge "Create Advanced battery page"
TreeHugger Robot [Wed, 8 Feb 2017 20:11:08 +0000 (20:11 +0000)]
Merge "Fix for null pointer when launching Connected devices."
Fan Zhang [Wed, 8 Feb 2017 20:11:06 +0000 (12:11 -0800)]
Fix wrong pref text on default apps
Test: visual
Change-Id: I3f3e923ed0cebcffc5fc737353a781ecad21bf09
TreeHugger Robot [Wed, 8 Feb 2017 19:58:12 +0000 (19:58 +0000)]
Merge "Update App Info page layout."
Julia Reynolds [Wed, 8 Feb 2017 19:49:01 +0000 (14:49 -0500)]
Notification app screen updates
- Load channels asynchronously
- Add importance summary & block/unblock toggle for channel list
- Change channel list headers and sorting.
Test: manual
Change-Id: If024c741df4d85227055563d5bbc8210705c420b
Sunny Goyal [Mon, 6 Feb 2017 23:19:00 +0000 (15:19 -0800)]
Removing one all-purpose developer tile and replacing it with 4 separate tiles,
for individual actions. Also adding a section in Developer Options for enabling
these individual tiles.
Bug:
34813634
Bug:
34909670
Test: Manually tested on device
Change-Id: I3adf5498f8b72959cb68cd508c44d87f953e450a
Doris Ling [Wed, 8 Feb 2017 18:12:01 +0000 (18:12 +0000)]
Merge "Update text for User & accounts page."
Christine Franks [Wed, 8 Feb 2017 17:25:12 +0000 (17:25 +0000)]
Merge "Require password to FR in carrier demo mode"
Rubin Xu [Wed, 8 Feb 2017 16:04:22 +0000 (16:04 +0000)]
Merge "Deprecate old LockPatternUtils.clearLock()"
Christine Franks [Fri, 20 Jan 2017 19:24:14 +0000 (11:24 -0800)]
Require password to FR in carrier demo mode
Bug:
34341567
Test: manual - password is not required for regular user factory
resets and is required in carrier demo mode.
Change-Id: Ic594ebafdac02fc467dc6b2e46dfbd520db3ce9f
Julia Reynolds [Wed, 8 Feb 2017 13:34:19 +0000 (13:34 +0000)]
Merge "Api change."
TreeHugger Robot [Wed, 8 Feb 2017 10:18:26 +0000 (10:18 +0000)]
Merge "Fix music crash regression: Part Deux."
TreeHugger Robot [Wed, 8 Feb 2017 05:54:34 +0000 (05:54 +0000)]
Merge "Misc fix on top level items."
Sundeep Ghuman [Tue, 7 Feb 2017 02:31:42 +0000 (18:31 -0800)]
Change PreferenceCategory margins.
Top and bottom margins of the frame layout are changed to 8dp per bug
request. A 16dp top margin was added to the title in order to match
mocks provided in bug.
This also fixes the WifiPicker currently connectected access point to
make it centered.
Bug:
34978500,
34714183
Test: Visual. See screenshot in comments.
Change-Id: Idfa978b2defeb9b3f16651d670c5578f33b02656
Suprabh Shukla [Wed, 8 Feb 2017 01:53:25 +0000 (01:53 +0000)]
Merge "Removing unknown sources from security settings"
Doris Ling [Wed, 8 Feb 2017 01:16:47 +0000 (17:16 -0800)]
Fix for null pointer when launching Connected devices.
Check for null usb port before trying to loop through the list.
Change-Id: I37e44fac234fc6e774b8280509fb33e6165ce2dd
Fix:
35102512
Test: make RunSettingsRoboTests
Daniel Nishi [Wed, 8 Feb 2017 00:57:04 +0000 (16:57 -0800)]
Remove Downloads backup options.
Bug:
32338407
Test: Manual -- Downloads was added before we really started adding
tests.
Change-Id: Ifd8b3dcd42e7c5c4017bdbc7e6aedcab653f216d
TreeHugger Robot [Tue, 7 Feb 2017 23:58:15 +0000 (23:58 +0000)]
Merge "Add summary provider for Cast Setting (WifiDisplaySettings)"
Doris Ling [Tue, 7 Feb 2017 22:27:59 +0000 (14:27 -0800)]
Update App Info page layout.
- Update the header view layout to move the app icon to the left.
- Re-order the preference items on the page: Notifications,
Permissions, Storage, Data usage, Battery, Default
Change-Id: I936df7ed8305c0b5deae8b1d812e05833c2b7f11
Bug:
34977561
Test: Visual
Daniel Nishi [Tue, 7 Feb 2017 22:43:43 +0000 (14:43 -0800)]
Fix music crash regression: Part Deux.
Bug:
34888282
Test: Manual as a result of
34768986
Change-Id: Icebcb49befed5cc39eef7707ca6d97c45ec958aa
TreeHugger Robot [Tue, 7 Feb 2017 21:34:16 +0000 (21:34 +0000)]
Merge "Misc fix on network & internet screen for developer preview"
Junda Liu [Tue, 7 Feb 2017 20:43:19 +0000 (20:43 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev am:
18fce0a7cf
am:
dd9d72df53
Change-Id: I67aaada84389e24b153b514c936c0f72f7bcf641
Junda Liu [Tue, 7 Feb 2017 20:43:05 +0000 (20:43 +0000)]
Ignore orientation change to preserve ApnEditor. am:
76ad635ef7
am:
d7a13ef2b6
Change-Id: I98c554d475ba3bdd24dfd3bcb6d4597f514b440c
Junda Liu [Tue, 7 Feb 2017 20:40:12 +0000 (20:40 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
am:
18fce0a7cf
Change-Id: I0492b3bd442c381f2b7b75707719cc3631bda796
Junda Liu [Tue, 7 Feb 2017 20:40:11 +0000 (20:40 +0000)]
Ignore orientation change to preserve ApnEditor.
am:
76ad635ef7
Change-Id: Ic32658c295821565d1c20245d0f8cb99942639e6
Junda Liu [Tue, 7 Feb 2017 20:35:46 +0000 (20:35 +0000)]
Merge "Ignore orientation change to preserve ApnEditor." into nyc-mr2-dev
TreeHugger Robot [Tue, 7 Feb 2017 20:34:52 +0000 (20:34 +0000)]
Merge "Re-add the break statement that was accidentally removed."
Stephen Chen [Tue, 7 Feb 2017 20:23:01 +0000 (20:23 +0000)]
Merge "Change number of showing tiles in ConfigureWifiSettings."
Stephen Chen [Tue, 7 Feb 2017 20:21:01 +0000 (12:21 -0800)]
Change number of showing tiles in ConfigureWifiSettings.
Test: manual inspection.
Change-Id: Ieecbff4416c69e902b9f0c5b4e4fc91907420b17
TreeHugger Robot [Tue, 7 Feb 2017 20:12:37 +0000 (20:12 +0000)]
Merge "Add Adaptive brightness as an inline result in Search"
Fan Zhang [Tue, 7 Feb 2017 18:39:01 +0000 (10:39 -0800)]
Add summary provider for Cast Setting (WifiDisplaySettings)
Change-Id: Ieaf413e3d698a9cbcb0560bfa65f380675677a74
Fix:
34976128
Test: make RunSettingsRoboTests
TreeHugger Robot [Tue, 7 Feb 2017 19:13:59 +0000 (19:13 +0000)]
Merge "Installed App loader only matches on prefixes"
Doris Ling [Fri, 3 Feb 2017 23:06:56 +0000 (15:06 -0800)]
Update text for User & accounts page.
- Add the user name to the Account preference group title.
- Add the summary text to Emergency information.
Bug:
34976320
Test: make RunSettingsRoboTests
Change-Id: I771e355ce3b313ffa50feb5c5e7907b1f3857592
Daniel Nishi [Tue, 7 Feb 2017 17:40:54 +0000 (09:40 -0800)]
Re-add the break statement that was accidentally removed.
This fixes the problem where the game fragment starts at the same
time as external sources.
Bug:
35056002
Test: b/
34768986
Change-Id: Ie35decc627dc6bec493a8c1f1976dc11d460f5fe
TreeHugger Robot [Tue, 7 Feb 2017 07:34:09 +0000 (07:34 +0000)]
Merge "Import translations. DO NOT MERGE"
Tadashi G. Takaoka [Tue, 7 Feb 2017 06:21:31 +0000 (06:21 +0000)]
Merge "Fix BroadcastReceiver leakage"
Pavlin Radoslavov [Tue, 7 Feb 2017 06:20:51 +0000 (06:20 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9 am:
14eb8cfe57 am:
8e81cf1310
am:
2a70967e41
Change-Id: Icc13b2847d8a7b6f0800bd067ac3fe3e01c478ec
Bill Yi [Tue, 7 Feb 2017 06:20:34 +0000 (06:20 +0000)]
Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am:
b6c4241725 -s ours
am:
f78eb881f1 -s ours
Change-Id: I430f58095bf61e7fbd6fd8a99ad2de24ea16e350
Bill Yi [Tue, 7 Feb 2017 06:20:19 +0000 (06:20 +0000)]
Import translations. DO NOT MERGE am:
5d0af58793 -s ours
am:
edf73ab967 -s ours
Change-Id: I856c9036dad1726eb70b0569fc49352a66b02864
TreeHugger Robot [Tue, 7 Feb 2017 05:28:00 +0000 (05:28 +0000)]
Merge "Update the preference category title text color."
Pavlin Radoslavov [Tue, 7 Feb 2017 04:55:47 +0000 (04:55 +0000)]
Merge "Catch IllegalStateException when updating Bluetooth A2DP codec info" am:
ad62fd52c9 am:
14eb8cfe57
am:
8e81cf1310
Change-Id: I513fdf69abc617944f5e0ce8195d16a451f61590