OSDN Git Service
Yueming Wang [Tue, 11 Dec 2018 00:40:10 +0000 (00:40 +0000)]
Merge "Add Cross profile calendar Settings UI."
Philip P. Moltmann [Mon, 10 Dec 2018 20:51:31 +0000 (20:51 +0000)]
Merge "RuntimePermissionPresenter was moved"
yuemingw [Wed, 24 Oct 2018 12:02:05 +0000 (13:02 +0100)]
Add Cross profile calendar Settings UI.
Bug:
117976974
Test: make ROBOTEST_FILTER=CrossProfileCalendarPreferenceControllerTest -j40 RunSettingsRoboTests
Change-Id: Ieb4dcfb8091e2c63f4372af220695297c7bb116d
TreeHugger Robot [Mon, 10 Dec 2018 18:56:40 +0000 (18:56 +0000)]
Merge "IMM#showInputMethodPickerFromSystem for supporting multi-display."
TreeHugger Robot [Mon, 10 Dec 2018 18:20:09 +0000 (18:20 +0000)]
Merge "Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric""
Fan Zhang [Mon, 10 Dec 2018 18:11:14 +0000 (18:11 +0000)]
Merge "Add a loading text when waiting for wifitracker results"
Yanting Yang [Fri, 7 Dec 2018 12:47:49 +0000 (20:47 +0800)]
Rename ConnectedDeviceSlice to BluetoothDevicesSlice
Bug:
120029006
Test: robotests
Change-Id: I7e39f52a87ebd017bf0635cd5a76945b39eee6fc
Anthony Stange [Mon, 10 Dec 2018 10:15:01 +0000 (02:15 -0800)]
[automerger skipped] Merge "Revert "Schematize vold system properties"" am:
94ef16b6e3 am:
a35a0418c1
am:
c7a5a2f39a -s ours
Change-Id: Ia94db75475da21cbcb87b2db615714473192275d
Cn Chen [Mon, 10 Dec 2018 07:05:24 +0000 (07:05 +0000)]
Revert "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"
This reverts commit
0725bea86e6f7d9de80fad4e3d9c3f6fff338e81.
Reason for revert: Settings crash
Bug:
120754151
Change-Id: I52f258f7f12d21b8dd16220ba11e50768d0802ee
TreeHugger Robot [Mon, 10 Dec 2018 02:25:36 +0000 (02:25 +0000)]
Merge "Always save message permission choice"
Cn Chen [Mon, 10 Dec 2018 01:45:28 +0000 (01:45 +0000)]
Merge "migrate new setupcompat and setupdesign to SetupChooseLockGeneric"
Tim Van Patten [Sat, 8 Dec 2018 22:57:34 +0000 (22:57 +0000)]
Merge "Update ANGLE Developer Options"
Yanting Yang [Sat, 8 Dec 2018 15:45:35 +0000 (15:45 +0000)]
Merge "Add pair new device to ConnectedDeviceSlice"
Yanting Yang [Tue, 4 Dec 2018 11:20:32 +0000 (19:20 +0800)]
Add pair new device to ConnectedDeviceSlice
Show "Pair new device" when the number of devices is less than 3.
Bug:
114807655
Test: visual, robotest
Change-Id: Ia8dbff163d758bb077d4960616d1c6538c04aebb
TreeHugger Robot [Sat, 8 Dec 2018 09:32:19 +0000 (09:32 +0000)]
Merge "Update scanning settings to show states in summary"
TreeHugger Robot [Sat, 8 Dec 2018 01:13:24 +0000 (01:13 +0000)]
Merge "Add a helper class for filtering available subscriptions"
TreeHugger Robot [Sat, 8 Dec 2018 00:51:18 +0000 (00:51 +0000)]
Merge "Modified the shadow of the search bar"
Lifu Tang [Thu, 6 Dec 2018 00:06:20 +0000 (16:06 -0800)]
Update scanning settings to show states in summary
Bug:
120220144
Test: build, flash, and test manually
Change-Id: I913d93c2f41e5ffea1d0b9c00d519eba327a0832
Antony Sargent [Fri, 7 Dec 2018 19:17:26 +0000 (11:17 -0800)]
Add a helper class for filtering available subscriptions
In several places implementing the new changes for better UX with
multiple mobile subscriptions, we need a bit of code that filters the
results coming from the SubscriptionManager. This CL adds that common
code in a util class that will be used in later CLs.
Bug:
116349402
Test: RunSettingsRoboTests
Change-Id: Ie9376629604ac2c4a2f15123edc380c5999f2f83
Tim Van Patten [Sat, 10 Nov 2018 00:09:44 +0000 (17:09 -0700)]
Update ANGLE Developer Options
Update ANGLE developer options to allow selecting the OpenGL driver
(default, ANGLE, native) for each app as well as forcing ANGLE for all
apps.
The settings are also being moved from within the Android settings (here)
to the ANGLE APK, so they can be updated more quickly/easily.
Bug:
118384925
Test: Verify the default/ANGLE/native values are saved and applied and
used by the loader.
Change-Id: Ide449704dd703657bd316231987a07becf8699c9
Fan Zhang [Thu, 6 Dec 2018 20:45:43 +0000 (12:45 -0800)]
Add a loading text when waiting for wifitracker results
- When there is no result from background worker, a "scanning" text is
displayed instead of a totally empty card.
- Also cleaned up a few minor coding style issues
Change-Id: I73afdb1dd72e7accb387ad9aa493cfbe00bffe66
Fixes:
120051186
Test: robotests
Sunny Shao [Fri, 7 Dec 2018 07:16:56 +0000 (15:16 +0800)]
Modified the shadow of the search bar
Modified the SearchBarStyle and added cardElevation and
enforceMaterialTheme attributes.
Bug:
118886724
Test: manual
Change-Id: If9f39ee5dcc85d837036391ae92aeedd6aea4ab6
TreeHugger Robot [Fri, 7 Dec 2018 19:24:43 +0000 (19:24 +0000)]
Merge "Don't plot usage data beyond current date."
TreeHugger Robot [Fri, 7 Dec 2018 17:08:19 +0000 (17:08 +0000)]
Merge "Update the strings of conditional card"
TreeHugger Robot [Fri, 7 Dec 2018 17:02:11 +0000 (17:02 +0000)]
Merge "Reload data if slice binding returns null at rendering time."
Anthony Stange [Fri, 7 Dec 2018 12:38:25 +0000 (04:38 -0800)]
Merge "Revert "Schematize vold system properties"" am:
94ef16b6e3
am:
a35a0418c1
Change-Id: I7ca5d4d85897ac4d2d851c05b9f69c986f6a662a
Anthony Stange [Fri, 7 Dec 2018 12:30:15 +0000 (04:30 -0800)]
Merge "Revert "Schematize vold system properties""
am:
94ef16b6e3
Change-Id: If9a59cfa4939e3ef2cdc7c50e0151c33c58b24aa
Anthony Stange [Fri, 7 Dec 2018 12:04:56 +0000 (12:04 +0000)]
Merge "Revert "Schematize vold system properties""
Anthony Stange [Fri, 7 Dec 2018 11:44:10 +0000 (11:44 +0000)]
Revert "Schematize vold system properties"
This reverts commit
e6baedd917e041576c04687cf20d8d56dd2980fc.
Reason for revert: Breaking aosp_master build
Change-Id: I7b171441196326391972cb0b0c45bf11a04f6f1b
Mill Chen [Fri, 7 Dec 2018 08:18:32 +0000 (16:18 +0800)]
Update the strings of conditional card
Bug:
113451905
Test: visual
Change-Id: Ie863855eff5a6a23f28b899809e5216c129fb448
TreeHugger Robot [Fri, 7 Dec 2018 04:11:45 +0000 (04:11 +0000)]
Merge "Log contextual card is visible and homepage is displayed event"
Inseob Kim [Fri, 7 Dec 2018 03:04:50 +0000 (19:04 -0800)]
[automerger skipped] Merge "Schematize vold system properties" am:
8cf17f7234 am:
09a7954114
am:
cd614a097e -s ours
Change-Id: I2ba852d7747964f530d9616c0eabcd25f211ae0b
Inseob Kim [Fri, 7 Dec 2018 02:43:16 +0000 (18:43 -0800)]
Merge "Schematize vold system properties" am:
8cf17f7234
am:
09a7954114
Change-Id: I1a42e00ad024b471bcc51d8e0ef0f50fea34fcbe
Inseob Kim [Fri, 7 Dec 2018 02:14:00 +0000 (18:14 -0800)]
Merge "Schematize vold system properties"
am:
8cf17f7234
Change-Id: I6d9782dfc2cd54f6620c226d37ca3e81dc19647f
TreeHugger Robot [Fri, 7 Dec 2018 02:05:41 +0000 (02:05 +0000)]
Merge "Show reboot dialog when tunring off developer option"
Yi-Ling Chuang [Thu, 6 Dec 2018 14:13:35 +0000 (22:13 +0800)]
Reload data if slice binding returns null at rendering time.
We are not able to guarantee the binding results in the pre-check and
real binding would always be the same sinc slice may decide what it
would be based on some conditions. Hence, we should reload data and
refresh UI when it comes to null to prevent from blank suggestion.
Bug:
120221527
Test: visual
Change-Id: I79790edfe7fc3af7b9c3b3a7df6a7ffa7d405d50
Treehugger Robot [Fri, 7 Dec 2018 01:46:45 +0000 (01:46 +0000)]
Merge "Schematize vold system properties"
Doris Ling [Fri, 7 Dec 2018 01:12:05 +0000 (17:12 -0800)]
Don't plot usage data beyond current date.
- the new data usage api returns buckets for future date with 0 usage.
When we plot the data usage chart, need to check the bucket date to make
sure we only plot points up to the current date.
Change-Id: I50e161ca9cdbb30c8fda8f6cdd24c993b546ad0d
Fixes:
120490567
Test: make RunSettingsRoboTests
Raff Tsai [Wed, 5 Dec 2018 11:13:46 +0000 (19:13 +0800)]
Log contextual card is visible and homepage is displayed event
Bug:
79698338
Test: Robolectric
Change-Id: I89ac5ed2765729d8571e84d3a050f0aa07385caa
Chen Xu [Fri, 7 Dec 2018 00:57:04 +0000 (16:57 -0800)]
[automerger skipped] Merge "address API council feedbacks for Telephony.Carriers" am:
71f9fe4dfa am:
1bf36a6a72
am:
62dc239377 -s ours
Change-Id: I531e7043cb7a385893ede9b27f25f7eabc6bca8a
Chen Xu [Fri, 7 Dec 2018 00:39:36 +0000 (16:39 -0800)]
Merge "address API council feedbacks for Telephony.Carriers" am:
71f9fe4dfa
am:
1bf36a6a72
Change-Id: I9775826417d2df6284bf0273b48c3a9814a01cf4
Chen Xu [Fri, 7 Dec 2018 00:19:11 +0000 (16:19 -0800)]
Merge "address API council feedbacks for Telephony.Carriers"
am:
71f9fe4dfa
Change-Id: I834e4f1fe9457af586a0fe7856c4ab351a4b26a3
TreeHugger Robot [Thu, 6 Dec 2018 23:57:39 +0000 (23:57 +0000)]
Merge "Allow appending static preferences to RadioButtonPickerFragment"
Doris Ling [Thu, 6 Dec 2018 22:39:27 +0000 (22:39 +0000)]
Merge "Add search to app info list."
TreeHugger Robot [Thu, 6 Dec 2018 22:25:48 +0000 (22:25 +0000)]
Merge "Catch error when we fail to get slice icon."
Salvador Martinez [Tue, 4 Dec 2018 22:13:10 +0000 (14:13 -0800)]
Allow appending static preferences to RadioButtonPickerFragment
This makes it so that static preferences can also be added after
the candidates so they can show up on the bottom of the screen.
This is done via a new xml tag for the preference screen that
is usually mostly empty that RaiodButtonPickerFragments use
Test: robotests
Bug:
111450127
Change-Id: I0fe2f480f0ff59b9bf9269e94b33ab4b008b47b8
Chen Xu [Thu, 6 Dec 2018 21:45:47 +0000 (21:45 +0000)]
Merge "address API council feedbacks for Telephony.Carriers"
Fan Zhang [Thu, 6 Dec 2018 20:02:05 +0000 (12:02 -0800)]
Catch error when we fail to get slice icon.
Change-Id: Ia8bdf1ef8a090d2f939abf27b2308eafde7d8928
Fixes:
120588243
Test: robotests
Chen Xu [Thu, 6 Dec 2018 20:11:18 +0000 (20:11 +0000)]
Merge "address API council feedbacks for Telephony.Carriers"
Antony Sargent [Thu, 6 Dec 2018 18:55:42 +0000 (18:55 +0000)]
Merge "Layout changes in v2 Network & internet page"
Fan Zhang [Thu, 6 Dec 2018 17:59:30 +0000 (17:59 +0000)]
Merge "Correct metrics category in ConnectedDeviceSlice"
TreeHugger Robot [Thu, 6 Dec 2018 17:17:17 +0000 (17:17 +0000)]
Merge "Update a11y timeout UI"
Beverly Tai [Thu, 6 Dec 2018 14:09:02 +0000 (14:09 +0000)]
Merge "Update DND strings"
Leon Liao [Thu, 6 Dec 2018 08:39:09 +0000 (16:39 +0800)]
Update a11y timeout UI
Update UI with moving descriptive text to bottom(FooterPreference) and
adding video controller.
Test: atest AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests
Test: atest UniquePreferenceTest
Change-Id: Ib3d4a88aa633539691ea902f6d41ceb55b55caef
TreeHugger Robot [Thu, 6 Dec 2018 11:44:24 +0000 (11:44 +0000)]
Merge "Disable scrollbar of the button in conditional card"
Chienyuan [Thu, 6 Dec 2018 11:19:21 +0000 (19:19 +0800)]
Always save message permission choice
For current design, message sharing option only display when
mapPermisson != CachedBluetoothDevice.ACCESS_UNKNOWN. MAP permisson only
saved when user reject requset twice or accept request, if user just
reject once, permission will be ACCESS_UNKNOWN and message sharing
option will not display. This patch remove the check of
MessageRejectionCount and always save message permission choice.
Bug:
120291728
Test: reject message access request and check device details page
Change-Id: I071491d3c4134ed348e195f054b6557e397cdd6a
Yanting Yang [Thu, 6 Dec 2018 09:56:19 +0000 (09:56 +0000)]
Merge "Fix deep link issue of Slice cards in home page"
TreeHugger Robot [Thu, 6 Dec 2018 09:47:49 +0000 (09:47 +0000)]
Merge "Added FloatingAppBarScrollingViewBehavior"
Chienyuan [Wed, 7 Nov 2018 08:55:24 +0000 (16:55 +0800)]
Show reboot dialog when tunring off developer option
The toggle button "Disable Bluetooth A2DP hardware offload" in developer
options need reboot to take effect when value changed. Otherwise, the
A2DP will not work until user reboot the device.
If we want this toggle button change back to default value when turning
off developer options, we need reboot device as well.
This patch will check the property value of A2DP hardware offload. If
turning off developer options will change the value, show a dialog to
force the user to reboot device.
Bug:
80449594
Test: make -j50 RunSettingsRoboTests
Change-Id: Ibace1ff72c1b41bd55444242a74e3f0b49187668
TreeHugger Robot [Thu, 6 Dec 2018 06:36:23 +0000 (06:36 +0000)]
Merge "Stop observing a slice view when a slice is dismissed."
Sunny Shao [Wed, 5 Dec 2018 08:10:00 +0000 (16:10 +0800)]
Added FloatingAppBarScrollingViewBehavior
-Added FloatingAppBarScrollingViewBehavior for search bar. It can be scolling,
transparent and overlapped the scrolling child view.
-Exchanged the position of NestedScrollView and AppBarLayout in
settings_homepage_container.xml.
-Set the app bar height.
Change-Id: I6ef4c9001a1f893292fcbc825a0a9f2069b7286b
Fixes:
118886724
Test: robotest
cnchen [Wed, 5 Dec 2018 09:57:16 +0000 (17:57 +0800)]
migrate new setupcompat and setupdesign to SetupChooseLockGeneric
Test: cd tests/robotests && mma
Bug:
117080118
Change-Id: I6a29ef5294040d353ee1a0f2bf9ce69de7de9094
Xiangyu/Malcolm Chen [Thu, 6 Dec 2018 01:25:07 +0000 (01:25 +0000)]
Merge "Only enable data for one SIM in DSDS."
Malcolm Chen [Wed, 5 Dec 2018 20:48:00 +0000 (12:48 -0800)]
Only enable data for one SIM in DSDS.
Only enable mobile data for one SIM for simplicity. Which means When
turning on mobile data on non-default sub, pop a notification to user
that it will turn off data of the other one.
Bug:
120515679
Test: manual and unittest
Change-Id: I7c190bb70d771b7f280c246038a380e4fc7338a3
TreeHugger Robot [Thu, 6 Dec 2018 01:14:24 +0000 (01:14 +0000)]
Merge "Make a few custom slices implement CustomSliceable."
Fan Zhang [Wed, 5 Dec 2018 22:42:53 +0000 (14:42 -0800)]
Make a few custom slices implement CustomSliceable.
Bug:
80263568
Test: robotests, slice-browser
Change-Id: Id809a347d77448917154c2d1144fd2517e70829a
Doris Ling [Tue, 4 Dec 2018 23:40:34 +0000 (15:40 -0800)]
Add search to app info list.
- add a search option menu to the manage applications page.
- add a search filter to the app list adapter to remove any app whose
app name does not contain the search query.
Change-Id: Ie749daeef2cdc4a22fade45422ae90f44d00ceb2
Fixes:
119598311
Test: make RunSettingsRoboTests
TreeHugger Robot [Wed, 5 Dec 2018 22:43:24 +0000 (22:43 +0000)]
Merge "Fix manual certificate installation"
Antony Sargent [Wed, 5 Dec 2018 17:30:30 +0000 (09:30 -0800)]
Layout changes in v2 Network & internet page
This adds the skeleton of a header section which will only appear when
the device has two or more active mobile subscriptions. Subsequent CL's
will add the actual logic implementing it.
Also this moves up the airplane mode toggle higher up on the page, and
removes the proxy selector entry (which has been unconditionally
disabled by the ProxyPreferenceController for a while).
Bug:
116349402
Test: manual (this is mostly a layout change - subsequent changes will
have actual logic to test for the subscriptions header)
Change-Id: Iaee338d5c13e05d3c2d9d04872a94cf90e5da588
Beverly [Wed, 5 Dec 2018 17:33:02 +0000 (12:33 -0500)]
Update DND strings
Fixes:
120497233
Bug:
111475013
Test: manually flash and check strings
Test: make RunSettingsRoboTests -j40
Change-Id: I0a8971226a485f8ec41d83c167e51dac1a9c8107
TreeHugger Robot [Wed, 5 Dec 2018 18:32:51 +0000 (18:32 +0000)]
Merge "Reset dismissal UI to the baseline when exiting the page."
Christine Franks [Wed, 5 Dec 2018 16:29:51 +0000 (16:29 +0000)]
Merge "Move color management check to ColorDisplayManager"
Mill Chen [Wed, 5 Dec 2018 13:07:06 +0000 (21:07 +0800)]
Disable scrollbar of the button in conditional card
The scrollbar of the button will be enabled if changing font size
to large or above. It is fixed by disabling scrollbar of the button.
Change-Id: Ia66afac962c7b0d431007382dc6a2c7456fc915d
Fixes:
120085679
Test: visual, rebuild
Yanting Yang [Wed, 5 Dec 2018 13:10:47 +0000 (21:10 +0800)]
Fix deep link issue of Slice cards in home page
Add setData(uri) back to intent to fix deep link launching error.
Change-Id: Ibffce43ddeb9a1388d001515d8d3b320c5b45520
Fixes:
120473478
Test: robotests, visual
Yanting Yang [Tue, 4 Dec 2018 14:57:07 +0000 (22:57 +0800)]
Correct metrics category in ConnectedDeviceSlice
The used category METRICS_CATEGORY_UNKNOWN in Bluetooth detail intent is
not matched. Correct the category to BLUETOOTH_DEVICE_DETAILS.
Bug:
114807655
Test: robotest
Change-Id: I941db81164ac2b3a09b6d3c0d97f14c5e65fb6ed
Eran Messeri [Tue, 4 Dec 2018 12:31:05 +0000 (12:31 +0000)]
Fix manual certificate installation
Fix a bug where, when the user manually imports a certificate + key into
KeyChain, the imported certificate would sometimes not be marked as
user-selectable and so the user would not see it when
KeyChaine.choosePrivateKeyAlias was called.
The cause was the async task for marking the key as user-selectable
sometimes executing after the activity for installing the certificate
has terminated, leading it to try and interact with an
already-terminated KeyChain service.
The fix is to call the activity's finish() method only after the key is
marked as user-selectable.
Test: Manual, using CtsVerifier KeyChain Storage test.
Bug:
116716944
Change-Id: I23832ff7b609d7c609e734af48e9a0642f1df527
Yi-Ling Chuang [Tue, 4 Dec 2018 09:44:04 +0000 (17:44 +0800)]
Stop observing a slice view when a slice is dismissed.
In order to receive updates of slices, we make sliceLiveData observes
slice views. When a slice is dismissed, it should stop observing
the view so the view can be recycled and reused.
Fixes:
120465506
Test: robotests
Change-Id: Ie4f12e9a3e6e0e7d59d3346ab17282707047bf16
TreeHugger Robot [Wed, 5 Dec 2018 05:37:14 +0000 (05:37 +0000)]
Merge "Modify proto"
Yi-Ling Chuang [Thu, 29 Nov 2018 10:27:56 +0000 (18:27 +0800)]
Reset dismissal UI to the baseline when exiting the page.
Flip the card back to slice view if users exit the page instead of
getting the dismissal UI preserved. We should also reset the UI to the baseline
if users dismiss a card, so when the view is reused, slice view can
then be displayed correctly.
Change-Id: If5448c57dec44ef5c1d3472358d4ddc9398538b8
Fixes:
119820168
Test: robotests
TreeHugger Robot [Wed, 5 Dec 2018 02:00:25 +0000 (02:00 +0000)]
Merge "Add action/ or intent/ to all custom slice uri path."
Leon Liao [Wed, 5 Dec 2018 00:30:38 +0000 (00:30 +0000)]
Merge "Add summary with accessibility timeout item"
Raff Tsai [Wed, 5 Dec 2018 00:12:35 +0000 (08:12 +0800)]
Modify proto
Add a field about contextual card score
Change-Id: I52b660801e317112673ada2f449709239a8b3c12
Bug:
79698338
Test: Robolectric
Fan Zhang [Wed, 5 Dec 2018 00:07:40 +0000 (16:07 -0800)]
Add action/ or intent/ to all custom slice uri path.
Test: rebuild, robotests
Change-Id: Ibb4a071cffb458a9f871aa11ff2737cd40328574
TreeHugger Robot [Wed, 5 Dec 2018 00:00:42 +0000 (00:00 +0000)]
Merge "Schematize vold system properties"
TreeHugger Robot [Tue, 4 Dec 2018 23:24:28 +0000 (23:24 +0000)]
Merge "Set slice uri as data in PendingIntent."
Philip P. Moltmann [Tue, 4 Dec 2018 21:42:07 +0000 (13:42 -0800)]
RuntimePermissionPresenter was moved
Test: atest SettingsLibRoboTests
Change-Id: I1bd13f3ea89068d46929756426e8c829c10a303f
Leon Liao [Thu, 29 Nov 2018 14:54:07 +0000 (22:54 +0800)]
Add summary with accessibility timeout item
Add summary with accessibility timeout item in Accessibility
Settings. This summary describe its level to time limit of
Accessibility timeout feature.
Bug:
119283926
Test: atest AccessibilitySettingsTest
Test: atest AccessibilityTimeoutControllerTest
Test: make RunSettingsRoboTests
Change-Id: I86c096e6f4adb62150e1ff2af4c22afac240b41e
Fan Zhang [Tue, 4 Dec 2018 21:21:24 +0000 (13:21 -0800)]
Set slice uri as data in PendingIntent.
Presenter needs to disambigue multiple slice action PendingIntents, just
setting extra is not enough.
Bug:
117445451
Test: manual
Change-Id: I26e10bc064585e241def72e6b5194c117a9ebc16
Fan Zhang [Tue, 4 Dec 2018 20:43:14 +0000 (12:43 -0800)]
Fix crash when dynamic_homepage flag is off.
This partially rolls back ag/
5650901. We should revert this change when
dynamic_homepage flag is permanently on.
Change-Id: I5e340421d04bc20c77dd30395fd8522693807954
Fixes:
118444000
Test: manual
Doris Ling [Sat, 1 Dec 2018 00:20:32 +0000 (16:20 -0800)]
Remove "v2" from the data usage version 2 code.
Change-Id: I8ede82029194d1a9a43d00a3de7ec1a8dd77d978
Fixes:
117420679
Test: make RunSettingsRoboTests
Fan Zhang [Tue, 4 Dec 2018 18:15:02 +0000 (10:15 -0800)]
Merge "Make migrate option menu invisible when src volume is not mounted" am:
6db9f21256 am:
b084c60686
am:
4036866211
Change-Id: I25f21e3c176e225db6900d3c93b6a8860e701061
Fan Zhang [Tue, 4 Dec 2018 18:10:50 +0000 (10:10 -0800)]
Merge "Make migrate option menu invisible when src volume is not mounted" am:
6db9f21256
am:
b084c60686
Change-Id: Ia3990dc8fa2c73079b997bda0e1656d173c65212
Fan Zhang [Tue, 4 Dec 2018 18:01:10 +0000 (10:01 -0800)]
Merge "Make migrate option menu invisible when src volume is not mounted"
am:
6db9f21256
Change-Id: Ie4ca0c854de854172a0eccf4e56ec86a8e18d71c
TreeHugger Robot [Tue, 4 Dec 2018 17:53:30 +0000 (17:53 +0000)]
Merge "Remove data usage v1 code."
Fan Zhang [Tue, 4 Dec 2018 17:33:33 +0000 (17:33 +0000)]
Merge "Make migrate option menu invisible when src volume is not mounted"
Fan Zhang [Tue, 4 Dec 2018 17:15:32 +0000 (17:15 +0000)]
Merge "Set the color primary variant for material design"
Sunny Shao [Mon, 3 Dec 2018 11:12:31 +0000 (19:12 +0800)]
Set the color primary variant for material design
Added the color of the colorPrimaryVariant to avoid the run time exception
while load the MaterialCardView resource.
Modified the test case for the new version material design library.
Bug:
118886724
Test: robotest
Change-Id: I55791b8eef2263587b2ae3d7a2f5b9da9929fc9a
Arc Wang [Tue, 4 Dec 2018 09:23:47 +0000 (09:23 +0000)]
Merge "Use multiple actions to launch Wi-Fi DPP configurator with different mode."
lumark [Mon, 3 Dec 2018 08:11:16 +0000 (16:11 +0800)]
IMM#showInputMethodPickerFromSystem for supporting multi-display.
Derived from IMM#showInputMethodPicker(bool) @hide function, rename it as
showInputMethodPickerFromSystem and added displayId parameter to let
system caller can deside which display to show input method picker dialog.
Bug:
120050928
Test: manual, verify the IME switcher dialog can be shown on the external
display when:
1) Launch CryptKeeper activity to the external display via command:
adb shell am start -e "com.android.settings.CryptKeeper.DEBUG_FORCE_VIEW" \
"password" -n com.android.settings/.CryptKeeper --display 1 --windowingMode 1
2) Pressing the IME switcher button in CryptKeeper activity.
Test: atest InputMethodManagerTest#testShowInputMethodPicker
Change-Id: I58f4e7b00eb271d426ba5b1125e9f129dac53f1d
Yanting Yang [Tue, 4 Dec 2018 06:06:46 +0000 (06:06 +0000)]
Merge "Update the card behavior of Low Storage slice"