Commit Graph

41500 Commits

Author SHA1 Message Date
Antony Sargent
49820f4c65 Revert "Update style names due to theme migration"
This reverts commit cc16feb726.

Reason for revert: in b/70031670 we discovered some problems in
the support library side change (ag/3136307), and it will take a
little while to fix those problems so we need to temporarily
revert the support library changes to unblock a push of the
support library to google3.

Change-Id: I2086f434d5bcb518e474734b6d2b98a4b1c194d2
2017-12-06 17:57:01 +00:00
Antony Sargent
cc16feb726 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
2017-11-27 18:06:48 +00:00
Bill Yi
c61ed6356d Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 419407eaea -s ours
am: 1ef2ec2264  -s ours

Change-Id: Ib4a2d4cc1eb42015dfdf56fba3417918de2af670
2017-11-26 23:08:53 +00:00
Bill Yi
1ef2ec2264 Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 419407eaea  -s ours

Change-Id: I5689ca60c3bf9a29c59380c7d3002c6007f8eb05
2017-11-26 23:05:52 +00:00
TreeHugger Robot
419407eaea Merge "Import translations. DO NOT MERGE" into oc-mr1-dev 2017-11-26 23:02:14 +00:00
Bill Yi
d2037b9997 Import translations. DO NOT MERGE am: 9ae05458f0 -s ours am: b2cc06ea43 -s ours
am: 97e5272958  -s ours

Change-Id: I6b5222e2b795f7c08279ca142eada5087cb2803a
2017-11-26 22:55:21 +00:00
Bill Yi
97e5272958 Import translations. DO NOT MERGE am: 9ae05458f0 -s ours
am: b2cc06ea43  -s ours

Change-Id: I6e6335049140a4cb73bb694dd4636f264e1876a4
2017-11-26 22:52:50 +00:00
Bill Yi
b2cc06ea43 Import translations. DO NOT MERGE
am: 9ae05458f0  -s ours

Change-Id: I829586defb2cf0da3395bc8eb41ae243faf02173
2017-11-26 22:49:49 +00:00
Bill Yi
9ae05458f0 Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: I970b01d5df730bd739ef0ad5a40d28916bf53b02
2017-11-26 12:19:05 -08:00
Bill Yi
f00a457d5b Import translations. DO NOT MERGE
Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ibfb674f157b342ea77c07cd88c47dc25b2fcd03e
2017-11-26 12:15:58 -08:00
TreeHugger Robot
03b2d4c44c Merge "Disable DevelopmentSettingsActivity by default" 2017-11-23 01:47:53 +00:00
TreeHugger Robot
e2e0ee33f5 Merge "Update search bar visual" 2017-11-23 00:57:34 +00:00
Jeffrey Huang
5999f5d892 Merge "Move accounts package tests to sdk 26" 2017-11-23 00:53:02 +00:00
Jeffrey Huang
7c18a20624 Merge "Update AccountDetailDashboardFragmentTest" 2017-11-23 00:52:50 +00:00
Jeffrey Huang
aaffb5fd4a Merge "Update SetupChooseLockPatternTest to SDK 26" 2017-11-23 00:52:39 +00:00
TreeHugger Robot
dd1091c4b4 Merge "Fix AutoSyncDataPreferenceControllerTest" 2017-11-23 00:16:58 +00:00
TreeHugger Robot
c18f54d3e8 Merge "Fix RemoveAccountPreferenceControllerTest" 2017-11-23 00:04:33 +00:00
Fan Zhang
5830dcc100 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
2017-11-22 15:12:06 -08:00
Fan Zhang
831f6302ee 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
2017-11-22 14:44:23 -08:00
jeffreyhuang
65304af215 Fix AutoSyncDataPreferenceControllerTest
- Prevent this test from hanging due to fragment deep mock

Test: make RunSettingsRoboTests -j40
Change-Id: I043303c87eb89508fd96e151a17dc70a7b7fa3bb
2017-11-22 14:28:01 -08:00
jeffreyhuang
90f59be20b Move accounts package tests to sdk 26
Test: make RunSettingsRoboTests -j40
Change-Id: I5f5a1f87aff5e1067e9339010b988e58fcc5b704
2017-11-22 14:24:45 -08:00
jeffreyhuang
f6c64b532f Fix RemoveAccountPreferenceControllerTest
- prevent the test from hanging due to passing a deep fragment mock

Test: make RunSettingsRoboTests -j40
Change-Id: I60b6f32b19563dbcd25eda9d98a8c0266480a3f9
2017-11-22 14:19:15 -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
jeffreyhuang
be36ba3432 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
2017-11-22 13:05:39 -08: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
jeffreyhuang
2179c16b09 Update AccountDetailDashboardFragmentTest
- Update test to work with sdk 26

Test: make RunSettingsRoboTests -j40
Change-Id: I4c1c98330951f48f378330b51178fc188bba2571
2017-11-22 11:40:57 -08:00
songkailun
30154ada54 Merge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours am: 94cd0e4373
am: 04ec2de540  -s ours

Change-Id: I1a3e3a48b8d5cf95a404e18efa2de07a76f035a2
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

Change-Id: I8c60234d38a9aedd6b2bec24ff053aa2049790bd
2017-11-22 18:57:13 +00:00
songkailun
94cd0e4373 Merge "DO NOT MERGE translate arrays in Settings/res"
am: 992a4e5500  -s ours

Change-Id: Ia5c69f39d1796acd79e453744cc7e5c487c43042
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  -s ours

Change-Id: I4c34683cdd13374e775d225b3acb3256107b922b
2017-11-21 16:48:48 +00:00
jackqdyulei
dc75d02b95 Merge "Add owners to setting packages." am: f82cd59476
am: e6f052e928

Change-Id: Ie9bcc92888073e504ac444c42bc801c50aac7eb5
2017-11-21 16:46:24 +00:00
jackqdyulei
e6f052e928 Merge "Add owners to setting packages."
am: f82cd59476

Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f
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  -s ours

Change-Id: Ibe54d1aff2601cfd3640665fb680fc10dda16c7c
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  -s ours

Change-Id: I236ee8d17bef986af509692cbbd5788ab653d3ae
2017-11-21 00:58:56 +00:00
Malcolm Chen
5b59b71f12 Merge "Add an activity that starts DataUsageList fragment for mobile."
am: 942d418da9  -s ours

Change-Id: I23e52f28f5e0873094476eda4698677e4c736f4e
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