jeffreyhuang
ade10ca2ef
Fix comma typo
...
Bug: 69672170
Test: Manual
Change-Id: Ib32695ca8ecf19e3d0c4174ce7fbd9f2af31c29a
2017-11-27 10:12:06 -08:00
Yueming Wang
eeffbf6225
Merge "Block settings when DISALLOW_CONFIG_DATE_TIME."
2017-11-22 21:36:28 +00:00
TreeHugger Robot
4f1b966213
Merge "Move accessibility package to sdk 26"
2017-11-22 21:32:24 +00:00
yuemingw
7b1da61346
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
2017-11-22 19:53:18 +00:00
songkailun
30154ada54
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours am: 94cd0e4373
...
am: 04ec2de540
2017-11-22 19:22:50 +00:00
jeffreyhuang
cafc84d2d0
Move accessibility package to sdk 26
...
Test: make RunSettingsRoboTests -j40
Change-Id: I6fa70ec4da82e29934a21cd5780175aa510b5d62
2017-11-22 11:21:29 -08:00
songkailun
04ec2de540
Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours
...
am: 94cd0e4373
2017-11-22 18:57:13 +00:00
songkailun
94cd0e4373
Merge "DO NOT MERGE translate arrays in Settings/res"
...
am: 992a4e5500
2017-11-22 18:49:59 +00:00
Treehugger Robot
992a4e5500
Merge "DO NOT MERGE translate arrays in Settings/res"
2017-11-22 18:36:14 +00:00
songkailun
d0fa1537cb
DO NOT MERGE translate arrays in Settings/res
...
"None" should be translated
Change-Id: I12a30e6476ec41c2a3bf1878d6b5596bf5ee8ed7
Signed-off-by: songkailun <songkailun@xiaomi.com >
2017-11-22 17:14:41 +00:00
TreeHugger Robot
bd642f9db8
Merge changes Ia2ab6b67,I85a9ef21
...
* changes:
Update ConnectedDeviceGroupController
Add infrastructure for connected device group.
2017-11-22 02:33:41 +00:00
Mady Mellor
b2419c7351
Merge "Add slice provider to settings (only provides wifi for now)"
2017-11-21 23:35:12 +00:00
jackqdyulei
75ea67c9f4
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
2017-11-21 14:44:35 -08:00
jackqdyulei
88579e2558
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
2017-11-21 12:46:30 -08:00
Mady Mellor
7c74085df0
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
2017-11-21 12:56:21 -05:00
jackqdyulei
200d6570c6
Merge "Add owners to setting packages." am: f82cd59476 am: e6f052e928
...
am: dc75d02b95
2017-11-21 16:48:48 +00:00
jackqdyulei
dc75d02b95
Merge "Add owners to setting packages." am: f82cd59476
...
am: e6f052e928
2017-11-21 16:46:24 +00:00
jackqdyulei
e6f052e928
Merge "Add owners to setting packages."
...
am: f82cd59476
2017-11-21 16:41:50 +00:00
Treehugger Robot
f82cd59476
Merge "Add owners to setting packages."
2017-11-21 16:35:30 +00:00
TreeHugger Robot
95cd246993
Merge "Move some tests to sdk version o"
2017-11-21 02:40:01 +00:00
TreeHugger Robot
1ba7f8b291
Merge "Import translations. DO NOT MERGE"
2017-11-21 02:20:30 +00:00
Lei Yu
064a76c3d3
Merge "Add feature flag for connected device"
2017-11-21 01:13:29 +00:00
Malcolm Chen
7f2a3d179d
Merge "Add an activity that starts DataUsageList fragment for mobile." am: 942d418da9 -s ours am: 5b59b71f12 -s ours
...
am: df0a4bbcd3
2017-11-21 01:10:26 +00:00
Malcolm Chen
df0a4bbcd3
Merge "Add an activity that starts DataUsageList fragment for mobile." am: 942d418da9 -s ours
...
am: 5b59b71f12
2017-11-21 00:58:56 +00:00
Malcolm Chen
5b59b71f12
Merge "Add an activity that starts DataUsageList fragment for mobile."
...
am: 942d418da9
2017-11-21 00:48:50 +00:00
TreeHugger Robot
197c0c83de
Merge "Do not add SelectUsbConfigPreferenceController if USB is disabled."
2017-11-21 00:43:35 +00:00
Bill Yi
eed3de53ef
Import translations. DO NOT MERGE
...
Change-Id: I8b64600126ed136b8caa3193dd984a287074adf0
Auto-generated-cl: translation import
2017-11-20 16:42:39 -08:00
jeffreyhuang
c47d806d30
Move some tests to sdk version o
...
Test: make RunSettingsRoboTests -j40
Change-Id: I8fa5dc1f371b5b16403304d0dc2bc821d6f3804a
2017-11-20 16:40:02 -08:00
jackqdyulei
d6a00cfa3f
Add owners to setting packages.
...
Bug: 65294119
Fixes: 69384604
Test: Build
Change-Id: Ib4fddc1f04087671d8445fd967d4262287e5c4f3
Merged-In: I927052a73f639d0894600611cd5c79293f43ff5e
Merged-In: Ia1eb8155f2d4359d56b0babd474083295ba38a0b
Merged-In: I24ec103ff5013ad416e3dfb1c548acd387b4ba64
Merged-In: If9fddc8b4e2e6d4d7db185ab16063e824323b9a7
Merged-In: I49159950521a013422b1087ea2c3e6cd5151457c
Merged-In: I69af58183c5b89af96c1a8808665fa506a620012
Merged-In: Ie9492f497824cd2b2727dde9d3a48452c72f1084
Merged-In: I2fd0249fd8b555e5ca93c3aec13857e6c74e157c
Merged-In: Id1c2d9233643a18c1e104255a9e2b8b1aaefc44e
Merged-In: Icdcfaaf6cc7a1e1cf77e89a79d0425cab4405ffc
Merged-In: I697528ff260a0f8e54aa1188e35143e668800e7d
Merged-In: I1486782f476acaf1e2e4b66df57869409239986f
Merged-In: I804b50a38c877da80b5ef3251e16029259014152
Merged-In: I39eec9ebc1db2dc14669f27b17624394e25eb47f
Merged-In: I054a6df08046cda1c2f202390ed24839a6b10349
Merged-In: I9da5bd71ed6aa3922a7f2e2ac4729e3247a204ce
Merged-In: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073
2017-11-20 16:39:59 -08:00
Treehugger Robot
942d418da9
Merge "Add an activity that starts DataUsageList fragment for mobile."
2017-11-21 00:35:41 +00:00
jackqdyulei
76ba0f72e4
Add feature flag for connected device
...
Add feature flag to toggle connected device between new and old
feature.
ConnectedDeviceDashboardFragment will contain new feature will
ConnectedDeviceDashboardFragment2 will hold old feature.
Bug: 69333961
Test: Build
Change-Id: I0ea932c69dea5242129aab994d5142b1f87fbea0
2017-11-20 15:29:28 -08:00
Bill Yi
65ec66e394
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 59a800d0ec -s ours
...
am: 967ad51df4
2017-11-20 22:59:12 +00:00
Bill Yi
967ad51df4
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
...
am: 59a800d0ec
2017-11-20 22:53:31 +00:00
TreeHugger Robot
59a800d0ec
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
2017-11-20 22:46:59 +00:00
Bill Yi
7319b300aa
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266 -s ours am: 9a7789a0fc -s ours
...
am: 97c257520a
2017-11-20 22:40:07 +00:00
Bill Yi
97c257520a
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266 -s ours
...
am: 9a7789a0fc
2017-11-20 22:36:07 +00:00
Bill Yi
9a7789a0fc
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
...
am: ae351b3266
2017-11-20 22:31:36 +00:00
TreeHugger Robot
ae351b3266
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
2017-11-20 22:20:05 +00:00
TreeHugger Robot
b46078fdc8
Merge "Revert "Revert "Prevent monkey from changing usb settings"""
2017-11-20 21:45:29 +00:00
TreeHugger Robot
6b0fd1d0bd
Merge "Import translations. DO NOT MERGE"
2017-11-20 21:38:11 +00:00
Lei Yu
a6005aa3b1
Merge "Decouple BluetoothDevicePreference and DeviceListPreferenceFragment"
2017-11-20 21:27:20 +00:00
Ben Lin
3f5d58b981
Do not add SelectUsbConfigPreferenceController if USB is disabled.
...
Bug: 69479572
Test: Local cherry-picked to master-arc-dev, and deployed cheets_x86 to
a ChromeOS device. Developer Options show up.
Updated SelectUsbConfigPreferenceControllerTest.
Change-Id: I8c6a4501849e67c92f50b8a3781260e9dbcdaf20
2017-11-20 13:26:15 -08:00
Bill Yi
d4bae3a7a0
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264
2017-11-20 11:40:38 -08:00
Bill Yi
c47fc92b8c
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1
2017-11-20 11:39:36 -08:00
Bill Yi
05fe7d0cd4
Import translations. DO NOT MERGE
...
Change-Id: I4578cba6e0521f8a6d7fea69c2ae2ab5dd0ea8bf
Auto-generated-cl: translation import
2017-11-20 11:38:20 -08:00
Jeffrey Huang
5a280667ba
Revert "Revert "Prevent monkey from changing usb settings""
...
This reverts commit da3f0d9e56
2017-11-20 10:58:38 -08:00
Julia Reynolds
14ed3f176e
Merge "Restore group block button."
2017-11-20 18:11:33 +00:00
jackqdyulei
cf1ce05ce5
Decouple BluetoothDevicePreference and DeviceListPreferenceFragment
...
The BluetoothDevicePreference need to know whether to display with an
invalid name. However pass in the whole fragment is over-killing.
This cl decouple it for several reasons:
1. In P, BluetoothDevicePreference will be used in other fragment.
2. In preference lifecycle from end user side, this flag is constant.
Bug: 69333961
Test: RunSettingsRoboTests
Change-Id: I3dbcd2a4aafa3ead74371534250e5e7c3ee221f7
2017-11-20 10:11:20 -08:00
TreeHugger Robot
d332f5c316
Merge "Add owners files to notification test dirs"
2017-11-20 18:10:59 +00:00
Jeffrey Huang
07394c9931
Merge "Enable flag for about phone v2"
2017-11-20 18:10:14 +00:00
