OSDN Git Service

android-x86/packages-apps-Settings.git
6 years agoMerge "Make sure FP error text is visible in landscape"
TreeHugger Robot [Mon, 27 Nov 2017 21:42:38 +0000 (21:42 +0000)]
Merge "Make sure FP error text is visible in landscape"

6 years agoMerge "CredentialStorage: Fix manual key installation."
TreeHugger Robot [Mon, 27 Nov 2017 21:10:25 +0000 (21:10 +0000)]
Merge "CredentialStorage: Fix manual key installation."

6 years agoMerge "Increase max char limit for sim slot number"
TreeHugger Robot [Mon, 27 Nov 2017 20:06:41 +0000 (20:06 +0000)]
Merge "Increase max char limit for sim slot number"

6 years agoMerge "Move assist package to sdk 26"
TreeHugger Robot [Mon, 27 Nov 2017 19:50:34 +0000 (19:50 +0000)]
Merge "Move assist package to sdk 26"

6 years agoMerge "rename v2 controllers"
TreeHugger Robot [Mon, 27 Nov 2017 19:48:36 +0000 (19:48 +0000)]
Merge "rename v2 controllers"

6 years agoMerge "Fix comma typo"
TreeHugger Robot [Mon, 27 Nov 2017 19:43:19 +0000 (19:43 +0000)]
Merge "Fix comma typo"

6 years agoMerge "Update string for battery saver"
TreeHugger Robot [Mon, 27 Nov 2017 19:25:00 +0000 (19:25 +0000)]
Merge "Update string for battery saver"

6 years agoMove assist package to sdk 26
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

6 years agoFix comma typo
jeffreyhuang [Mon, 27 Nov 2017 18:12:06 +0000 (10:12 -0800)]
Fix comma typo

Bug: 69672170
Test: Manual
Change-Id: Ib32695ca8ecf19e3d0c4174ce7fbd9f2af31c29a

