OSDN Git Service
Hall Liu [Thu, 18 Oct 2018 22:54:56 +0000 (15:54 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon" am:
558535f3f2 am:
e419904aa0
am:
322091c7eb
Change-Id: I356e58af3dfe50a59ffc70b096ece86ece7c5d66
Hall Liu [Thu, 18 Oct 2018 22:31:05 +0000 (15:31 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon" am:
558535f3f2
am:
e419904aa0
Change-Id: I63428a32d201aa7260cc4aa96ad229e5bd83cf16
Hall Liu [Thu, 18 Oct 2018 21:56:56 +0000 (14:56 -0700)]
Merge "Start using CarrierConfig for 4G/LTE icon"
am:
558535f3f2
Change-Id: I9bb6a91c0c3a79f4b3fae4d50c431e0286b8c06f
Hall Liu [Thu, 18 Oct 2018 20:36:06 +0000 (20:36 +0000)]
Merge "Start using CarrierConfig for 4G/LTE icon"
TreeHugger Robot [Thu, 18 Oct 2018 16:31:52 +0000 (16:31 +0000)]
Merge "Give SliceView a height to support four rows and show more button."
Fan Zhang [Thu, 18 Oct 2018 16:26:11 +0000 (16:26 +0000)]
Merge "Added the EmergencyInfoSlice for ContextualHomepage"
Lei Yu [Thu, 18 Oct 2018 06:34:22 +0000 (06:34 +0000)]
Merge "Refactor PreferredNetworkModePreference"
Sunny Shao [Mon, 15 Oct 2018 11:41:10 +0000 (19:41 +0800)]
Added the EmergencyInfoSlice for ContextualHomepage
- Generated a simple EmergencyInfo slice with fixed string in title and summary.
- Moved hardcode string into strings.xml
- Modified the contentProviderCall_returnCorrectSize test case for general version
Bug:
114793520
Test: compile and manual test
Change-Id: Ia3444c61b0f7e4c04794fe3590dc0731885cf062
jackqdyulei [Tue, 16 Oct 2018 21:20:46 +0000 (14:20 -0700)]
Refactor PreferredNetworkModePreference
Create preference controller for it.
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I456b0b954f47a6fb4c03926049b0579fd6488969
TreeHugger Robot [Thu, 18 Oct 2018 03:52:28 +0000 (03:52 +0000)]
Merge "Updated misc in Contextual Settings Homepage"
TreeHugger Robot [Thu, 18 Oct 2018 03:22:32 +0000 (03:22 +0000)]
Merge "Fix nav-up button in main settings activity."
Mill Chen [Wed, 17 Oct 2018 14:46:54 +0000 (22:46 +0800)]
Updated misc in Contextual Settings Homepage
- Set static cards with full width and removed packageName from setName
method.
- Removed Storage card from createStaticCards method because it does not
belong to default category.
- Changed the parameter type of setSliceUri from String to Uri in ContextualCard.
- Added StorageSlice and DeviceInfoSlice to the contextual card
provider.
- Fixed test cases related to these changes.
bug:
117874766
Test: robotest
Change-Id: Ic2dca353f85d0b6191ab19882dd8c5cb9c6cc658
Stanley Tng [Thu, 18 Oct 2018 01:40:55 +0000 (18:40 -0700)]
[automerger skipped] resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master am:
81edd9a286 -s ours
am:
0a6d538879 -s ours
Change-Id: Iadd528089b68ff6622ce510132f9583b19f9152b
Stanley Tng [Thu, 18 Oct 2018 01:23:18 +0000 (18:23 -0700)]
[automerger skipped] resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
am:
81edd9a286 -s ours
Change-Id: I5d08af8af8e4056f49d8006f454c347f64ef643c
Lei Yu [Thu, 18 Oct 2018 00:44:47 +0000 (00:44 +0000)]
Merge "Refactor roaming preference"
Fan Zhang [Wed, 17 Oct 2018 23:27:41 +0000 (16:27 -0700)]
Fix nav-up button in main settings activity.
It should be a non-clickable search icon, not back button. Apparently
the init code must be executed after setActionBar.
Change-Id: Ibbc8aefeebc44562c6105cb51e6f6447a9705ff9
Fixes:
117797520
Test: manual
TreeHugger Robot [Wed, 17 Oct 2018 20:38:14 +0000 (20:38 +0000)]
Merge "Fix visible problem on status bar"
TreeHugger Robot [Wed, 17 Oct 2018 20:20:08 +0000 (20:20 +0000)]
Merge "Update toolbar for mobile network settings"
jackqdyulei [Tue, 16 Oct 2018 00:31:16 +0000 (17:31 -0700)]
Refactor roaming preference
Use preferenceController instead
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: Idb0276ea0ed1738d93223e072338ba3c32498a9d
TreeHugger Robot [Wed, 17 Oct 2018 18:38:45 +0000 (18:38 +0000)]
Merge "Sync style of filter component in data usage"
Stanley Tng [Wed, 17 Oct 2018 18:07:29 +0000 (11:07 -0700)]
resolve merge conflicts of
b0e99e147253df35932c8c7c15911d091a07dda1 to stage-aosp-master
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ife619e714d451b6cb77bfaf50e3f45c969d37cb4
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
TreeHugger Robot [Wed, 17 Oct 2018 17:28:22 +0000 (17:28 +0000)]
Merge "Fix InstantiationException on fragment"
jackqdyulei [Thu, 11 Oct 2018 00:43:06 +0000 (17:43 -0700)]
Update toolbar for mobile network settings
Bug:
114749736
Test: Manual
Change-Id: I9b01df83215ca6974b096060fa8d6669307c96e1
Eran Messeri [Wed, 17 Oct 2018 16:59:57 +0000 (16:59 +0000)]
Merge "Private DNS: Extract host verification code"
tmfang [Tue, 16 Oct 2018 16:59:06 +0000 (00:59 +0800)]
Fix visible problem on status bar
Battery Icon is not displayed on "Vision settings" screen
Test: visual
Change-Id: I272302af5b6e7309318c04b891d20526f68c5b0d
Fixes:
117751096
Emily Chuang [Wed, 17 Oct 2018 12:50:20 +0000 (20:50 +0800)]
Give SliceView a height to support four rows and show more button.
The default height of sliceView with MODE_LARGE is 240dp which supports
three rows(including the header) above "show more" button. Since WIFI
and Connected devices use cases require four rows + show more button, we
need to expand the height to fulfill it.
Bug:
117868297
Test: visual
Change-Id: I13b29c3f859d1c117c680432f9a6ad8e71c6acf5
Raff Tsai [Wed, 17 Oct 2018 10:02:40 +0000 (10:02 +0000)]
Merge "Use the same layout style for contextual cards"
TreeHugger Robot [Wed, 17 Oct 2018 08:36:55 +0000 (08:36 +0000)]
Merge "Consider Private DNS user restriction"
Bill Yi [Wed, 17 Oct 2018 06:29:32 +0000 (23:29 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
f896493c70 -s ours
am:
8744027668 -s ours
Change-Id: Ic42f563ca5bf56c2b35a3a90c27fbaa2ed7c32b7
Bill Yi [Wed, 17 Oct 2018 06:24:58 +0000 (23:24 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
f896493c70 -s ours
Change-Id: I4d93781a7e2f2d20b1d0e25338af6e24f1b5a448
Treehugger Robot [Wed, 17 Oct 2018 04:48:36 +0000 (04:48 +0000)]
Merge "Fix Connect State message in Device details for Hearing Aids"
Bill Yi [Wed, 17 Oct 2018 04:28:11 +0000 (21:28 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
117801752
Change-Id: I43766c0d85af44370fa136fb4b54869ccfb9bdb4
Lei Yu [Wed, 17 Oct 2018 02:56:39 +0000 (02:56 +0000)]
Merge changes I7a0845c0,I45ecbc86,I3d0203b7,I7cfc27ff
* changes:
Refactor DataUsagePreference
Refactor carrier settings
Refactor CdmaApnPreference
Refactor CdmaSubscriptionListPreference
TreeHugger Robot [Wed, 17 Oct 2018 00:26:37 +0000 (00:26 +0000)]
Merge "Also all EXTRA_USER as input for ACTION_SHOW_ADMIN_SUPPORT_DETAILS"
jackqdyulei [Mon, 15 Oct 2018 20:35:24 +0000 (13:35 -0700)]
Refactor DataUsagePreference
Move the logic to PreferenceController
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I7a0845c0cbc3f33e23257831d0d4ed97e7a5cc04
jackqdyulei [Fri, 12 Oct 2018 20:50:28 +0000 (13:50 -0700)]
Refactor carrier settings
Only show it when:
1. It is in CDMA or GSM mode
2. CarrierConfig tell settings to show it
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I45ecbc86c793ebec602142be208058e2043a2ba7
jackqdyulei [Thu, 11 Oct 2018 23:54:14 +0000 (16:54 -0700)]
Refactor CdmaApnPreference
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I3d0203b7b5fb732e2814fb741761af4371924e9a
jackqdyulei [Thu, 11 Oct 2018 22:01:23 +0000 (15:01 -0700)]
Refactor CdmaSubscriptionListPreference
Extract CdmaBasePreferenceController that can be shared by all CDMA
PreferenceController. Also create new subscription controller to use
it.
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I7cfc27ffd0704d09dc02e49fbf5641ff8b90642d
Fan Zhang [Tue, 16 Oct 2018 21:42:05 +0000 (21:42 +0000)]
Merge "Remove second_button from condition tile. It's never used."
tmfang [Thu, 11 Oct 2018 08:20:15 +0000 (16:20 +0800)]
Sync style of filter component in data usage
Settings have new filter component with settings style.
This CL replaced Spinner to SettingsSpinner in data usage page.
Change-Id: I212b6b6ed203f8bffd094c0180873060b93c39cb
Fixes:
117568930
Test: robotests, visual
Neil Fuller [Tue, 16 Oct 2018 20:41:32 +0000 (20:41 +0000)]
Merge "Remove dependency on libcore internal annotation"
tmfang [Fri, 5 Oct 2018 10:45:07 +0000 (18:45 +0800)]
Fix InstantiationException on fragment
Since we overrided the empty constructor,
it can't find a empty constructor when
Fragment tries to instantiate a fragment
in framework.
So, we can't override this constructor,
and then just use newInstance() to initialize
and setup a new Fragment.
Test: robotest
Change-Id: Ifcd1c1771bc69d947caeee5c5bc055c4f94365c2
Fixes:
115676209
Fan Zhang [Tue, 16 Oct 2018 19:12:21 +0000 (12:12 -0700)]
Remove second_button from condition tile. It's never used.
Change-Id: I69e50d3b777d36731eee024a437facdab67e7ffa
Fixes:
117823082
Test: visual
Fan Zhang [Tue, 16 Oct 2018 18:08:56 +0000 (18:08 +0000)]
Merge "Use DayNight theme in factory reset page"
Stanley Tng [Tue, 16 Oct 2018 17:09:09 +0000 (10:09 -0700)]
[automerger skipped] resolve merge conflicts of
a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus-aosp
am:
0cc7d9a2af -s ours
Change-Id: I3e982eed82df2491208d560cf4671db308674299
Stanley Tng [Tue, 16 Oct 2018 04:56:50 +0000 (21:56 -0700)]
resolve merge conflicts of
a8af2d3664eab2eae6f670ef0fb79969010c34c3 to pi-dev-plus-aosp
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
Neil Fuller [Tue, 16 Oct 2018 14:51:21 +0000 (15:51 +0100)]
Remove dependency on libcore internal annotation
Remove dependency on libcore internal annotation -
the standard Android one should do.
Bug:
113148576
Test: build only
Change-Id: I067679b042d0698a4cc4afddc469dbcf68fce143
Raff Tsai [Tue, 16 Oct 2018 13:47:58 +0000 (21:47 +0800)]
Use the same layout style for contextual cards
Test: manual
Change-Id: I41d86df5147290a17ef698f4f6a192081d1e0742
Raff Tsai [Tue, 16 Oct 2018 00:03:08 +0000 (08:03 +0800)]
Use DayNight theme in factory reset page
Change-Id: I3cc75a34aaec71c97d1dd83eaf40232de1fd4168
Fixes:
73738836
Test: Manual
TreeHugger Robot [Tue, 16 Oct 2018 00:54:51 +0000 (00:54 +0000)]
Merge "Fix ActionDisabledByAdminDialogHelperTest"
Stanley Tng [Tue, 16 Oct 2018 00:30:02 +0000 (17:30 -0700)]
resolve merge conflicts of
019a771d2d8b9bec19ae81042097e633d6110ead to stage-aosp-master
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
Bill Yi [Mon, 15 Oct 2018 23:50:36 +0000 (16:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
2a1a5cba81 -s ours
am:
dce00f9ae2 -s ours
Change-Id: I95de88756d3a50478a74f2d55acb2e4260fd626d
Bill Yi [Mon, 15 Oct 2018 23:27:31 +0000 (16:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
2a1a5cba81 -s ours
Change-Id: I79a8495fa76bbcb9dcee9e66a48ff4c3875f454d
Doris Ling [Mon, 15 Oct 2018 23:23:23 +0000 (23:23 +0000)]
Merge "Get app info with correct user id."
Treehugger Robot [Mon, 15 Oct 2018 23:10:41 +0000 (23:10 +0000)]
Merge "Add Feature Flag for Hearing Aid Profile"
Stanley Tng [Mon, 1 Oct 2018 05:47:22 +0000 (22:47 -0700)]
Fix Connect State message in Device details for Hearing Aids
In the Device details of Settings App and when using two Hearing Aids
devices (left and right sides), this will fix the connect state messages
for these two devices. Also added Robo tests for the changes.
Test: Manual tests and also ran RunSettingsLibRoboTests and RunSettingsRoboTests.
Bug:
117074814
Bug:
116725094
Change-Id: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Merged-In: I0b1a170967ddcce7f388603fd521f6ed1eeba30b
Merged-In: I169cda4a1658b0a67cc7c7367b38d57a021e6953
Philip P. Moltmann [Mon, 15 Oct 2018 21:30:34 +0000 (14:30 -0700)]
Fix ActionDisabledByAdminDialogHelperTest
- Revert user handling in setAdminSupportDetails to before my changes.
- Implement getUserProfiles in Settings-shadows as the the
Settings-shadows do not forwarded to profiles the robolectric-default
shadows
Test: make RunSettingsRoboTests
Change-Id: Idfd4722fe55a17c57d336db943904eb1aeb6e7ce
Eran Messeri [Wed, 3 Oct 2018 16:05:48 +0000 (17:05 +0100)]
Consider Private DNS user restriction
As a new user restriction, to disallow changing Private DNS settings, was
added, make the Private DNS mode dialog preference consider whether to
let the user modify it or not based on the presence of this restriction.
Bug:
112982691
Test: atest com.android.cts.devicepolicy.DeviceOwnerTest#testPrivateDnsPolicy
Test: m -j RunSettingsRoboTests ROBOTEST_FILTER=PrivateDnsPreferenceControllerTest
Test: Manual, using TestDPC
Change-Id: If815860ace3aadf6f79fd23173f0a2c80a29f0e1
TreeHugger Robot [Mon, 15 Oct 2018 20:08:31 +0000 (20:08 +0000)]
Merge "Refactor CdmaSystemSelectListPreference"
Bill Yi [Mon, 15 Oct 2018 19:34:57 +0000 (12:34 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
Youming Ye [Mon, 15 Oct 2018 18:41:46 +0000 (11:41 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails" am:
f29392303a am:
8bac59265e
am:
6293483fce
Change-Id: I5b533e911f1185bb9fe1847701e333093b49926e
Youming Ye [Mon, 15 Oct 2018 17:59:04 +0000 (10:59 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails" am:
f29392303a
am:
8bac59265e
Change-Id: If28ef5f32183918404896ed395a49c9c2d87067a
Youming Ye [Mon, 15 Oct 2018 17:42:52 +0000 (10:42 -0700)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
am:
f29392303a
Change-Id: I060d7e0e02b56d9fea5260ba1f2cf8a1ea746414
Philip P. Moltmann [Mon, 15 Oct 2018 17:16:55 +0000 (17:16 +0000)]
Merge "Use renamed restricted icon size config-value"
Youming Ye [Mon, 15 Oct 2018 17:08:22 +0000 (17:08 +0000)]
Merge "Fix error message shown when SIM PIN enable/disable fails"
Philip P. Moltmann [Mon, 15 Oct 2018 16:28:39 +0000 (16:28 +0000)]
Merge "Use SYSTEM_... window manager flags"
TreeHugger Robot [Mon, 15 Oct 2018 12:44:38 +0000 (12:44 +0000)]
Merge "Filter out the connected device in "Available devices" screen(1/2)"
Eran Messeri [Thu, 20 Sep 2018 14:15:57 +0000 (15:15 +0100)]
Private DNS: Extract host verification code
Since Private DNS host may now be set by the admin via the
DevicePolicyManager, extract the verification code to the
ConnectivityManager so it can be used both from Settings and framework
code.
Bug:
112982691
Test: See cts tests.
Change-Id: Ic091e4714f8d3f9f28042bc825cf57c991504f27
Bill Yi [Mon, 15 Oct 2018 10:53:37 +0000 (03:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
ebb0bbe3f7 -s ours
am:
31398ce165 -s ours
Change-Id: Ib10a86be266ca60ed857134d4402ba33cb040c46
Bill Yi [Mon, 15 Oct 2018 10:42:41 +0000 (03:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ebb0bbe3f7 -s ours
Change-Id: I0b288ed9e17d6598d7b20cc724ea88a42309d984
Bill Yi [Mon, 15 Oct 2018 08:55:17 +0000 (01:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
Ash_Chen [Fri, 31 Aug 2018 13:28:57 +0000 (21:28 +0800)]
Filter out the connected device in "Available devices" screen(1/2)
Don't add connected devices under "Available devices"
Bug:
113568981
Test: Bluetooth Pairing Test with some devices and accessories
Change-Id: I2cce35cd5c237ea90cf1c128e951816474c7a658
Stanley Tng [Wed, 20 Jun 2018 22:32:02 +0000 (15:32 -0700)]
Add Feature Flag for Hearing Aid Profile
Using the Settings App-Developer Options-Feature Flag, allow the user to
enable or disable the Hearing Aid Profile.
Bug:
116725094
Bug:
116044083
Test: Manual testing using Settings App
Change-Id: I16b51d7feabc914219c24731eb39a23bd1782571
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
(cherry picked from commit
068c2547f6f877273b09bf3ace5b4a4b61c7647a)
Brad Ebinger [Fri, 12 Oct 2018 23:13:58 +0000 (16:13 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am:
61c5a296e6 am:
59eb9e9d90
am:
be94f07e8d
Change-Id: I7c7277c9108afda3809415bc174baa7939fedac8
Brad Ebinger [Fri, 12 Oct 2018 23:07:09 +0000 (16:07 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am:
61c5a296e6
am:
59eb9e9d90
Change-Id: Ia0f24f55c529b166cfcd2bba4ca7af85d2e70759
Brad Ebinger [Fri, 12 Oct 2018 23:03:02 +0000 (16:03 -0700)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
am:
61c5a296e6
Change-Id: I3211ffb7e25af0e60ac20175bf86466ee4c85998
Brad Ebinger [Fri, 12 Oct 2018 22:46:21 +0000 (22:46 +0000)]
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:21:52 +0000 (14:21 -0700)]
Merge "Move content later button doesn't work on Migration Wizard" am:
1308b56908 am:
d77dfa200e
am:
7cb8223ce2
Change-Id: I18c7e985c8a1f5e3f4cbc0cdeb980aee9464218d
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:14:33 +0000 (14:14 -0700)]
Merge "Move content later button doesn't work on Migration Wizard" am:
1308b56908
am:
d77dfa200e
Change-Id: I88e0b556594e5bdadf3c12d0c1fd0483f928261a
Takamasa Kuramitsu [Fri, 12 Oct 2018 21:07:25 +0000 (14:07 -0700)]
Merge "Move content later button doesn't work on Migration Wizard"
am:
1308b56908
Change-Id: I210eb94a69ce434c5b838dedbf90a937e92e71e9
Treehugger Robot [Fri, 12 Oct 2018 20:52:31 +0000 (20:52 +0000)]
Merge "Move content later button doesn't work on Migration Wizard"
jackqdyulei [Tue, 9 Oct 2018 23:08:44 +0000 (16:08 -0700)]
Refactor CdmaSystemSelectListPreference
Most logic is copied from previous ListPreference however
1. Create PreferenceController for it
2. Extract API to check whether to display CMDA options
3. In controller, provide API to force display dialog
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: Ic40d2ac1dc1854df9c90d912ea9fc822531b413d
Mill Chen [Fri, 12 Oct 2018 13:39:04 +0000 (21:39 +0800)]
Clean up unnecessary spy context statements
Remove spy context syntax because we do not need to
mock context anymore in the test cases.
Bug:
117644158
Test: robotests
Change-Id: I222eec4fbc1994d7bb79adead40b76ac0a000bdc
Neil Fuller [Fri, 12 Oct 2018 10:42:13 +0000 (03:42 -0700)]
Merge "Remove explicit dependency on bouncycastle" am:
ed21203ea3 am:
6767ce9d24
am:
92982f7167
Change-Id: Iad9b91446823430cb28dd3447819c6b16f7f6b42
Neil Fuller [Fri, 12 Oct 2018 10:36:17 +0000 (03:36 -0700)]
Merge "Remove explicit dependency on bouncycastle" am:
ed21203ea3
am:
6767ce9d24
Change-Id: Ia431a5b7ca139209425825616f698f69bfb781c5
Neil Fuller [Fri, 12 Oct 2018 10:31:10 +0000 (03:31 -0700)]
Merge "Remove explicit dependency on bouncycastle"
am:
ed21203ea3
Change-Id: Iff190e6a70b85b927597a5b82ff28eaf63070450
Neil Fuller [Fri, 12 Oct 2018 10:18:22 +0000 (10:18 +0000)]
Merge "Remove explicit dependency on bouncycastle"
TreeHugger Robot [Fri, 12 Oct 2018 05:05:03 +0000 (05:05 +0000)]
Merge "Disable sliceView scrolling in the homepage."
TreeHugger Robot [Fri, 12 Oct 2018 03:56:26 +0000 (03:56 +0000)]
Merge "Proceed to "finish" page upon completing enrollment"
Emily Chuang [Thu, 11 Oct 2018 10:23:45 +0000 (18:23 +0800)]
Disable sliceView scrolling in the homepage.
Set isScrollable() to false so as to have the "see more" option.
Fixes:
117626982
Test: robotest
Change-Id: Ie0b8a207fb0c1eff41a98cc897e5f8cf29ccce0a
Kevin Chyn [Fri, 12 Oct 2018 01:26:37 +0000 (18:26 -0700)]
Proceed to "finish" page upon completing enrollment
Bug:
111548037
Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572
Doris Ling [Thu, 11 Oct 2018 23:37:32 +0000 (16:37 -0700)]
Get app info with correct user id.
- when querying app info from package manager, we should use the methods
that takes the user id so that it will work properly with managed
profile.
Change-Id: Ifc84d3a29aaf7b2c1acfa096596a53f1715cc908
Fixes:
117222623
Test: make RunSettingsRoboTests
Lei Yu [Thu, 11 Oct 2018 22:32:31 +0000 (22:32 +0000)]
Merge "Change packagename to telephony"
TreeHugger Robot [Thu, 11 Oct 2018 20:31:44 +0000 (20:31 +0000)]
Merge "Fix crash on KeyboardLayoutDialogFragment"
Philip P. Moltmann [Thu, 11 Oct 2018 19:42:26 +0000 (12:42 -0700)]
Use renamed restricted icon size config-value
Bug:
116797641
Test: Built
Change-Id: I913d7fece475e19969f9d932c0992242308bb02f
jackqdyulei [Thu, 11 Oct 2018 18:13:26 +0000 (11:13 -0700)]
Change packagename to telephony
Also move it under package network, so all of them belong to
com.android.settings.network.telephony.
Bug:
114749736
Test: RunSettingsRoboTests
Change-Id: I35dbdcd5cc9dab939b0a3efccc8897b9a92338d1
tmfang [Thu, 11 Oct 2018 10:26:37 +0000 (18:26 +0800)]
Fix crash on KeyboardLayoutDialogFragment
Since view id changed after fragment migration,
we correct view id.
Change-Id: If81ca06423ac62fd9f6a118be0b5fe3c93356142
Fixes:
117559309
Test: robotest
TreeHugger Robot [Thu, 11 Oct 2018 16:46:17 +0000 (16:46 +0000)]
Merge "Fix problem on filter widget in memory page"
Neil Fuller [Tue, 2 Oct 2018 20:37:30 +0000 (21:37 +0100)]
Remove explicit dependency on bouncycastle
The dependency is unnecessary once bouncycastle
is included in the "standard libraries".
Test: build
Bug:
113148576
Change-Id: I057bb0e277220389db3c77b1035044d93f35432a
tmfang [Thu, 11 Oct 2018 05:41:53 +0000 (13:41 +0800)]
Fix problem on filter widget in memory page
We need to use SettingsSpinnerAdapater
with settings style item.
Test: visual
Bug:
117568930
Change-Id: Ia60b7d08c11a270e029e6b673a12d838f454eccf
Fixes:
117541499