tmfang
6e16b69887
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
2018-10-17 05:14:46 +08:00
Neil Fuller
1bd1e69f3c
Merge "Remove dependency on libcore internal annotation"
2018-10-16 20:41:32 +00:00
Fan Zhang
cff03505bb
Merge "Use DayNight theme in factory reset page"
2018-10-16 18:08:56 +00:00
Stanley Tng
b402a56fec
[automerger skipped] resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
...
am: 0cc7d9a2af
2018-10-16 10:09:09 -07:00
Stanley Tng
0cc7d9a2af
resolve merge conflicts of a8af2d3664 to pi-dev-plus-aosp
...
Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie95fe77f761197dee450e86bc0f7edba8d514959
Merged-In: I16b51d7feabc914219c24731eb39a23bd1782571
2018-10-16 15:31:00 +00:00
Neil Fuller
cf61df33b0
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
2018-10-16 15:51:21 +01:00
Raff Tsai
2493587202
Use DayNight theme in factory reset page
...
Change-Id: I3cc75a34aaec71c97d1dd83eaf40232de1fd4168
Fixes: 73738836
Test: Manual
2018-10-16 04:21:15 +00:00
TreeHugger Robot
56aca80681
Merge "Fix ActionDisabledByAdminDialogHelperTest"
2018-10-16 00:54:51 +00:00
Stanley Tng
a8af2d3664
resolve merge conflicts of 019a771d2d to stage-aosp-master
...
Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I2fc36f4ee9a600e7e9c5ce00708736a4d4548358
2018-10-15 17:30:02 -07:00
Bill Yi
f7a0266dcf
[automerger skipped] Import translations. DO NOT MERGE am: 2a1a5cba81 -s ours
...
am: dce00f9ae2
2018-10-15 16:50:36 -07:00
Bill Yi
dce00f9ae2
[automerger skipped] Import translations. DO NOT MERGE
...
am: 2a1a5cba81
2018-10-15 16:27:31 -07:00
Doris Ling
87df629dbb
Merge "Get app info with correct user id."
2018-10-15 23:23:23 +00:00
Treehugger Robot
019a771d2d
Merge "Add Feature Flag for Hearing Aid Profile"
2018-10-15 23:10:41 +00:00
Philip P. Moltmann
098d3a79fd
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
2018-10-15 14:30:34 -07:00
TreeHugger Robot
0d0eec6d4e
Merge "Refactor CdmaSystemSelectListPreference"
2018-10-15 20:08:31 +00:00
Bill Yi
2a1a5cba81
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I44be933d470fa7dad8e60b4ecb3dc038ff74c702
2018-10-15 12:34:57 -07:00
Youming Ye
792e6afc84
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a am: 8bac59265e
...
am: 6293483fce
2018-10-15 11:41:46 -07:00
Youming Ye
6293483fce
Merge "Fix error message shown when SIM PIN enable/disable fails" am: f29392303a
...
am: 8bac59265e
2018-10-15 10:59:04 -07:00
Youming Ye
8bac59265e
Merge "Fix error message shown when SIM PIN enable/disable fails"
...
am: f29392303a
2018-10-15 10:42:52 -07:00
Philip P. Moltmann
1d95218e49
Merge "Use renamed restricted icon size config-value"
2018-10-15 17:16:55 +00:00
Youming Ye
f29392303a
Merge "Fix error message shown when SIM PIN enable/disable fails"
2018-10-15 17:08:22 +00:00
Philip P. Moltmann
b9a83d584d
Merge "Use SYSTEM_... window manager flags"
2018-10-15 16:28:39 +00:00
TreeHugger Robot
a9edb644a6
Merge "Filter out the connected device in "Available devices" screen(1/2)"
2018-10-15 12:44:38 +00:00
Bill Yi
0831a838c4
[automerger skipped] Import translations. DO NOT MERGE am: ebb0bbe3f7 -s ours
...
am: 31398ce165
2018-10-15 03:53:37 -07:00
Bill Yi
31398ce165
[automerger skipped] Import translations. DO NOT MERGE
...
am: ebb0bbe3f7
2018-10-15 03:42:41 -07:00
Bill Yi
ebb0bbe3f7
Import translations. DO NOT MERGE
...
Change-Id: Id3ba67104115b2148f36fb26a94957ee6ac4a89d
Auto-generated-cl: translation import
2018-10-15 01:55:17 -07:00
Ash_Chen
42f3dfe672
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
2018-10-15 10:54:46 +08:00
Stanley Tng
a4fc23140a
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 068c2547f6
2018-10-13 16:21:15 -07:00
Brad Ebinger
d69be7df8d
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6 am: 59eb9e9d90
...
am: be94f07e8d
2018-10-12 16:13:58 -07:00
Brad Ebinger
be94f07e8d
Merge "RadioInfo: Disable ims provisioning switches in USER-build" am: 61c5a296e6
...
am: 59eb9e9d90
2018-10-12 16:07:09 -07:00
Brad Ebinger
59eb9e9d90
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
...
am: 61c5a296e6
2018-10-12 16:03:02 -07:00
Brad Ebinger
61c5a296e6
Merge "RadioInfo: Disable ims provisioning switches in USER-build"
2018-10-12 22:46:21 +00:00
Takamasa Kuramitsu
ec01e260fb
Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908 am: d77dfa200e
...
am: 7cb8223ce2
2018-10-12 14:21:52 -07:00
Takamasa Kuramitsu
7cb8223ce2
Merge "Move content later button doesn't work on Migration Wizard" am: 1308b56908
...
am: d77dfa200e
2018-10-12 14:14:33 -07:00
Takamasa Kuramitsu
d77dfa200e
Merge "Move content later button doesn't work on Migration Wizard"
...
am: 1308b56908
2018-10-12 14:07:25 -07:00
Treehugger Robot
1308b56908
Merge "Move content later button doesn't work on Migration Wizard"
2018-10-12 20:52:31 +00:00
jackqdyulei
b820483fad
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
2018-10-12 10:11:58 -07:00
Mill Chen
2559f02d68
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
2018-10-12 21:54:02 +08:00
Neil Fuller
5331355163
Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3 am: 6767ce9d24
...
am: 92982f7167
2018-10-12 03:42:13 -07:00
Neil Fuller
92982f7167
Merge "Remove explicit dependency on bouncycastle" am: ed21203ea3
...
am: 6767ce9d24
2018-10-12 03:36:17 -07:00
Neil Fuller
6767ce9d24
Merge "Remove explicit dependency on bouncycastle"
...
am: ed21203ea3
2018-10-12 03:31:10 -07:00
Neil Fuller
ed21203ea3
Merge "Remove explicit dependency on bouncycastle"
2018-10-12 10:18:22 +00:00
TreeHugger Robot
ddd70cdbf6
Merge "Disable sliceView scrolling in the homepage."
2018-10-12 05:05:03 +00:00
TreeHugger Robot
a687b5d28d
Merge "Proceed to "finish" page upon completing enrollment"
2018-10-12 03:56:26 +00:00
Emily Chuang
e7a6d1ca1e
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
2018-10-12 10:16:51 +08:00
Kevin Chyn
b0d9b8403a
Proceed to "finish" page upon completing enrollment
...
Bug: 111548037
Test: manual
Change-Id: I1c0c5cc0eb2d1808221465c5eeba92e59b2cd572
2018-10-11 18:26:37 -07:00
Doris Ling
b9ff5892ca
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
2018-10-11 16:47:03 -07:00
Lei Yu
6773c7efcb
Merge "Change packagename to telephony"
2018-10-11 22:32:31 +00:00
TreeHugger Robot
bf7d0eb156
Merge "Fix crash on KeyboardLayoutDialogFragment"
2018-10-11 20:31:44 +00:00
Philip P. Moltmann
92f3a8afe3
Use renamed restricted icon size config-value
...
Bug: 116797641
Test: Built
Change-Id: I913d7fece475e19969f9d932c0992242308bb02f
2018-10-11 12:42:26 -07:00