6 years agoIncrease max char limit for sim slot number
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 419407eaea -s ours
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Sun, 26 Nov 2017 23:02:14 +0000 (23:02 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoImport translations. DO NOT MERGE am: 9ae05458f0 -s ours am: b2cc06ea43 -s ours
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

6 years agoImport translations. DO NOT MERGE am: 9ae05458f0 -s ours
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoImport translations. DO NOT MERGE
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

6 years agoCredentialStorage: Fix manual key installation.
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

6 years agoMerge "Disable DevelopmentSettingsActivity by default"
TreeHugger Robot [Thu, 23 Nov 2017 01:47:53 +0000 (01:47 +0000)]
Merge "Disable DevelopmentSettingsActivity by default"

6 years agoMerge "Update search bar visual"
TreeHugger Robot [Thu, 23 Nov 2017 00:57:34 +0000 (00:57 +0000)]
Merge "Update search bar visual"

6 years agoMerge "Move accounts package tests to sdk 26"
Jeffrey Huang [Thu, 23 Nov 2017 00:53:02 +0000 (00:53 +0000)]
Merge "Move accounts package tests to sdk 26"

6 years agoMerge "Update AccountDetailDashboardFragmentTest"
Jeffrey Huang [Thu, 23 Nov 2017 00:52:50 +0000 (00:52 +0000)]
Merge "Update AccountDetailDashboardFragmentTest"

6 years agoMerge "Update SetupChooseLockPatternTest to SDK 26"
Jeffrey Huang [Thu, 23 Nov 2017 00:52:39 +0000 (00:52 +0000)]
Merge "Update SetupChooseLockPatternTest to SDK 26"

6 years agorename v2 controllers
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

6 years agoMake sure FP error text is visible in landscape
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

6 years agoMerge "Fix AutoSyncDataPreferenceControllerTest"
TreeHugger Robot [Thu, 23 Nov 2017 00:16:58 +0000 (00:16 +0000)]
Merge "Fix AutoSyncDataPreferenceControllerTest"

6 years agoMerge "Fix RemoveAccountPreferenceControllerTest"
TreeHugger Robot [Thu, 23 Nov 2017 00:04:33 +0000 (00:04 +0000)]
Merge "Fix RemoveAccountPreferenceControllerTest"

6 years agoUpdate search bar visual
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

6 years agoDisable DevelopmentSettingsActivity by default
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

6 years agoFix AutoSyncDataPreferenceControllerTest
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

6 years agoMove accounts package tests to sdk 26
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

6 years agoFix RemoveAccountPreferenceControllerTest
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

6 years agoMerge "Block settings when DISALLOW_CONFIG_DATE_TIME."
Yueming Wang [Wed, 22 Nov 2017 21:36:28 +0000 (21:36 +0000)]
Merge "Block settings when DISALLOW_CONFIG_DATE_TIME."

6 years agoMerge "Move accessibility package to sdk 26"
TreeHugger Robot [Wed, 22 Nov 2017 21:32:24 +0000 (21:32 +0000)]
Merge "Move accessibility package to sdk 26"

6 years agoUpdate SetupChooseLockPatternTest 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

6 years agoBlock settings when DISALLOW_CONFIG_DATE_TIME.
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

6 years agoUpdate AccountDetailDashboardFragmentTest
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

6 years agoMerge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours am...
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

6 years agoMove accessibility package to sdk 26
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

6 years agoMerge "DO NOT MERGE translate arrays in Settings/res" am: 992a4e5500 -s ours
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

6 years agoMerge "DO NOT MERGE translate arrays in Settings/res"
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

6 years agoUpdate string for battery saver
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

6 years agoMerge "DO NOT MERGE translate arrays in Settings/res"
Treehugger Robot [Wed, 22 Nov 2017 18:36:14 +0000 (18:36 +0000)]
Merge "DO NOT MERGE translate arrays in Settings/res"

6 years agoDO 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>
6 years agoMerge changes Ia2ab6b67,I85a9ef21
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.

6 years agoMerge "Add slice provider to settings (only provides wifi for now)"
Mady Mellor [Tue, 21 Nov 2017 23:35:12 +0000 (23:35 +0000)]
Merge "Add slice provider to settings (only provides wifi for now)"

6 years agoUpdate ConnectedDeviceGroupController
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

6 years agoAdd infrastructure for connected device group.
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

6 years agoAdd slice provider to settings (only provides wifi for now)
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

6 years agoMerge "Add owners to setting packages." am: f82cd59476 am: e6f052e928
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

6 years agoMerge "Add owners to setting packages." am: f82cd59476
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

6 years agoMerge "Add owners to setting packages."
jackqdyulei [Tue, 21 Nov 2017 16:41:50 +0000 (16:41 +0000)]
Merge "Add owners to setting packages."
am: f82cd59476

Change-Id: Ic7c94f6ba65149cdc799332a0cc5976ff285f16f

6 years agoMerge "Add owners to setting packages."
Treehugger Robot [Tue, 21 Nov 2017 16:35:30 +0000 (16:35 +0000)]
Merge "Add owners to setting packages."

6 years agoMerge "Move some tests to sdk version o"
TreeHugger Robot [Tue, 21 Nov 2017 02:40:01 +0000 (02:40 +0000)]
Merge "Move some tests to sdk version o"

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Tue, 21 Nov 2017 02:20:30 +0000 (02:20 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Add feature flag for connected device"
Lei Yu [Tue, 21 Nov 2017 01:13:29 +0000 (01:13 +0000)]
Merge "Add feature flag for connected device"

6 years agoMerge "Add an activity that starts DataUsageList fragment for mobile." am: 942d418da9...
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

6 years agoMerge "Add an activity that starts DataUsageList fragment for mobile." am: 942d418da9...
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

6 years agoMerge "Add an activity that starts DataUsageList fragment for mobile."
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

6 years agoMerge "Do not add SelectUsbConfigPreferenceController if USB is disabled."
TreeHugger Robot [Tue, 21 Nov 2017 00:43:35 +0000 (00:43 +0000)]
Merge "Do not add SelectUsbConfigPreferenceController if USB is disabled."

6 years agoImport translations. DO NOT MERGE
Bill Yi [Tue, 21 Nov 2017 00:42:39 +0000 (16:42 -0800)]
Import translations. DO NOT MERGE

Change-Id: I8b64600126ed136b8caa3193dd984a287074adf0
Auto-generated-cl: translation import

6 years agoMove some tests to sdk version o
jeffreyhuang [Tue, 21 Nov 2017 00:40:02 +0000 (16:40 -0800)]
Move some tests to sdk version o

Test: make RunSettingsRoboTests -j40
Change-Id: I8fa5dc1f371b5b16403304d0dc2bc821d6f3804a

6 years agoAdd owners to setting packages.
jackqdyulei [Mon, 11 Sep 2017 19:44:27 +0000 (12:44 -0700)]
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

6 years agoMerge "Add an activity that starts DataUsageList fragment for mobile."
Treehugger Robot [Tue, 21 Nov 2017 00:35:41 +0000 (00:35 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."

6 years agoAdd feature flag for connected device
jackqdyulei [Fri, 17 Nov 2017 22:14:51 +0000 (14:14 -0800)]
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

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 59a800d0ec -s ours
Bill Yi [Mon, 20 Nov 2017 22:59:12 +0000 (22:59 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 59a800d0ec  -s ours
am: 967ad51df4  -s ours

Change-Id: I8f1c32e7de1f816c42ae1d34eda472f6d3074254

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
Bill Yi [Mon, 20 Nov 2017 22:53:31 +0000 (22:53 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 59a800d0ec  -s ours

Change-Id: I1a74337f7fb7ac6d5b157f5a8baa62d0703e2ec4

6 years agoMerge "Import translations. DO NOT MERGE" into oc-mr1-dev
TreeHugger Robot [Mon, 20 Nov 2017 22:46:59 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266 -s ours...
Bill Yi [Mon, 20 Nov 2017 22:40:07 +0000 (22:40 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266  -s ours am: 9a7789a0fc  -s ours
am: 97c257520a  -s ours

Change-Id: I23f07f62e4105b466db10ac1f0809ab3281fe55a

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266 -s ours
Bill Yi [Mon, 20 Nov 2017 22:36:07 +0000 (22:36 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: ae351b3266  -s ours
am: 9a7789a0fc  -s ours

Change-Id: I26f441bc84359e2ef490cc70867ee1b738ec85d8

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
Bill Yi [Mon, 20 Nov 2017 22:31:36 +0000 (22:31 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
am: ae351b3266  -s ours

Change-Id: I7004ff8745bf3ecbb1e947d5c064cca955f9e35e

6 years agoMerge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev

6 years agoMerge "Revert "Revert "Prevent monkey from changing usb settings"""
TreeHugger Robot [Mon, 20 Nov 2017 21:45:29 +0000 (21:45 +0000)]
Merge "Revert "Revert "Prevent monkey from changing usb settings"""

6 years agoMerge "Import translations. DO NOT MERGE"
TreeHugger Robot [Mon, 20 Nov 2017 21:38:11 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE"

6 years agoMerge "Decouple BluetoothDevicePreference and DeviceListPreferenceFragment"
Lei Yu [Mon, 20 Nov 2017 21:27:20 +0000 (21:27 +0000)]
Merge "Decouple BluetoothDevicePreference and DeviceListPreferenceFragment"

6 years agoDo not add SelectUsbConfigPreferenceController if USB is disabled.
Ben Lin [Sat, 18 Nov 2017 00:22:50 +0000 (16:22 -0800)]
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

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:40:38 +0000 (11:40 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Ic55e0c95b19c299b290f9f22b935b0e553917264

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:39:36 +0000 (11:39 -0800)]
Import translations. DO NOT MERGE

Auto-generated-cl: translation import

Bug: 64712476
Change-Id: Id4c5ecbe846aca0a08b60c7a08d548cbae3458b1

6 years agoImport translations. DO NOT MERGE
Bill Yi [Mon, 20 Nov 2017 19:38:20 +0000 (11:38 -0800)]
Import translations. DO NOT MERGE

Change-Id: I4578cba6e0521f8a6d7fea69c2ae2ab5dd0ea8bf
Auto-generated-cl: translation import

6 years agoRevert "Revert "Prevent monkey from changing usb settings""
Jeffrey Huang [Mon, 20 Nov 2017 18:55:26 +0000 (18:55 +0000)]
Revert "Revert "Prevent monkey from changing usb settings""

This reverts commit da3f0d9e56e069995b821f760c723c8bfede6e30.

Change-Id: I6d63305e18c2b95676feb60f2526dcade951cd3f

6 years agoMerge "Restore group block button."
Julia Reynolds [Mon, 20 Nov 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Restore group block button."

6 years agoDecouple BluetoothDevicePreference and DeviceListPreferenceFragment
jackqdyulei [Fri, 17 Nov 2017 00:06:14 +0000 (16:06 -0800)]
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

6 years agoMerge "Add owners files to notification test dirs"
TreeHugger Robot [Mon, 20 Nov 2017 18:10:59 +0000 (18:10 +0000)]
Merge "Add owners files to notification test dirs"

6 years agoMerge "Enable flag for about phone v2"
Jeffrey Huang [Mon, 20 Nov 2017 18:10:14 +0000 (18:10 +0000)]
Merge "Enable flag for about phone v2"

6 years agoAdd owners files to notification test dirs
Julia Reynolds [Mon, 20 Nov 2017 16:30:29 +0000 (11:30 -0500)]
Add owners files to notification test dirs

Test: make
Change-Id: I63778c68f1ab9edc36a9e12aa1729f8fd6a5e073

6 years agoRestore group block button.
Julia Reynolds [Fri, 17 Nov 2017 20:04:40 +0000 (15:04 -0500)]
Restore group block button.

Test: RunSettingsRoboTests
Bug: 63927402
Change-Id: I2e8163082d81d696dce2082be49a16c85458672b

6 years agoMerge "Block editing of locked down wifi network from details page."
Pavel Grafov [Mon, 20 Nov 2017 11:38:19 +0000 (11:38 +0000)]
Merge "Block editing of locked down wifi network from details page."

6 years agoMerge "Use res-auto as app xml namespace instead of settings."
TreeHugger Robot [Sat, 18 Nov 2017 02:27:20 +0000 (02:27 +0000)]
Merge "Use res-auto as app xml namespace instead of settings."

6 years agoMerge "Create version 2 of InstalledAppDetails"
TreeHugger Robot [Sat, 18 Nov 2017 01:23:43 +0000 (01:23 +0000)]
Merge "Create version 2 of InstalledAppDetails"

6 years agoUse res-auto as app xml namespace instead of settings.
Fan Zhang [Sat, 18 Nov 2017 00:49:54 +0000 (16:49 -0800)]
Use res-auto as app xml namespace instead of settings.

This is necessary for SettingsIntelligence to parse settings:keywords
when indexing search stuff.

Bug: 64938328
Test: rerun tests
Change-Id: I0d8885c854852020dfa0b9faa3044d4a1b82f8f2

6 years agoMerge "Delete DevelopmentSettings.java"
TreeHugger Robot [Sat, 18 Nov 2017 00:05:59 +0000 (00:05 +0000)]
Merge "Delete DevelopmentSettings.java"

6 years agoCreate version 2 of InstalledAppDetails
Doris Ling [Fri, 17 Nov 2017 23:15:27 +0000 (15:15 -0800)]
Create version 2 of InstalledAppDetails

- this is the first step for converting InstalledAppDetails into
DashboardFragment
- add a feature flag to determine whether to show the new installed app
detail page.
- decouple the fragment from AppInfoBase: extends from
SettingsPreferenceFragment directly and copy all codes from
AppInfoBase.

Bug: 69384089
Test: make RunSettingsRoboTests
Change-Id: If1ab5b216620eaba1d6bde20e65e7a602931fd94

6 years agoMerge "Update code to match FeatureFlagUtils interface change."
TreeHugger Robot [Fri, 17 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Update code to match FeatureFlagUtils interface change."

6 years agoDelete DevelopmentSettings.java
jeffreyhuang [Fri, 17 Nov 2017 19:19:44 +0000 (11:19 -0800)]
Delete DevelopmentSettings.java

 - Remove the old DevelopmentSettings
 - Remove references to the feature flag

Fixes: 65522949
Test: make RunSettingsRoboTests -j40
Change-Id: Ie2eb3465127d79a027de6bb58a47bb15e3094f89

6 years agoMerge "Remove the private dns dialog in developer page"
TreeHugger Robot [Fri, 17 Nov 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Remove the private dns dialog in developer page"

6 years agoMerge "Rootless GPU Debug"
Cody Northrop [Fri, 17 Nov 2017 20:33:24 +0000 (20:33 +0000)]
Merge "Rootless GPU Debug"

6 years agoUpdate code to match FeatureFlagUtils interface change.
Fan Zhang [Fri, 17 Nov 2017 19:16:46 +0000 (11:16 -0800)]
Update code to match FeatureFlagUtils interface change.

Bug: 36222960
Test: rerun robotests
Change-Id: Iecaaf2dfa1ec0a7f6754e74b723d619e16ec93bf

6 years agoRemove the private dns dialog in developer page
jackqdyulei [Wed, 15 Nov 2017 21:33:55 +0000 (13:33 -0800)]
Remove the private dns dialog in developer page

This code is added in go/aog/524415. Since we added this dialog
in network page(ag/3193880), we could delete it in developer
page safely.

Bug: 68030013
Test: Build
Change-Id: Id306160f4a87599ebbb68a86606c672ef800cd8a

6 years agoEnable flag for about phone v2
jeffreyhuang [Thu, 16 Nov 2017 00:56:50 +0000 (16:56 -0800)]
Enable flag for about phone v2

Bug: 36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I0a41fdafadf71e20b76f999005dac66b6a52f570