OSDN Git Service
TreeHugger Robot [Tue, 28 Nov 2017 22:43:30 +0000 (22:43 +0000)]
Merge changes I886a7277,I25d96c82
* changes:
Move development test package to sdk 26
Move OemUnlockPreferenceControllerTest to sdk 26
TreeHugger Robot [Tue, 28 Nov 2017 22:14:28 +0000 (22:14 +0000)]
Merge "Add SettingsPrefController for Slices"
TreeHugger Robot [Tue, 28 Nov 2017 21:23:49 +0000 (21:23 +0000)]
Merge "Update Settings to use DeviceDefault colored button"
TreeHugger Robot [Tue, 28 Nov 2017 20:21:20 +0000 (20:21 +0000)]
Merge "Move deletionhelper test package to sdk 26"
jeffreyhuang [Tue, 28 Nov 2017 19:57:13 +0000 (11:57 -0800)]
Move development test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I886a72774442884329d15e5dd276b00a269201c5
jeffreyhuang [Tue, 28 Nov 2017 19:56:57 +0000 (11:56 -0800)]
Move OemUnlockPreferenceControllerTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I25d96c82bd99c5c7adba6b6269f1a5735b22ca5b
TreeHugger Robot [Tue, 28 Nov 2017 19:38:32 +0000 (19:38 +0000)]
Merge "Implement querySiteMapPairs for indexableProvider."
TreeHugger Robot [Tue, 28 Nov 2017 19:32:46 +0000 (19:32 +0000)]
Merge changes Icae52730,I38282b97
* changes:
Move dashboard test package to sdk 26
Update DashboardFeatureProviderImplTest to sdk 26
TreeHugger Robot [Tue, 28 Nov 2017 18:58:29 +0000 (18:58 +0000)]
Merge "move connecteddevice test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 18:43:49 +0000 (18:43 +0000)]
Merge "Add new method to FakeUid"
jeffreyhuang [Tue, 28 Nov 2017 18:15:15 +0000 (10:15 -0800)]
Move deletionhelper test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ib791b499c1c6231f3d17bf3dfbfd65c2bdaf0f77
TreeHugger Robot [Tue, 28 Nov 2017 04:05:46 +0000 (04:05 +0000)]
Merge "Move datetime package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 02:39:31 +0000 (02:39 +0000)]
Merge "Move datausage test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 02:38:24 +0000 (02:38 +0000)]
Merge "Move datausage test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 01:26:41 +0000 (01:26 +0000)]
Merge "Move bluetooth test package to sdk 26"
TreeHugger Robot [Tue, 28 Nov 2017 01:12:35 +0000 (01:12 +0000)]
Merge "Move backup package tests to sdk 26"
jeffreyhuang [Tue, 28 Nov 2017 01:09:51 +0000 (17:09 -0800)]
Move datausage test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ie09794d6d32794ac40c3e6587b81fc108b445c9c
jeffreyhuang [Tue, 28 Nov 2017 01:05:06 +0000 (17:05 -0800)]
Move datetime package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I0b93682625e15a6306f5fbd3409d4a4003beb805
jeffreyhuang [Tue, 28 Nov 2017 00:37:08 +0000 (16:37 -0800)]
Move dashboard test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Icae52730bb12abcabb42d7e0a905c2b9108c3e28
jeffreyhuang [Tue, 28 Nov 2017 00:36:36 +0000 (16:36 -0800)]
Update DashboardFeatureProviderImplTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I38282b97b3e0325a1568d1af9bd2b38b110736c1
jeffreyhuang [Tue, 28 Nov 2017 00:46:52 +0000 (16:46 -0800)]
Move datausage test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I10d2d0eb9abafe8a81adab3ce3f5db2f1f3337b8
Matthew Fritze [Wed, 15 Nov 2017 23:12:52 +0000 (15:12 -0800)]
Add SettingsPrefController for Slices
Adds a new abstraction layer between preference controllers
and the AbstractPreferenceController. The layer is used to
consolidate the logic for each the setting type for getting
and setting values. This will be extended to support UI
information for Slices.
For reference how this fits into Slices, look at the
like-named classes added in this prototype:
ag/
3221891
The changes in Search are as a transition into deprecation.
The code for Search in Settings is out-of-date from the
unbundled counterpart, and this change is made so that the
current code behaves as normal.
Test: robotests
Bug:
67996707
Change-Id: Ib1faab706485039edad66119a27a3fd5cabe6009
TreeHugger Robot [Tue, 28 Nov 2017 00:32:37 +0000 (00:32 +0000)]
Merge changes I9815f48e,Ib344f062,I84b62392,I81bfdff0
* changes:
Move applications test package to sdk 26
Update tests to sdk 26
move manageapplications to sdk 26
Update viewholder tests to sdk 26
TreeHugger Robot [Tue, 28 Nov 2017 00:02:53 +0000 (00:02 +0000)]
Merge "Update RecentAppsPreferenceControllerTest to sdk26"
Fan Zhang [Mon, 27 Nov 2017 23:50:19 +0000 (15:50 -0800)]
Implement querySiteMapPairs for indexableProvider.
Query sitemap will return a list of pairs [parent class name, child
class name]. It's up to consumer to figure out the display name later
so the provider doesn't have dependency on localizing any display names.
- Removed SiteMapManagerTest. We will perform the test in
SettingsIntelligence instead.
- Added test for the new provider in instrumentation test (robolectric
doesn't recognize the new constants in framework yet)
Bug:
67359411
Bug:
64938328
Test: atest
Change-Id: Ia973115320e6b7c8cf84d4756db1763ae7010aed
jeffreyhuang [Mon, 27 Nov 2017 23:47:24 +0000 (15:47 -0800)]
move connecteddevice test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I8dd681215dcc1f3da44c5ab852c2d80016aeeb5c
jeffreyhuang [Mon, 27 Nov 2017 23:42:25 +0000 (15:42 -0800)]
Move bluetooth test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I26e6f437052caafd97f3f164b388d379fc890e7e
jeffreyhuang [Mon, 27 Nov 2017 23:14:12 +0000 (15:14 -0800)]
Move backup package tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I016e8ae3336544c4c75ead96d06e4b461ed13773
TreeHugger Robot [Mon, 27 Nov 2017 23:14:02 +0000 (23:14 +0000)]
Merge "Update style names due to theme migration"
jeffreyhuang [Mon, 27 Nov 2017 22:55:38 +0000 (14:55 -0800)]
Move applications test package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I9815f48ed9c6ddcfdae10cf09fbdf742a7066dfa
jeffreyhuang [Mon, 27 Nov 2017 22:55:02 +0000 (14:55 -0800)]
Update tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ib344f0622dfa3b9f9a8fdd6736bc34cb4f536db8
Jeffrey Huang [Mon, 27 Nov 2017 21:47:12 +0000 (21:47 +0000)]
Merge changes I8668be19,Ifb7769a1
* changes:
move defaultapps package to sdk 26
Update DefaultAppInfoTest to sdk 26
jeffreyhuang [Mon, 27 Nov 2017 20:05:11 +0000 (12:05 -0800)]
move manageapplications to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I84b62392a4a4d55c1d4e6a9eadc5910e4b9a8530
jeffreyhuang [Mon, 27 Nov 2017 20:04:43 +0000 (12:04 -0800)]
Update viewholder tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I81bfdff059255b3e7a20270dea62ffd56cc53ad5
TreeHugger Robot [Mon, 27 Nov 2017 21:42:38 +0000 (21:42 +0000)]
Merge "Make sure FP error text is visible in landscape"
jeffreyhuang [Mon, 27 Nov 2017 21:37:31 +0000 (13:37 -0800)]
Update RecentAppsPreferenceControllerTest to sdk26
- Remove the usage of the mock context to avoid null pointers in sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I73dac0c91e56d84cdec0314a4ec5754a0a98c54b
TreeHugger Robot [Mon, 27 Nov 2017 21:10:25 +0000 (21:10 +0000)]
Merge "CredentialStorage: Fix manual key installation."
Ahmed ElArabawy [Tue, 31 Oct 2017 01:07:35 +0000 (18:07 -0700)]
Add new method to FakeUid
This commit adds a new method to FakeUid
The added method is getMulticastWakelockStats()
Test: Manual Test
Bug:
33649966
Change-Id: I55c31eca87f1ad46e478d5e9e5e2f951eaee0265
Signed-off-by: Ahmed ElArabawy <arabawy@google.com>
TreeHugger Robot [Mon, 27 Nov 2017 20:06:41 +0000 (20:06 +0000)]
Merge "Increase max char limit for sim slot number"
TreeHugger Robot [Mon, 27 Nov 2017 19:50:34 +0000 (19:50 +0000)]
Merge "Move assist package to sdk 26"
TreeHugger Robot [Mon, 27 Nov 2017 19:48:36 +0000 (19:48 +0000)]
Merge "rename v2 controllers"
TreeHugger Robot [Mon, 27 Nov 2017 19:43:19 +0000 (19:43 +0000)]
Merge "Fix comma typo"
TreeHugger Robot [Mon, 27 Nov 2017 19:25:00 +0000 (19:25 +0000)]
Merge "Update string for battery saver"
jeffreyhuang [Mon, 27 Nov 2017 19:19:00 +0000 (11:19 -0800)]
move defaultapps package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I8668be1963135af3088229c440ac2aff88b77899
jeffreyhuang [Mon, 27 Nov 2017 19:18:19 +0000 (11:18 -0800)]
Update DefaultAppInfoTest to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Ifb7769a1bf0b22581dac80d7343e6cb58515af26
jeffreyhuang [Mon, 27 Nov 2017 18:21:47 +0000 (10:21 -0800)]
Move assist package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: Id37a5b2e445481bc586f12a4397e7082f28ec075
jeffreyhuang [Mon, 27 Nov 2017 18:12:06 +0000 (10:12 -0800)]
Fix comma typo
Bug:
69672170
Test: Manual
Change-Id: Ib32695ca8ecf19e3d0c4174ce7fbd9f2af31c29a
Antony Sargent [Fri, 27 Oct 2017 20:22:36 +0000 (13:22 -0700)]
Update style names due to theme migration
This updates some theme names to go along with a change to migrate some
theme elements from SettingsLib to the support library.
Bug:
64689839
Test: manual
Change-Id: I31b96c321def78bbb49239faae6ba8e73aacd2fa
jeffreyhuang [Mon, 27 Nov 2017 18:06:37 +0000 (10:06 -0800)]
Increase max char limit for sim slot number
- translations to other languages requires a few more characters
Bug:
69672094
Test: Compiles
Change-Id: I59c1ced9098b02718599a1feb7e64903e8dbd7f7
Bill Yi [Sun, 26 Nov 2017 23:08:53 +0000 (23:08 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am:
419407eaea -s ours
am:
1ef2ec2264 -s ours
Change-Id: Ib4a2d4cc1eb42015dfdf56fba3417918de2af670
Bill Yi [Sun, 26 Nov 2017 23:05:52 +0000 (23:05 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am:
419407eaea -s ours
Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05
TreeHugger Robot [Sun, 26 Nov 2017 23:02:14 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Sun, 26 Nov 2017 22:55:21 +0000 (22:55 +0000)]
Import translations. DO NOT MERGE am:
9ae05458f0 -s ours am:
b2cc06ea43 -s ours
am:
97e5272958 -s ours
Change-Id: I6b5222e2b795f7c08279ca142eada5087cb2803a
Bill Yi [Sun, 26 Nov 2017 22:52:50 +0000 (22:52 +0000)]
Import translations. DO NOT MERGE am:
9ae05458f0 -s ours
am:
b2cc06ea43 -s ours
Change-Id: I6e6335049140a4cb73bb694dd4636f264e1876a4
Bill Yi [Sun, 26 Nov 2017 22:49:49 +0000 (22:49 +0000)]
Import translations. DO NOT MERGE
am:
9ae05458f0 -s ours
Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173
Bill Yi [Sun, 26 Nov 2017 20:19:05 +0000 (12:19 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
Bill Yi [Sun, 26 Nov 2017 20:15:58 +0000 (12:15 -0800)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e
Eran Messeri [Wed, 22 Nov 2017 17:29:38 +0000 (17:29 +0000)]
CredentialStorage: Fix manual key installation.
Since the introduction of user-selectability of keys into KeyChain,
keys installed in KeyChain, by default, cannot be granted access
by the user. This is a secure default, and means keys manually
installed by the user should be explicitly marked as user-selectable.
This change marks the user-added alias as user-selectable, so it can be
selected, later on, by the user, from the Certificate Selection prompt.
Bug:
65624467
Test: Manually with CtsVerifier (KeyChainTest).
Change-Id: I618a06270a127a38b2aa3098fddfa518515bc1b1
TreeHugger Robot [Thu, 23 Nov 2017 01:47:53 +0000 (01:47 +0000)]
Merge "Disable DevelopmentSettingsActivity by default"
TreeHugger Robot [Thu, 23 Nov 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Update search bar visual"
Jeffrey Huang [Thu, 23 Nov 2017 00:53:02 +0000 (00:53 +0000)]
Merge "Move accounts package tests to sdk 26"
Jeffrey Huang [Thu, 23 Nov 2017 00:52:50 +0000 (00:52 +0000)]
Merge "Update AccountDetailDashboardFragmentTest"
Jeffrey Huang [Thu, 23 Nov 2017 00:52:39 +0000 (00:52 +0000)]
Merge "Update SetupChooseLockPatternTest to SDK 26"
jeffreyhuang [Thu, 23 Nov 2017 00:44:51 +0000 (16:44 -0800)]
rename v2 controllers
- Remove v2 postfix on controllers now that v1 dev options have been
removed
Bug:
34203528
Test: compiles and tests still pass
Change-Id: I7a937e914293233801dbd1d9536b7b47ee70d591
Maurice Lam [Thu, 23 Nov 2017 00:17:37 +0000 (16:17 -0800)]
Make sure FP error text is visible in landscape
Use layout_weight in the enrolling progress bar to make sure it
there is space left for the error text.
Test: Manual
Bug:
69686380
Change-Id: Idd3d4c4ac376e721f15b8c9871c56e0619def305
TreeHugger Robot [Thu, 23 Nov 2017 00:16:58 +0000 (00:16 +0000)]
Merge "Fix AutoSyncDataPreferenceControllerTest"
TreeHugger Robot [Thu, 23 Nov 2017 00:04:33 +0000 (00:04 +0000)]
Merge "Fix RemoveAccountPreferenceControllerTest"
Fan Zhang [Wed, 22 Nov 2017 23:12:06 +0000 (15:12 -0800)]
Update search bar visual
- Rounded cornal radius is now 1/2 of total height. This makes the
search bar look like a pill.
Bug:
68814716
Test: visual
Change-Id: Ie572d11c0df8c42b4903bfe238e80eeb54e60fd0
Fan Zhang [Wed, 22 Nov 2017 21:07:50 +0000 (13:07 -0800)]
Disable DevelopmentSettingsActivity by default
And if for any reason monkey user is able to enter develop option page,
we show nothing.
And update some test to sdk 26.
Change-Id: I3f985e7fe14bd290db73b8c46dd817591df02015
Fixes:
68707778
Test: robotests
jeffreyhuang [Wed, 22 Nov 2017 22:14:10 +0000 (14:14 -0800)]
Fix AutoSyncDataPreferenceControllerTest
- Prevent this test from hanging due to fragment deep mock
Test: make RunSettingsRoboTests -j40
Change-Id: I043303c87eb89508fd96e151a17dc70a7b7fa3bb
jeffreyhuang [Wed, 22 Nov 2017 22:24:45 +0000 (14:24 -0800)]
Move accounts package tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I5f5a1f87aff5e1067e9339010b988e58fcc5b704
jeffreyhuang [Wed, 22 Nov 2017 21:55:35 +0000 (13:55 -0800)]
Fix RemoveAccountPreferenceControllerTest
- prevent the test from hanging due to passing a deep fragment mock
Test: make RunSettingsRoboTests -j40
Change-Id: I60b6f32b19563dbcd25eda9d98a8c0266480a3f9
Yueming Wang [Wed, 22 Nov 2017 21:36:28 +0000 (21:36 +0000)]
Merge "Block settings when DISALLOW_CONFIG_DATE_TIME."
TreeHugger Robot [Wed, 22 Nov 2017 21:32:24 +0000 (21:32 +0000)]
Merge "Move accessibility package to sdk 26"
jeffreyhuang [Tue, 21 Nov 2017 00:18:06 +0000 (16:18 -0800)]
Update SetupChooseLockPatternTest to SDK 26
- create a new ShadowResourcesImpl because sdk 26 calls loadDrawable
from ResourcesImpl instead of Resources
Test: make RunSettingsRoboTests -j40
Change-Id: I8eed76ea779972c68893d4e7fdfc4493465b9b22
yuemingw [Mon, 23 Oct 2017 17:36:00 +0000 (18:36 +0100)]
Block settings when DISALLOW_CONFIG_DATE_TIME.
Test: m -j RunSettingsRoboTests
runtest -x packages/apps/Settings/tests/unit/src/com/android/settings/core/UserRestrictionTest.java
Fix:
67497909
After turn on the user restriction in TestDPC:
https://hsv.googleplex.com/
5414119658225664
The date time settings page become:
https://hsv.googleplex.com/
5199302573948928
Change-Id: I42590c4a505ec1b6ffa86eb460b90fa6ec8ba783
jeffreyhuang [Wed, 22 Nov 2017 19:39:21 +0000 (11:39 -0800)]
Update AccountDetailDashboardFragmentTest
- Update test to work with sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I4c1c98330951f48f378330b51178fc188bba2571
songkailun [Wed, 22 Nov 2017 19:22:50 +0000 (19:22 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res" am:
992a4e5500 -s ours am:
94cd0e4373
am:
04ec2de540 -s ours
Change-Id: I1a3e3a48b8d5cf95a404e18efa2de07a76f035a2
jeffreyhuang [Wed, 22 Nov 2017 19:21:29 +0000 (11:21 -0800)]
Move accessibility package to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I6fa70ec4da82e29934a21cd5780175aa510b5d62
songkailun [Wed, 22 Nov 2017 18:57:13 +0000 (18:57 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res" am:
992a4e5500 -s ours
am:
94cd0e4373
Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd
songkailun [Wed, 22 Nov 2017 18:49:59 +0000 (18:49 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
am:
992a4e5500 -s ours
Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
jackqdyulei [Wed, 22 Nov 2017 18:44:36 +0000 (10:44 -0800)]
Update string for battery saver
"Battery saver" -> "Battery Saver"
Bug:
69480774
Test: Build
Change-Id: I6e1598c19ed6d85a15d6178ae010c3dd8cfe25be
Treehugger Robot [Wed, 22 Nov 2017 18:36:14 +0000 (18:36 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"
songkailun [Tue, 14 Nov 2017 13:57:20 +0000 (21:57 +0800)]
DO NOT MERGE translate arrays in Settings/res
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com>
TreeHugger Robot [Wed, 22 Nov 2017 02:33:41 +0000 (02:33 +0000)]
Merge changes Ia2ab6b67,I85a9ef21
* changes:
Update ConnectedDeviceGroupController
Add infrastructure for connected device group.
Mady Mellor [Tue, 21 Nov 2017 23:35:12 +0000 (23:35 +0000)]
Merge "Add slice provider to settings (only provides wifi for now)"
jackqdyulei [Thu, 16 Nov 2017 18:45:43 +0000 (10:45 -0800)]
Update ConnectedDeviceGroupController
Get the PreferenceGroup there and add/remove preference
through the callback
Also add ConnectedBluetoothDeviceUpdater which only filter
the connected device.
Bug:
69333961
Test: RunSettingsRoboTests
Change-Id: Ia2ab6b6708329227929d6fe442df3a8d45bf86f5
jackqdyulei [Thu, 16 Nov 2017 18:14:41 +0000 (10:14 -0800)]
Add infrastructure for connected device group.
The core thing is to find out a way to update group when devices
(bt device and usb device)are updated.
The infrastructure contains three parts:
1. ConnectedDeviceController
Normal PreferenceController. Get info from sub controller and update
the preferenceGroup.
2. BluetoothDeviceUpdater
Listen to bluetooth callback, decide whether to add/remove devices
3. DevicePreferenceCallback
Interface to add/remove preference. This interface will be used in
ConntectedDeviceController and future SavedDeviceController
Bug:
69333961
Test: RunsettingsRoboTests
Change-Id: I85a9ef216a801d5f0dd1cf0130d53850a68be4bd
Mady Mellor [Fri, 3 Nov 2017 16:17:05 +0000 (09:17 -0700)]
Add slice provider to settings (only provides wifi for now)
- Adds a slice provider to settings that can make a wifi slice
Test: Use SliceBrowser to look at the slice
Bug:
68378569
Change-Id: I8c73ea96a99ee9b0db4a2d7fddc5dbc2b1156da8
jackqdyulei [Tue, 21 Nov 2017 16:48:48 +0000 (16:48 +0000)]
Merge "Add owners to setting packages." am:
f82cd59476 am:
e6f052e928
am:
dc75d02b95 -s ours
Change-Id: I4c34683cdd13374e775d225b3acb3256107b922b
jackqdyulei [Tue, 21 Nov 2017 16:46:24 +0000 (16:46 +0000)]
Merge "Add owners to setting packages." am:
f82cd59476
am:
e6f052e928
Change-Id: Ie9bcc92888073e504ac444c42bc801c50aac7eb5
jackqdyulei [Tue, 21 Nov 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Add owners to setting packages."
am:
f82cd59476
Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
Treehugger Robot [Tue, 21 Nov 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Add owners to setting packages."
TreeHugger Robot [Tue, 21 Nov 2017 02:40:01 +0000 (02:40 +0000)]
Merge "Move some tests to sdk version o"
TreeHugger Robot [Tue, 21 Nov 2017 02:20:30 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE"
Lei Yu [Tue, 21 Nov 2017 01:13:29 +0000 (01:13 +0000)]
Merge "Add feature flag for connected device"
Malcolm Chen [Tue, 21 Nov 2017 01:10:26 +0000 (01:10 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile." am:
942d418da9 -s ours am:
5b59b71f12 -s ours
am:
df0a4bbcd3 -s ours
Change-Id: Ibe54d1aff2601cfd3640665fb680fc10dda16c7c
Malcolm Chen [Tue, 21 Nov 2017 00:58:56 +0000 (00:58 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile." am:
942d418da9 -s ours
am:
5b59b71f12 -s ours
Change-Id: I236ee8d17bef986af509692cbbd5788ab653d3ae
Malcolm Chen [Tue, 21 Nov 2017 00:48:50 +0000 (00:48 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
am:
942d418da9 -s ours
Change-Id: I23e52f28f5e0873094476eda4698677e4c736f4e
TreeHugger Robot [Tue, 21 Nov 2017 00:43:35 +0000 (00:43 +0000)]
Merge "Do not add SelectUsbConfigPreferenceController if USB is disabled."
OSDN Git Service
