OSDN Git Service
TreeHugger Robot [Tue, 14 May 2019 00:07:28 +0000 (00:07 +0000)]
Merge "Revert recent location apps to pre-Q behavior" into qt-dev
Mehdi Alizadeh [Tue, 14 May 2019 00:07:25 +0000 (00:07 +0000)]
Merge "Update strings for System Navigation settings page" into qt-dev
TreeHugger Robot [Tue, 14 May 2019 00:05:47 +0000 (00:05 +0000)]
Merge "Make subsettings display edge-to-edge" into qt-dev
TreeHugger Robot [Tue, 14 May 2019 00:04:59 +0000 (00:04 +0000)]
Merge "Fix robolectric test error" into qt-dev
TreeHugger Robot [Mon, 13 May 2019 23:39:45 +0000 (23:39 +0000)]
Merge "Corrected flow for accessibility." into qt-dev
Raff Tsai [Mon, 13 May 2019 06:28:50 +0000 (14:28 +0800)]
Fix robolectric test error
Fixes:
132575837
Test: make RunSettingsRoboTests
Change-Id: I5238a3789f5308a489298fadae772b8b9343ddb5
Merged-In: I5238a3789f5308a489298fadae772b8b9343ddb5
(cherry picked from commit
3c337d565990771ccee462325e6887c0956b051c)
Lifu Tang [Mon, 6 May 2019 22:24:04 +0000 (15:24 -0700)]
Revert recent location apps to pre-Q behavior
- List recent location request instead of location access
- Show in list view instead of app list widget
- Add overflow menu to "see all" page to show/hide system apps
Bug:
124015107
Test: build, flash, and test manually
Change-Id: I78df6d4b13ddf774013e8d819cf343ce012e6b0b
Joshua Mccloskey [Mon, 13 May 2019 22:05:36 +0000 (22:05 +0000)]
Merge "Re-enable continue button for accessibility flow" into qt-dev
joshmccloskey [Mon, 13 May 2019 21:25:37 +0000 (14:25 -0700)]
Corrected flow for accessibility.
Fixes:
132635400
Test: Manual.
Change-Id: Ied01b76d273b35e01f83a0a744ca2768d02380c5
Mehdi Alizadeh [Mon, 13 May 2019 21:29:46 +0000 (14:29 -0700)]
Update strings for System Navigation settings page
Bug:
130437843
Bug:
128522050
Test: Manual test to verify the right strings in settings app
Change-Id: Id6e589d896be34c98fded3b3fff897840e9d3f4f
TreeHugger Robot [Mon, 13 May 2019 21:13:14 +0000 (21:13 +0000)]
Merge "Fix crash on panel rotation" into qt-dev
lindatseng [Mon, 13 May 2019 18:30:14 +0000 (11:30 -0700)]
Fix crash on panel rotation
Should force PanelFragment creation on rotation change.
Change-Id: If2ccae7dbc4278103c95621743570b37113746f7
Fix:
132587339
Test: Manual
TreeHugger Robot [Mon, 13 May 2019 18:58:44 +0000 (18:58 +0000)]
Merge "Fix automatically directing the user to the captive portal in Wi-Fi Slice" into qt-dev
Mady Mellor [Mon, 13 May 2019 18:18:31 +0000 (18:18 +0000)]
Merge "Move feature-level Bubble setting into developer options; default to off" into qt-dev
Fan Zhang [Thu, 9 May 2019 20:41:02 +0000 (13:41 -0700)]
Make subsettings display edge-to-edge
Fixes:
132182711
Test: visual
Change-Id: I3b0635cba359f74d463c2360323d80c5c9533228
Zhi An Ng [Mon, 13 May 2019 16:52:22 +0000 (16:52 +0000)]
Merge "Update string description in SAW unsupported screen" into qt-dev
TreeHugger Robot [Mon, 13 May 2019 07:10:11 +0000 (07:10 +0000)]
Merge "Fix Wi-Fi QR code scanner height at 360dp" into qt-dev
Tim Peng [Mon, 6 May 2019 06:44:18 +0000 (14:44 +0800)]
Hide audio switcher entry-point in the volume slice when in call
- update test case
Bug:
132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: Ibfd12e75f584b6884d1025018772ac9c19673156
TreeHugger Robot [Sun, 12 May 2019 16:41:32 +0000 (16:41 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
Bill Yi [Sun, 12 May 2019 13:01:13 +0000 (06:01 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: If3dd5a2b6dfd25ecbd48c4870499f9ed5228a014
TreeHugger Robot [Sun, 12 May 2019 02:43:06 +0000 (02:43 +0000)]
Merge "[WPA3] Fix connectivity issues with PSK-SAE Transtion mode" into qt-dev
Kevin Chyn [Sat, 11 May 2019 04:31:14 +0000 (04:31 +0000)]
Merge "Propagate intent extras and finish activity properly" into qt-dev
Jason Chiu [Tue, 30 Apr 2019 06:41:19 +0000 (14:41 +0800)]
Fix automatically directing the user to the captive portal in Wi-Fi Slice
The feature failed after the CL "Force the adapter to rebind cards with
a toggle".
Because toggle slices have been forced to rebind after starting another
activity and when any slice is updating. This unpins Wi-Fi slice and
stops WifiScanWorker and then clears the saved clicked network.
Solution:
1. Change ConnectToWifiHandler from activity to receiver and send
broadcasts to it with FLAG_RECEIVER_FOREGROUND, so Wi-Fi slice won't
be forced to rebind.
2. Seperate Wi-Fi scan worker and contextual Wi-Fi scan worker. Keep the
original logic for the generic one, and then add the logic below to
the contextual one.
3. Do not clear the saved clicked network when slice is unppined because
it happens frequently in contextual homepage.
4. Introduce a static long in ContextualWifiScanWorker that updates once
in every visible UI session. A session is when the screen is visible
to user.
5. Use session token to determine whether auto-starting captive portal
is needed.
Fixes:
128056349
Test: robotest, visual in homepage and network panel
Change-Id: I9e03c379806e124fa7253b2a635574b2433f6afc
TreeHugger Robot [Sat, 11 May 2019 02:27:24 +0000 (02:27 +0000)]
Merge "Log ACTION_CONTEXTUAL_CARD_SHOW in different place" into qt-dev
Kevin Chyn [Sat, 11 May 2019 00:41:55 +0000 (17:41 -0700)]
Propagate intent extras and finish activity properly
Bug:
131861430
Test: Builds
Change-Id: I7e831f74f1e55026b9343a4c4f47c9f5adc316e6
TreeHugger Robot [Sat, 11 May 2019 01:40:56 +0000 (01:40 +0000)]
Merge "Fixed spacing on Intro & Edu screens" into qt-dev
joshmccloskey [Sat, 11 May 2019 00:59:25 +0000 (17:59 -0700)]
Re-enable continue button for accessibility flow
Test: Removed userdata, went to education flow, enabled accessibility
and confirmed the next button was re-enabled
Fixes:
132463368
Change-Id: I7cd78d606fa4c191b44199a0d143b56b33be4fa4
Raff Tsai [Fri, 10 May 2019 04:46:56 +0000 (12:46 +0800)]
Log ACTION_CONTEXTUAL_CARD_SHOW in different place
Fixes:
132396134
Test: robolectric
Change-Id: I7d46df15fbc42838da0fa53f4db7e1aa026c3174
joshmccloskey [Thu, 9 May 2019 23:01:13 +0000 (16:01 -0700)]
Fixed spacing on Intro & Edu screens
Test: It builds.
Fixes:
132370812
Change-Id: I7bfa8a7eae91ad9b0fc9b19c9a6bc019f884e729
Mady Mellor [Mon, 6 May 2019 23:54:07 +0000 (16:54 -0700)]
Move feature-level Bubble setting into developer options; default to off
Functionality:
* Moves feature-level setting into developer settings (apps section)
* Adds bubbles in developer options under "apps" section
* Configures the app-specific bubble toggle in notifications settings
to be hidden / shown based on the developer setting
* Configures the channel-specific bubble toggle in notification channel
settings to be hidden / shown based on the developer setting
Tests:
* Anything that might be assuming that it's globally enabled now has
a bit to enable it globally in that test
* There is a logic change now where the app-level setting would be available
even if off globally, now that is not true -- if it's off globally the
app-level is no longer available
* Adds tests for the developer setting
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Bug:
131845765
Change-Id: I5f6bf74e5ada3fc023571825cca10d7bddc60e6e
Fan Zhang [Fri, 10 May 2019 21:18:33 +0000 (14:18 -0700)]
Clean up before making all setting page render edge-to-edge
These classes are casting view to LinearLayout unnecessarily. Later we
might change the root view away from LinearLayout. The cast will cause
crash.
Bug:
132182711
Test: go through SUW.
Change-Id: Iea31882f8edea0c87ef8e95b4da9b6bffa8ea7d0
TreeHugger Robot [Fri, 10 May 2019 20:38:20 +0000 (20:38 +0000)]
Merge "Update listDivider for PreferenceFragmentCompat" into qt-dev
Fan Zhang [Fri, 10 May 2019 20:24:59 +0000 (20:24 +0000)]
Merge "Updating animation asset" into qt-dev
Brad Ebinger [Fri, 10 May 2019 20:17:38 +0000 (20:17 +0000)]
Merge "Resolve the SIM call manager per subId" into qt-dev
Hai Shalom [Wed, 8 May 2019 21:42:06 +0000 (14:42 -0700)]
[WPA3] Fix connectivity issues with PSK-SAE Transtion mode
Fix two reported issues regarding PSK-SAE transition mode:
1. When phone supports SAE, creating a manual saved network with PSK
and manually connecting would cause the phone to connect but Settings
does not display any connected AP. Phone would not autoconnect.
2. When phone doesn't support SAE, phone cannot connect to an AP in
PSK-SAE Transition mode because the framework always targets the highest
security.
Bug:
132278271
Test: Connect to WPA2 network
Test: Connect to WPA3 network (w/capable phone)
Test: Connect to WPA2/3 Transition w/SAE capable phone
Test: Connect to WPA2/3 Transition w/SAE not-capable phone
Change-Id: I371bcb4b2cccfc8684ecb5db3a768524f7354598
Brad Ebinger [Fri, 10 May 2019 19:42:55 +0000 (19:42 +0000)]
Merge "Allow SimDialogActivity to be started for result" into qt-dev
Brad Ebinger [Wed, 1 May 2019 00:30:40 +0000 (17:30 -0700)]
Allow SimDialogActivity to be started for result
In Telephony, we sometimes need to be able to launch
the SIM pick dialog activity for SMS without setting
a new default (i.e. user chose "ask every time") for
default SMS subscription.
Adds the ability for the SimDialogActivity to be
called using startActivityForResult and not set the
user's choice as the default.
Bug:
130853716
Bug:
130567323
Test: run Telephony SmsManagerTestApp
Change-Id: If9f9ebbfe9b7b6718ed759937abbcfa6d22c6295
Beth Thibodeau [Fri, 10 May 2019 18:28:43 +0000 (14:28 -0400)]
Updating animation asset
Fixes:
132095489
Test: mp settingsg
Change-Id: Icda6eb54496356e2567e1d39ab0c718746e2442d
TreeHugger Robot [Fri, 10 May 2019 18:14:02 +0000 (18:14 +0000)]
Merge "Clear media switcher items when in phone call" into qt-dev
Mill Chen [Thu, 9 May 2019 17:50:57 +0000 (01:50 +0800)]
Update listDivider for PreferenceFragmentCompat
The support library uses preference_list_divider_material for its list
divider and its color is a hardcoded value. That's why the divider color
can't be applied to the PreferenceFragmentCompat in Settings when
updating the divider color in the device defaults theme level. To make
it so we set its listDivider to list_divider_material to facilitate updating
the divider color.
Bug:
129943610
Test: visual
Change-Id: Ie992b925fae0effd4e00682a911ad004ac3fc033
TreeHugger Robot [Fri, 10 May 2019 09:09:25 +0000 (09:09 +0000)]
Merge "Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 08:41:12 +0000 (08:41 +0000)]
Merge "Set panel launch mode to singleInstance and fix animation" into qt-dev
TreeHugger Robot [Fri, 10 May 2019 08:38:34 +0000 (08:38 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-dev
lindatseng [Fri, 3 May 2019 00:12:27 +0000 (17:12 -0700)]
Set panel launch mode to singleInstance and fix animation
Set panel launch mode to singleInstance to avoid panel can show up
infinite time when user keep launching panels (Easy repro by
pressing volume hard key > settings again and again).
After changing launch mode to singleInstance, we will need to do
some refactors, to avoid weirdness when adding/changing/closing
panels:
1. Move and refactor logic in SettingsPanelActivity#onCreate.
We will need onNewIntent here to handle Panel launching, since
we only have one instance of SettingsPanelActivity now.
Also do refactor here to reuse the PanelFragment instead of
creating one every single time, to better handle the exit
animation, avoid janky exit behavior from the old PanelFragment
2. Move logic from PanelFragment#onCreateView, to reuse it when
updating panel content.
Also add exiting animation when we are transitioning the panel
from one to another. Also add alpha animation to make it move
more smoothly.
3. Adding flags to launch see more intent in settings.
Fixes:
131225920
Fixes:
131254399
Test: manual
Change-Id: I93d3708bd02a2d736e38685475f2d9988ef62d31
Kevin Chang [Fri, 10 May 2019 06:32:25 +0000 (06:32 +0000)]
Merge "Override performClick method to eliminate redundant click" into qt-dev
Arc Wang [Mon, 6 May 2019 10:29:06 +0000 (18:29 +0800)]
Fix "Turn on Wi-Fi scanning?" does not pop up when clicking "Turn on Wi-Fi automatically"
We should make sure both 'Use location' & 'Wi-Fi scanning' are enabled
before calling setWifiWakeupEnabled.
Bug:
131777439
Test: manual
Change-Id: I602917cfa7c5581ecb414e8c44b4e20c8f9ea78d
Pengquan Meng [Fri, 10 May 2019 06:10:48 +0000 (06:10 +0000)]
Merge "Fixed network name for about/sim_status" into qt-dev
Kevin Chang [Fri, 10 May 2019 05:49:59 +0000 (05:49 +0000)]
Merge "Improve the Accessibility warning dialog with new design" into qt-dev
Bill Yi [Fri, 10 May 2019 04:16:18 +0000 (21:16 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I297c9ea9b5d9d7efb166b4d94f29e7e167e5c2b2
Kevin Chang [Wed, 8 May 2019 10:49:27 +0000 (18:49 +0800)]
Override performClick method to eliminate redundant click
Bug:
132226328
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SwitchBar
Change-Id: I22987a7695dfc84e50d6419604a9512f98cf4d13
Kevin Chang [Tue, 30 Apr 2019 02:55:58 +0000 (10:55 +0800)]
Improve the Accessibility warning dialog with new design
Create new Accessibility warning dialog based on the style of permission
dialog
Bug:
129788631
Test: Visual
Change-Id: I0ec693f9c29e6e85e17d5bd1a64a4c0fe9499f95
hughchen [Thu, 9 May 2019 03:27:25 +0000 (11:27 +0800)]
Clear media switcher items when in phone call
- update test case
Bug:
132385707
Test: make -j42 RunSettingsRoboTests
Change-Id: I2bbd35e869e8ab5596d280d04fddc98f05629190
TreeHugger Robot [Fri, 10 May 2019 00:27:34 +0000 (00:27 +0000)]
Merge "Clean up homepage toolbar after setting transparent navbar." into qt-dev
TreeHugger Robot [Thu, 9 May 2019 23:58:16 +0000 (23:58 +0000)]
Merge "Fix NPE when launching MediaOutput Panel" into qt-dev
TreeHugger Robot [Thu, 9 May 2019 23:46:22 +0000 (23:46 +0000)]
Merge "Make ScreenPinningSettings behaviour consistent with LockTaskController." into qt-dev
Fan Zhang [Thu, 9 May 2019 21:44:47 +0000 (14:44 -0700)]
Clean up homepage toolbar after setting transparent navbar.
Bug:
132182711
Test: rebuild
Change-Id: I212b665810f6713980eb749d34d26f27b7100160
Pengquan Meng [Tue, 7 May 2019 21:39:45 +0000 (14:39 -0700)]
Fixed network name for about/sim_status
The network name in sim status dialog is not the same as the one in the
about page. This CL use the carrier text which is resolved in
ServiceStateTracker as the network name, this keep the network name sync
with the status bar and the summary of sim status in the about page.
Bug:
31784938
Test: build & manual test
Change-Id: Ia741baabaa98ae447dbedf9e28fd2fda222e6d2e
TreeHugger Robot [Thu, 9 May 2019 21:22:18 +0000 (21:22 +0000)]
Merge "Make preview image not selectable" into qt-dev
Ng Zhi An [Thu, 9 May 2019 21:12:15 +0000 (14:12 -0700)]
Update string description in SAW unsupported screen
Bug:
132183451
Test: none
Change-Id: I3e2e5e24feaf4918e9c85d18bfa397c4cfc2cb36
lindatseng [Thu, 9 May 2019 21:03:15 +0000 (14:03 -0700)]
Fix NPE when launching MediaOutput Panel
Add NP check when to avoid NPE when launching MediaOutput Panel
Fixes:
132366620
Test: Manual
Change-Id: I21a481907a5bca83404e59e08ba11ce5c55199a4
TreeHugger Robot [Thu, 9 May 2019 20:33:26 +0000 (20:33 +0000)]
Merge "Fix mirrored arrow issue for RTL" into qt-dev
Zhi An Ng [Thu, 9 May 2019 19:29:33 +0000 (19:29 +0000)]
Merge "Update strings used in SAW unsupported screen" into qt-dev
Ng Zhi An [Thu, 9 May 2019 17:43:53 +0000 (10:43 -0700)]
Update strings used in SAW unsupported screen
Bug:
132183451
Test: adb shell am start-activity -a android.settings.action.MANAGE_OVERLAY_PERMISSION
Change-Id: Ia840b82838bed43234572c4a08bd56b97f391a5b
Raff Tsai [Thu, 9 May 2019 19:01:20 +0000 (19:01 +0000)]
Merge "Fix robolectric test error" into qt-dev
Beth Thibodeau [Thu, 9 May 2019 18:38:24 +0000 (14:38 -0400)]
Make preview image not selectable
Fixes:
132050099
Test: manual
Change-Id: I102ced947d352901f5bdbf34eeeba98ab0a32cca
TreeHugger Robot [Thu, 9 May 2019 18:27:37 +0000 (18:27 +0000)]
Merge "Display profile picker for content capture settings." into qt-dev
TreeHugger Robot [Thu, 9 May 2019 17:45:10 +0000 (17:45 +0000)]
Merge "Catch another exception when we are building slices data for search" into qt-dev
Annie Meng [Thu, 9 May 2019 09:20:03 +0000 (09:20 +0000)]
Merge "Change inactive backup UI to show "Disabled by admin"" into qt-dev
Yanting Yang [Thu, 9 May 2019 07:29:40 +0000 (15:29 +0800)]
Fix mirrored arrow issue for RTL
There is no mirrored arrow for RTL in Settings after applying icon
overlays for theming (b/
131346125), add autoMirrored attr to fix it.
Fixes:
132174923
Test: visual
Change-Id: I6e70c39c00a5859e49b3a4dce493ea9ccac0417a
Raff Tsai [Thu, 9 May 2019 03:36:35 +0000 (11:36 +0800)]
Fix robolectric test error
Bug:
132302277
Test: make RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.AdaptiveSleepPreferenceControllerTest"
Change-Id: I6c823298d8e346eb2e87686a691dc4a2536423f6
tmfang [Mon, 29 Apr 2019 05:32:22 +0000 (13:32 +0800)]
Catch another exception when we are building slices data for search
We lose chance to build all Settings slices if we got an exception
when settings was creating slice data for controllers.
We should make sure the process goes well even we got an exception
on an incorrect controller.
Also, we log exceptions for each catch.
Bug:
131449561
Test: Open Settings search and then we can see slice for some
search result.
Change-Id: Iac9f0e0a187f6d10cf53886afeb9cab479b6ce02
TreeHugger Robot [Thu, 9 May 2019 02:00:26 +0000 (02:00 +0000)]
Merge "Fix WebViewAppPickerTest" into qt-dev
Arc Wang [Thu, 9 May 2019 01:29:48 +0000 (01:29 +0000)]
Merge "Fix back arrow in wifi settings "connect to this network connection qr code" does not work" into qt-dev
Arc Wang [Thu, 9 May 2019 01:29:25 +0000 (01:29 +0000)]
Merge "Add margin 24dp to the error message of Wi-Fi QR code scanner" into qt-dev
TreeHugger Robot [Thu, 9 May 2019 00:51:31 +0000 (00:51 +0000)]
Merge "Update summary for mobile data toggle for CBRS." into qt-dev
Jonathan Scott [Wed, 8 May 2019 23:56:02 +0000 (16:56 -0700)]
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357 am:
bd3672b2d8 am:
9f280a15a2 am:
306ff7e3a9 -s ours
am:
550496d236 -s ours
am skip reason: subject contains skip directive
Change-Id: I2571156e2d9a07fdae9e5685dd3edc6c6fb18849
Kevin Chyn [Wed, 8 May 2019 23:55:22 +0000 (23:55 +0000)]
Merge changes from topic "Face Intro Changes" into qt-dev
* changes:
Added Face Enroll Education Screen
Updated Face Enroll Introduction
Jonathan Scott [Wed, 8 May 2019 23:25:48 +0000 (16:25 -0700)]
[automerger skipped] [automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357 am:
bd3672b2d8 am:
9f280a15a2
am:
306ff7e3a9 -s ours
am skip reason: subject contains skip directive
Change-Id: If66c539a683b4edeeca60140fb6c85eed1902d99
Jonathan Scott [Wed, 8 May 2019 23:09:26 +0000 (16:09 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357 am:
bd3672b2d8
am:
9f280a15a2
Change-Id: I2dae0b0e41b34480c99a81fd3c05014e5ec43f33
Andrew Sapperstein [Wed, 8 May 2019 22:55:04 +0000 (15:55 -0700)]
Update summary for mobile data toggle for CBRS.
Fixes:
127529917
Test: robotests
Change-Id: Id2d0bdbcf9674106a3dff8db8e9ceb22dbdda314
Jonathan Scott [Wed, 8 May 2019 22:43:07 +0000 (15:43 -0700)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357
am:
bd3672b2d8
Change-Id: I9157d6fd4afc3426142dbfbbdc9a57aceb2b7d7f
TreeHugger Robot [Wed, 8 May 2019 21:26:14 +0000 (21:26 +0000)]
Merge "Increase char limit as requested by i18n team" into qt-dev
TreeHugger Robot [Wed, 8 May 2019 21:12:52 +0000 (21:12 +0000)]
Merge "Clear preferences when dialog acknowledged and increase order" into qt-dev
Lei Yu [Wed, 8 May 2019 21:02:22 +0000 (21:02 +0000)]
Merge "Increate max height of sliceView" into qt-dev
Android Build Merger (Role) [Wed, 8 May 2019 20:51:48 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6 skipped:
333afb4357
Change-Id: If8d375a600b9db7b011b08770ad6e7fbf29073c4
Android Build Merger (Role) [Wed, 8 May 2019 20:51:45 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b am:
003ce809c6
Change-Id: Ief43c33183fa5f24cf3bd9f26c9d7362d235492e
Android Build Merger (Role) [Wed, 8 May 2019 20:51:43 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc am:
7d86790c7b
Change-Id: I89b5b93b63beb9f52e5799c822edccf208158f39
Android Build Merger (Role) [Wed, 8 May 2019 20:51:40 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29 am:
133337b4dc
Change-Id: Ibb0d6c1d0253c78160d66e27a2847192c19d10d1
Android Build Merger (Role) [Wed, 8 May 2019 20:51:37 +0000 (20:51 +0000)]
[automerger] [RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks. am:
b985aa2f29
Change-Id: Iee20bc7fe4fe756b87c9231689792ab50f8a76bc
Jonathan Scott [Tue, 7 May 2019 16:20:00 +0000 (17:20 +0100)]
[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with lock tasks.
Bug:
127605586
Test: Manual
Change-Id: I4186c2d57b42b6e3d27013f2c9708fca56c561fe
Merged-In: I1cdd82bea4dc9e4182694b061a7746aa83dabdfe
TreeHugger Robot [Wed, 8 May 2019 20:29:38 +0000 (20:29 +0000)]
Merge "Re-enable the test" into qt-dev
Fan Zhang [Wed, 8 May 2019 20:26:31 +0000 (20:26 +0000)]
Merge "Display settings homepage content fully edge-to-edge" into qt-dev
Android Build Merger (Role) [Wed, 8 May 2019 20:20:20 +0000 (20:20 +0000)]
Merge "[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev am:
db98a8edec -s ours am skip reason: subject contains skip directive" into qt-dev
Lei Yu [Wed, 8 May 2019 20:18:11 +0000 (20:18 +0000)]
Merge "Add null check when restart batteryinfo loader" into qt-dev
Jonathan Scott [Wed, 8 May 2019 20:17:58 +0000 (13:17 -0700)]
[automerger skipped] Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
am:
db98a8edec -s ours
am skip reason: subject contains skip directive
Change-Id: Ibd95dd35f7efcc5d2605799bfa65b3b296be7d88
TreeHugger Robot [Wed, 8 May 2019 20:00:27 +0000 (20:00 +0000)]
Merge "[RESTRICT AUTOMERGE] Make ScreenPinningSettings behaviour consistent with LockTaskController." into pi-dev
Salvador Martinez [Wed, 8 May 2019 19:28:43 +0000 (12:28 -0700)]
Clear preferences when dialog acknowledged and increase order
This CL makes it so that the order on the seekbar is increased
to a very large value to ensure it gets added to the end in the
case where a refresh is triggered due to the first time battery
saver dialog. Additionally it clears the preferences on the screen
when we receive confirmation to ensure that no caching can cause
the seekbar ot show up on top of other preferences.
Test: atest BatterySaverScheduleSeekBarControllerTest
Bug:
132107662
Change-Id: I26bf2772ed7135daa4879bca17e0ecfc22a2d0dd
TreeHugger Robot [Wed, 8 May 2019 19:20:13 +0000 (19:20 +0000)]
Merge "Update datausage for DataUsagePreferenceController" into qt-dev
joshmccloskey [Tue, 7 May 2019 04:42:14 +0000 (21:42 -0700)]
Added Face Enroll Education Screen
Test: Builds
Bug:
131774352
Fixes:
131857742
Change-Id: Ib384b9efaf053b405ce3f55e449dd6abb9e75296
Beth Thibodeau [Wed, 8 May 2019 19:01:32 +0000 (15:01 -0400)]
Increase char limit as requested by i18n team
Fixes:
132257773
Test: mp settingsg
Change-Id: I4c5c21899bb9fa61f8f8b32cd56dc57288e282bd