OSDN Git Service
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
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
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."
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
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
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
Treehugger Robot [Tue, 21 Nov 2017 00:35:41 +0000 (00:35 +0000)]
Merge "Add an activity that starts DataUsageList fragment for mobile."
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
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
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
TreeHugger Robot [Mon, 20 Nov 2017 22:46:59 +0000 (22:46 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
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
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
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
TreeHugger Robot [Mon, 20 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
TreeHugger Robot [Mon, 20 Nov 2017 21:45:29 +0000 (21:45 +0000)]
Merge "Revert "Revert "Prevent monkey from changing usb settings"""
TreeHugger Robot [Mon, 20 Nov 2017 21:38:11 +0000 (21:38 +0000)]
Merge "Import translations. DO NOT MERGE"
Lei Yu [Mon, 20 Nov 2017 21:27:20 +0000 (21:27 +0000)]
Merge "Decouple BluetoothDevicePreference and DeviceListPreferenceFragment"
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
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
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
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
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
Julia Reynolds [Mon, 20 Nov 2017 18:11:33 +0000 (18:11 +0000)]
Merge "Restore group block button."
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
TreeHugger Robot [Mon, 20 Nov 2017 18:10:59 +0000 (18:10 +0000)]
Merge "Add owners files to notification test dirs"
Jeffrey Huang [Mon, 20 Nov 2017 18:10:14 +0000 (18:10 +0000)]
Merge "Enable flag for about phone v2"
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
Julia Reynolds [Fri, 17 Nov 2017 20:04:40 +0000 (15:04 -0500)]
Restore group block button.
Test: RunSettingsRoboTests
Bug:
63927402
Change-Id: I2e8163082d81d696dce2082be49a16c85458672b
Pavel Grafov [Mon, 20 Nov 2017 11:38:19 +0000 (11:38 +0000)]
Merge "Block editing of locked down wifi network from details page."
TreeHugger Robot [Sat, 18 Nov 2017 02:27:20 +0000 (02:27 +0000)]
Merge "Use res-auto as app xml namespace instead of settings."
TreeHugger Robot [Sat, 18 Nov 2017 01:23:43 +0000 (01:23 +0000)]
Merge "Create version 2 of InstalledAppDetails"
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
TreeHugger Robot [Sat, 18 Nov 2017 00:05:59 +0000 (00:05 +0000)]
Merge "Delete DevelopmentSettings.java"
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
TreeHugger Robot [Fri, 17 Nov 2017 22:20:05 +0000 (22:20 +0000)]
Merge "Update code to match FeatureFlagUtils interface change."
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
TreeHugger Robot [Fri, 17 Nov 2017 20:34:34 +0000 (20:34 +0000)]
Merge "Remove the private dns dialog in developer page"
Cody Northrop [Fri, 17 Nov 2017 20:33:24 +0000 (20:33 +0000)]
Merge "Rootless GPU Debug"
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
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
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
Pavel Grafov [Wed, 8 Nov 2017 20:14:03 +0000 (20:14 +0000)]
Block editing of locked down wifi network from details page.
Test: make ROBOTEST_FILTER=WifiDetailPreferenceControllerTest RunSettingsRoboTests
Bug:
68990370
Change-Id: Idceb064486afd93bc8b2f52d605a788520de8e56
Cody Northrop [Wed, 25 Oct 2017 20:07:48 +0000 (14:07 -0600)]
Rootless GPU Debug
This commit adds a new toggle to allow loading GPU debug
layers from the base directory of debuggable applications.
It corresponds to changes to GraphicsEnvironment to look for
matching application and layer list, which are then selectively
passed on the native components, like the Vulkan loader.
Bug:
63708377
Test: Manual, CTS tests to follow
Change-Id: Id6917a7b34df4a37905fafe08a4c1b6503abbb0c
TreeHugger Robot [Fri, 17 Nov 2017 18:01:53 +0000 (18:01 +0000)]
Merge "Code cleanup in Zen Mode Settings"
Beverly [Fri, 17 Nov 2017 15:00:20 +0000 (10:00 -0500)]
Code cleanup in Zen Mode Settings
Changes in response to code review from automerged commit ag/
3171711
Test: make -j40 RunSettingsRoboTests
Bug: n/a
Change-Id: I5df3db4e8ff421ca9911c84ae3f621a0e3d08092
TreeHugger Robot [Thu, 16 Nov 2017 23:21:51 +0000 (23:21 +0000)]
Merge "Add test and fix null keys in search providers."
Jeffrey Huang [Thu, 16 Nov 2017 21:55:29 +0000 (21:55 +0000)]
Merge "Dynamic advanced button for about phone v2"
Jeffrey Huang [Thu, 16 Nov 2017 21:09:27 +0000 (21:09 +0000)]
Merge "Copy controllers from about phone v1 to v2"
Jeffrey Huang [Thu, 16 Nov 2017 21:09:00 +0000 (21:09 +0000)]
Merge "Additional search terms for about phone v2"
Fan Zhang [Thu, 16 Nov 2017 17:56:03 +0000 (09:56 -0800)]
Add test and fix null keys in search providers.
- Add keys to some screens.
- Remove dynamic saved network/turst agent from search provider.
- Remove dynamic print services from printsettings.
Bug:
69384409
Test: atest
Change-Id: I62dce27d52585badb2a8953a05084e35dbae2f7d
Jie Cheng [Thu, 16 Nov 2017 20:32:00 +0000 (20:32 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly" am:
8d3d166823 am:
c6525f5e24
am:
74ffa3a130
Change-Id: If48f4ca4e945835a5006253e8f7eba44e4316e6e
Jie Cheng [Thu, 16 Nov 2017 20:20:45 +0000 (20:20 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly" am:
8d3d166823
am:
c6525f5e24
Change-Id: I2516b9132982104ef870d79a7c63c7d002f036de
Jie Cheng [Thu, 16 Nov 2017 20:18:44 +0000 (20:18 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
am:
8d3d166823
Change-Id: I67a977b974ddbf42b01647e4ca02d7d9dfe1b61d
Treehugger Robot [Thu, 16 Nov 2017 20:14:27 +0000 (20:14 +0000)]
Merge "Preference SimSettingsActivity not aligned correctly"
TreeHugger Robot [Thu, 16 Nov 2017 19:44:25 +0000 (19:44 +0000)]
Merge "Add search to phone number preference"
jeffreyhuang [Wed, 15 Nov 2017 22:51:22 +0000 (14:51 -0800)]
Copy controllers from about phone v1 to v2
- Add feedback, device fcc, and manual controllers
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: Id2aeaa3a18cc83360e252df32f19a69ecd12f59f
Jie Cheng [Mon, 25 Sep 2017 05:54:55 +0000 (13:54 +0800)]
Preference SimSettingsActivity not aligned correctly
The preference SimSettingsActivity in the screen "Network & Internet"
never uses a summary. However the text for this preference ("SIM cards")
is top aligned in order to make room for an extra line for the
non-existing summary.
Solved by setting the summary to @string/summary_empty for the
preference SimSettingsActivity. This will make the text in the
preference to align correctly and not leave extra room for a summary.
Test: manual - Checked that preference SimSettingsActivity is correctly
aligned in screen "Network & Internet".
Bug:
69405185
Change-Id: I1a1b3fa7253bbf2a5299f54cc8c4d3e857ca059c
Fan Zhang [Thu, 16 Nov 2017 01:38:12 +0000 (01:38 +0000)]
Merge "Catch exception when checking WifiDisplay availability" am:
7a08901d1b am:
6d5e7bf41f
am:
7d72837179
Change-Id: Icd680a4790dfbf694ae15f044ab6ffab02435727
Fan Zhang [Thu, 16 Nov 2017 01:36:10 +0000 (01:36 +0000)]
Merge "Catch exception when checking WifiDisplay availability" am:
7a08901d1b
am:
6d5e7bf41f
Change-Id: I8e1453bdd39ce220381a3368846bb137c4878dd4
Fan Zhang [Thu, 16 Nov 2017 01:33:31 +0000 (01:33 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
am:
7a08901d1b
Change-Id: I426208a605e3771238bd91c135e47faf1b559e58
Treehugger Robot [Thu, 16 Nov 2017 01:27:57 +0000 (01:27 +0000)]
Merge "Catch exception when checking WifiDisplay availability"
jeffreyhuang [Wed, 15 Nov 2017 22:23:44 +0000 (14:23 -0800)]
Dynamic advanced button for about phone v2
- Set the number of tiles for the advanced button based on the device's
sim count
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I86a5e95476eb93a94607e8c379b132a80a5a1fc5
jeffreyhuang [Wed, 15 Nov 2017 23:35:53 +0000 (15:35 -0800)]
Add search to phone number preference
- implement preference controller mixin
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I907420e49c710427c4cd3ad6fccb2f58f99164ea
jeffreyhuang [Wed, 15 Nov 2017 23:28:23 +0000 (15:28 -0800)]
Additional search terms for about phone v2
Bug:
36458278
Test: make RunSettingsRoboTests -j40
Change-Id: I07172133aa61a36c8c499237d4acaa6a2f392ba0
Fan Zhang [Thu, 19 Oct 2017 23:49:21 +0000 (16:49 -0700)]
Catch exception when checking WifiDisplay availability
Change-Id: Ic2f17905babf43e92a825b8b5b4f8aac7d8ff001
Fixes:
68013053
Test: robotests
TreeHugger Robot [Wed, 15 Nov 2017 23:06:00 +0000 (23:06 +0000)]
Merge "Add control to save button."
Fan Zhang [Wed, 15 Nov 2017 22:40:31 +0000 (22:40 +0000)]
Merge "Misc fixes"
TreeHugger Robot [Wed, 15 Nov 2017 21:59:47 +0000 (21:59 +0000)]
Merge "Added zen settings messages and calls preferences."
Bruno Martins [Wed, 15 Nov 2017 21:59:25 +0000 (21:59 +0000)]
Merge "Settings: Add notification channel for SIM selection" am:
c543d5ba26 am:
7431ad3a80
am:
440373dbde
Change-Id: I605e13adb0e050ee73e646fa13c62f88271271b6
Bruno Martins [Wed, 15 Nov 2017 21:56:18 +0000 (21:56 +0000)]
Merge "Settings: Add notification channel for SIM selection" am:
c543d5ba26
am:
7431ad3a80
Change-Id: Ic3241dfe4bc53a1206fb92a1a5c8f0b91cedfca0
Bruno Martins [Wed, 15 Nov 2017 21:54:16 +0000 (21:54 +0000)]
Merge "Settings: Add notification channel for SIM selection"
am:
c543d5ba26
Change-Id: I72ac5944b8b4dc3eb2ad38c89ec8eb12f83b019d
Treehugger Robot [Wed, 15 Nov 2017 21:45:41 +0000 (21:45 +0000)]
Merge "Settings: Add notification channel for SIM selection"
jackqdyulei [Thu, 9 Nov 2017 18:37:46 +0000 (10:37 -0800)]
Add control to save button.
If the mode is PRIVATE_DNS_MODE_PROVIDER_HOSTNAME and hostname is
invalid, we should disable the save button. Otherwise enable the
save button.
Bug:
68030013
Test: RunSettingsRoboTests
Change-Id: If9149c119f1b396a7057590d515b62e7c19b9f99
Tony Mantler [Wed, 15 Nov 2017 19:19:40 +0000 (11:19 -0800)]
Copy proguard rules needed for Lifecycle support
Bug:
69350851
Test: Manual, sadly
Change-Id: Ice2b2697ec269e3ed0d3ca81940948189357cefb
Jeffrey Huang [Wed, 15 Nov 2017 18:01:07 +0000 (18:01 +0000)]
Merge "Speed up dev options"
Jeffrey Huang [Wed, 15 Nov 2017 18:00:39 +0000 (18:00 +0000)]
Merge changes Ibf5dc65b,I0cea3f76,I0dda78b4
* changes:
Phone number in about phone v2
Dynamic preferences for sim status
Dynamic preferences for IMEI
Bill Yi [Wed, 15 Nov 2017 03:46:04 +0000 (03:46 +0000)]
Import translations. DO NOT MERGE am:
fbdea47c44 -s ours am:
8b334cb99a -s ours
am:
ecb8315ba4 -s ours
Change-Id: Id12b28467cacd51ac8c899a32971881ca7c4e007
Bill Yi [Wed, 15 Nov 2017 03:45:30 +0000 (03:45 +0000)]
Import translations. DO NOT MERGE am:
cc5fd487eb -s ours
am:
105f962faa -s ours
Change-Id: I2e67faa4152814ad92f41c710ef80a51f429c52a
TreeHugger Robot [Wed, 15 Nov 2017 03:43:24 +0000 (03:43 +0000)]
Merge "Send context object to FeatureFlagUtils."
Bill Yi [Wed, 15 Nov 2017 03:40:05 +0000 (03:40 +0000)]
Import translations. DO NOT MERGE am:
fbdea47c44 -s ours
am:
8b334cb99a -s ours
Change-Id: I62efe62a723ec05fac73635f10b4c54bfaea7961
Bill Yi [Wed, 15 Nov 2017 03:39:22 +0000 (03:39 +0000)]
Import translations. DO NOT MERGE
am:
cc5fd487eb -s ours
Change-Id: I743524b8dce39e4245389fc6c933f0a9578aaac1
OSDN Git Service
