OSDN Git Service
timhypeng [Mon, 25 Mar 2019 07:50:09 +0000 (15:50 +0800)]
[Fix] Unable to show output device indicator after reboot
- To fix the NPE in MediaOutputIndicatorWorker
- To get Bluetooth device status in Slice, not in Worker
- To purify Worker to be an event receiver
Bug:
128945026
Test: make -j42 RunSettingsRoboTests
Change-Id: I9360202870c7a43a79641c5b84210c1bfad4b9a6
TreeHugger Robot [Wed, 27 Mar 2019 02:45:40 +0000 (02:45 +0000)]
Merge "Update icons to use tint and vectors"
TreeHugger Robot [Wed, 27 Mar 2019 01:45:38 +0000 (01:45 +0000)]
Merge "Add SettingsIntelligenceLogwriter"
TreeHugger Robot [Wed, 27 Mar 2019 00:54:04 +0000 (00:54 +0000)]
Merge "Fix Slices in Panel no-op bug"
TreeHugger Robot [Wed, 27 Mar 2019 00:47:02 +0000 (00:47 +0000)]
Merge "Fix inconsistent border width in QR code scanning camera"
Salvador Martinez [Tue, 26 Mar 2019 22:15:49 +0000 (15:15 -0700)]
Update icons to use tint and vectors
A bunch of icons were using PNGs which didn't allow their color
to change when in dark mode. This CL simply adds vector drawables
for all the PNGs and sets the tint to the correct color where needed.
Test: visual inspection, robotests pass
Bug:
126199274
Change-Id: I372d94e374173ab0572dacb03674a40fa14cffb9
TreeHugger Robot [Tue, 26 Mar 2019 23:17:35 +0000 (23:17 +0000)]
Merge "Deep link to detail UI when mainline module version is clicked."
Raff Tsai [Wed, 30 Jan 2019 03:14:20 +0000 (11:14 +0800)]
Add SettingsIntelligenceLogwriter
Bug:
124701288
Test: robolectric, manual
Change-Id: Iea446ae600d22ed62c5ee45afd1cd27a89b5de34
Mill Chen [Tue, 26 Mar 2019 23:10:38 +0000 (23:10 +0000)]
Merge "Broadcast an intent after turning off Grayscale"
Salvador Martinez [Tue, 26 Mar 2019 22:32:15 +0000 (22:32 +0000)]
Merge "Update dark theme to have new screen"
TreeHugger Robot [Tue, 26 Mar 2019 21:16:33 +0000 (21:16 +0000)]
Merge "Update DND duration setting string"
TreeHugger Robot [Tue, 26 Mar 2019 21:16:27 +0000 (21:16 +0000)]
Merge "Enable/disable a few things in debuggable builds"
TreeHugger Robot [Tue, 26 Mar 2019 20:59:53 +0000 (20:59 +0000)]
Merge "Add a help URI for each ManageApplications subclass"
Fan Zhang [Tue, 26 Mar 2019 19:26:21 +0000 (12:26 -0700)]
Deep link to detail UI when mainline module version is clicked.
Fixes:
129287281
Test: robotests
Change-Id: I875cf39936dd8cc656aba9e30dc03c882ee13d4a
TreeHugger Robot [Tue, 26 Mar 2019 20:41:27 +0000 (20:41 +0000)]
Merge "Flip the preference for sticky battery saver"
Lei Yu [Tue, 26 Mar 2019 20:38:22 +0000 (20:38 +0000)]
Merge "Fix broken settings tests(Round 2)"
Salvador Martinez [Wed, 20 Mar 2019 17:52:52 +0000 (10:52 -0700)]
Update dark theme to have new screen
The dark theme preference should have it's own screen rather than
being a dialog. This adds some boilerplate code that will be
needed for the illustration as well as converting the current
list preference to open a new screen.
Test: robotests
Bug:
128686189
Change-Id: I5b62276353c0d39ad2ad00d21d2280e76cceb09b
jackqdyulei [Mon, 25 Mar 2019 22:40:05 +0000 (15:40 -0700)]
Fix broken settings tests(Round 2)
1. Mark a few as Ignore with bug number
2. Remove some tests since they are obsolete.
Bug:
129159331
Test: RunSettingsRoboTests
Change-Id: I801681609c31c1f824c44b49ec89d9d28c716539
TreeHugger Robot [Tue, 26 Mar 2019 19:25:39 +0000 (19:25 +0000)]
Merge "Add Live Caption preference to Accessibility page."
Fan Zhang [Tue, 26 Mar 2019 18:39:47 +0000 (11:39 -0700)]
Enable/disable a few things in debuggable builds
- Feature flag dashboard is now only ON in debuggable builds
- Draw overlay is enabled in debuggable builds for a11y testing
Fixes:
129060539
Fixes:
129041251
Test: robotests
Change-Id: Ic799101c8ca6cbcd26fe02b6a567f223800805ab
TreeHugger Robot [Tue, 26 Mar 2019 18:49:32 +0000 (18:49 +0000)]
Merge "Update search keywords for some pages."
Beverly [Tue, 26 Mar 2019 18:48:17 +0000 (14:48 -0400)]
Update DND duration setting string
Fixes:
125537656
Test: manual
Change-Id: I545c00083c36e7e8f3ff0e6f33d2b000af12093c
Mill Chen [Mon, 25 Mar 2019 23:07:47 +0000 (16:07 -0700)]
Broadcast an intent after turning off Grayscale
Settings will send a broadcast when the user disable Grayscale in
Settings. Also, Settings registers a broadcast receiver to monitor the
status changed of Grayscale.
Bug:
118387886
Test: robotests
Change-Id: I92d1b9adf7a600b4abac943ebbd5a11d02d3d1b8
Salvador Martinez [Fri, 22 Mar 2019 20:42:39 +0000 (13:42 -0700)]
Flip the preference for sticky battery saver
Instead of toggled on being to keep battery saver on, the UX
writers would like to make toggled on be turn battery saver off
automatically. Also turns the controller into a
TogglePreferenceController, because those exist apparently.
Test: visual inspection, tests pass
Fixes:
126938839
Change-Id: Iffac536d0b1956d4534ca1b5fa5c6440c4d3a3ff
Salvador Martinez [Tue, 26 Mar 2019 17:42:51 +0000 (10:42 -0700)]
Add a help URI for each ManageApplications subclass
This just adds the ability to add help pages to each ManageApplications
subclass. We can remove any we don't end up needing later.
Test: robotests pass
Bug:
121442558
Change-Id: I7aac30aa081d93efaa473248cf259e45ae63870c
Fan Zhang [Tue, 26 Mar 2019 17:38:15 +0000 (17:38 +0000)]
Merge "Take out debugging log for blank suggestions"
Anthony Tripaldi [Tue, 26 Mar 2019 14:55:17 +0000 (10:55 -0400)]
Add Live Caption preference to Accessibility page.
This reverts commit
fa27a88292c974eed478fe6a09c3b8be235441d4.
The original was only a temporary revert in order to remove from initial beta release for dogfooding before the feature was ready.
Reason for revert: b/
123652115
Bug:
123652115
Test: manual
Change-Id: Id647c2992e30289d72a4f6144829a997677be3fa
Fan Zhang [Mon, 25 Mar 2019 22:12:12 +0000 (15:12 -0700)]
Update search keywords for some pages.
Fixes:
129016511
Test: reindex
Change-Id: I73f7094168b00ecd92958c1760fde0dbd634bef9
TreeHugger Robot [Tue, 26 Mar 2019 16:14:17 +0000 (16:14 +0000)]
Merge "[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type"
TreeHugger Robot [Tue, 26 Mar 2019 15:12:24 +0000 (15:12 +0000)]
Merge "Add a different Wi-Fi Easy Connect entry point"
TreeHugger Robot [Tue, 26 Mar 2019 13:19:27 +0000 (13:19 +0000)]
Merge "Update the background color of dismissal view to align with notification"
Tony Zhu [Tue, 26 Mar 2019 11:41:58 +0000 (11:41 +0000)]
Merge "Fix VoLTE toggle names for all carriers."
Yi-Ling Chuang [Tue, 26 Mar 2019 07:39:50 +0000 (15:39 +0800)]
Update the background color of dismissal view to align with
notification
Bug:
126214056
Test: visual
Change-Id: Ib5c187d9259b64bcf2081ef911aa2d953248239d
Yi-Ling Chuang [Tue, 26 Mar 2019 07:02:35 +0000 (15:02 +0800)]
Take out debugging log for blank suggestions
Fixes:
120629936
Test: rebuild
Change-Id: Icabfea8e636bf20bed7b174fc3082949ac37721c
Jason Chiu [Tue, 26 Mar 2019 04:21:53 +0000 (12:21 +0800)]
Fix broken tests in WifiSliceTest
Fixes:
129293669
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.wifi.slice
Change-Id: I70bbeb1fcf01ff0569c937c5dd5c9cfa2e8f9b3c
Raff Tsai [Tue, 26 Mar 2019 05:16:21 +0000 (05:16 +0000)]
Merge "Fix broken settings tests"
tonyzhu [Fri, 22 Mar 2019 08:40:36 +0000 (16:40 +0800)]
Fix VoLTE toggle names for all carriers.
Change default from "Enhanced 4G LTE Mode" to "VoLTE".
Add 4g calling and its sub summary.
Show carreirs VoLTE toggle names by carrier config.
Bug:
129112234
Bug:
129153582
Test: Use commands to override carrier config to observe the
UI as expected.
Change-Id: I1d418873a661b3c20c5a6d0a056dcb2573742c65
Xiangyu/Malcolm Chen [Tue, 26 Mar 2019 01:59:58 +0000 (01:59 +0000)]
Merge "Clean up a few names of Telephony intent extra."
Arc Wang [Thu, 21 Mar 2019 08:52:20 +0000 (16:52 +0800)]
Add a different Wi-Fi Easy Connect entry point
To separate it further from Wi-Fi sharing as it was
causing some confusion.
Bug:
129031195
Test: manual test
Change-Id: Ia55e3ed91e92c3ec36ae6a9401897c5c960762da
Arc Wang [Tue, 26 Mar 2019 01:36:26 +0000 (01:36 +0000)]
Merge "Add divider line in Preference for scan QR code button and share hotspot button"
jackqdyulei [Mon, 25 Mar 2019 22:40:05 +0000 (15:40 -0700)]
Fix broken settings tests
1. Mark a few as Ignore with bug number
2. Remove some tests since it is covered in other places
3. Fix some tests
I think we should make tests at least green asap.
Bug:
129159331
Test: RunSettingsRoboTests
Change-Id: I90971b416806e4e9be249b06ad5abfb73d9d7c23
Lei Yu [Mon, 25 Mar 2019 22:53:04 +0000 (22:53 +0000)]
Merge "Fix broken bluetooth robo tests"
Hai Shalom [Mon, 25 Mar 2019 21:40:59 +0000 (14:40 -0700)]
[WPA3] Initialize Suite-B ciphers correctly based on the CA cert type
Initialize Suite-B ciphers correctly based on the CA cert type. Read the
cert type from key store, parse it and get the signature algorithm.
Enforce SHA384, and initialize AllowedSuiteBCiphers based on the
certificate type: RSA or ECSDA.
Wi-Fi alliance requires the use of both ECDSA secp384r1 and RSA 3072
certificates in WPA3-Enterprise 192-bit security networks, which are
also known as Suite-B-192 netowkrs, even though NSA Suite-B-192 mandates
ECDSA only. The use of the term Suite-B was already coined in the
IEEE 802.11-2016 specification for AKM 00-0F-AC but the test plan for
WPA3-Enterprise 192-bit for APs mandates support for both RSA and ECDSA,
and for STAs it mandates ECDSA and optionally RSA. In order to be
compatible with all WPA3-Enterprise 192-bit deployments,
Bug:
128861164
Test: Verify Suite-B initialized correctly with RSA and ECDSA certs.
Test: Associate to SUITE_B_192 AP with RSA certificate
Test: Associate to SUITE_B_192 AP with ECDSA certificate
Change-Id: I5e8b6794e68ed3af5f8c8beac622fff8076a46a1
TreeHugger Robot [Mon, 25 Mar 2019 20:56:14 +0000 (20:56 +0000)]
Merge "Strings changes for opportunistic mobile networks"
jackqdyulei [Mon, 25 Mar 2019 20:15:30 +0000 (13:15 -0700)]
Fix broken bluetooth robo tests
Bug:
129159331
Test: RunSettingsRoboTests
Change-Id: I3e64659e59fd9b2ac58bf697116e1ee34928a3cd
Antony Sargent [Mon, 25 Mar 2019 17:59:29 +0000 (10:59 -0700)]
Strings changes for opportunistic mobile networks
-Summary for opportunistic networks on multi-network header on the
Network & internet home page. There are two strings we need here for
when the network is configured but isn't being actively used: "In
range" (e.g. we would be using it for data, but we already have a wifi
connection) and "Not in range".
-Summary of the mobile data switch for opportunistic networks: "Phone
will automatically switch to this carrier when in range".
Bug:
127529917
Bug:
128859152
Test: compile
Change-Id: I25e2f359790db6cfc328831c9bd06c172c9d9ad3
Soonil Nagarkar [Mon, 25 Mar 2019 17:50:16 +0000 (10:50 -0700)]
Fix control flow bug in preference controller
BUG:
118908907
Test: manual
Change-Id: I5300309a13833e278902c75090c9f7de43d6e2b7
Winson Chung [Mon, 25 Mar 2019 16:58:11 +0000 (16:58 +0000)]
Merge "Updating settings to use resource overlay instead of setting."
Salvador Martinez [Mon, 25 Mar 2019 15:43:59 +0000 (15:43 +0000)]
Merge "Add dark mode strings"
TreeHugger Robot [Mon, 25 Mar 2019 14:27:28 +0000 (14:27 +0000)]
Merge "Do no crash when profile is deleted"
cosmohsieh [Mon, 25 Mar 2019 08:26:19 +0000 (16:26 +0800)]
Fix inconsistent border width in QR code scanning camera
1) Fix border width become larger in the corner.
2) Correct border width
Bug:
127654782
Test: manual
Change-Id: I792ac571b5c59d14af82848698d76cb59a2f4249
Winson Chung [Thu, 7 Mar 2019 00:11:53 +0000 (16:11 -0800)]
Updating settings to use resource overlay instead of setting.
Bug:
127366543
Test: Manual test on device
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationLegacyPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationSwipeUpPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationEdgeToEdgePreferenceControllerTest
Change-Id: I021d05a21e00136c6f3651247964319274bdab91
TreeHugger Robot [Mon, 25 Mar 2019 05:53:50 +0000 (05:53 +0000)]
Merge "Import translations. DO NOT MERGE"
Bill Yi [Mon, 25 Mar 2019 05:42:26 +0000 (22:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
e6d11ed962 -s ours
am:
2fab42da0a -s ours
am skip reason: subject contains skip directive
Change-Id: I9c0510407818d9b5ebc12954d029e53f6f5574b5
Bill Yi [Mon, 25 Mar 2019 05:38:25 +0000 (22:38 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
e6d11ed962 -s ours
am skip reason: subject contains skip directive
Change-Id: I144c24a4b3c2dcab4693d0f5eb45a2df29b2c380
Bill Yi [Sun, 24 Mar 2019 22:43:53 +0000 (15:43 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: Id87c2f36401630b5a5e6b1537ec2a44340cadbec
Bill Yi [Sun, 24 Mar 2019 21:26:02 +0000 (14:26 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ic074f6ea5240dba0cc33def268871adc3a3a9f69
Auto-generated-cl: translation import
Bill Yi [Sun, 24 Mar 2019 06:37:59 +0000 (23:37 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2ac8a855320e331141528a7007f220b587b06535
Auto-generated-cl: translation import
Bill Yi [Sat, 23 Mar 2019 17:58:45 +0000 (10:58 -0700)]
Import translations. DO NOT MERGE
Change-Id: I2f73ce8833edd4dacc89d18a45c600deea9f2e29
Auto-generated-cl: translation import
Andrew Sapperstein [Sat, 23 Mar 2019 02:51:06 +0000 (02:51 +0000)]
Merge "Update eSIM deletion strings."
TreeHugger Robot [Sat, 23 Mar 2019 02:17:28 +0000 (02:17 +0000)]
Merge "Add String for new graph from Privacy screen"
Hall Liu [Sat, 23 Mar 2019 02:13:33 +0000 (02:13 +0000)]
Merge "Show the disclaimer regarding WFC location privacy policy"
TreeHugger Robot [Sat, 23 Mar 2019 01:53:22 +0000 (01:53 +0000)]
Merge "String changes for some SIM switch confirmation dialogs"
Malcolm Chen [Sat, 23 Mar 2019 00:59:00 +0000 (17:59 -0700)]
Clean up a few names of Telephony intent extra.
Bug:
128645056
Test: build
Change-Id: I5d47b132abb722282bd10b9fbb362fb1f1d32f11
TreeHugger Robot [Sat, 23 Mar 2019 00:39:57 +0000 (00:39 +0000)]
Merge "Adding strings for heap dump dev options."
TreeHugger Robot [Fri, 22 Mar 2019 23:49:32 +0000 (23:49 +0000)]
Merge "Add new sticky battery saver strings"
Antony Sargent [Fri, 22 Mar 2019 23:30:30 +0000 (16:30 -0700)]
String changes for some SIM switch confirmation dialogs
These are changes for strings used in two scenarios:
-When switching which SIM is used for mobile data. This is an update to
some existing strings.
-Enabling an eSIM when another one is already enabled (so the first one
will need to be disabled). These are new strings.
Bug:
129156640
Test: compile, plus manual (run a device in DSDS mode, go to details for
SIM that isn't currently used for mobile data, and tap on mobile data
switch)
Change-Id: Ie9dfe23c466cb454bbad916ba83b833967a0da0e
Salvador Martinez [Fri, 22 Mar 2019 22:38:43 +0000 (15:38 -0700)]
Add dark mode strings
This adds some dark mode strings and also tweaks the title string
for the preference.
Test: phone boots
Bug:
124252163
Change-Id: I32b8eda6d28ba03dd895a36db536ce5334713f9a
Lei Yu [Fri, 22 Mar 2019 22:03:53 +0000 (22:03 +0000)]
Merge "Add fp icon with background shape"
Kweku Adams [Fri, 22 Mar 2019 18:01:17 +0000 (11:01 -0700)]
Adding strings for heap dump dev options.
This is taken from http://ag/
6794787.
Bug:
77490269
Test: N/A
Change-Id: I37e6abe2e58c0d68bd8dc66a4a715608e7e18484
Ryan Mitchell [Fri, 22 Mar 2019 21:39:41 +0000 (21:39 +0000)]
Merge "Fix Settings test that uses OverlayInfo"
TreeHugger Robot [Fri, 22 Mar 2019 21:33:19 +0000 (21:33 +0000)]
Merge "Strings for erase SIM preference"
Salvador Martinez [Fri, 22 Mar 2019 21:05:30 +0000 (14:05 -0700)]
Add new sticky battery saver strings
Adds some strings we'll need to update the preference for sticky
battery saver.
Test: phone boots
Bug:
126938839
Change-Id: I6e7f78f832490e2fe003418bac4d2caec60ddbac
Salvador Martinez [Fri, 22 Mar 2019 20:52:13 +0000 (20:52 +0000)]
Merge "Rename battery saver schedule mode apis"
TreeHugger Robot [Fri, 22 Mar 2019 20:37:21 +0000 (20:37 +0000)]
Merge "Switch some strings to 'Downloaded SIM' instead of 'eSIM'"
Andrew Sapperstein [Thu, 7 Mar 2019 22:18:15 +0000 (14:18 -0800)]
Update eSIM deletion strings.
Adds some conditional behavior for the confirmation screens.
When the erase eSIM option is visible and checked, shows alternate string.
Fixes:
126262481
Fixes:
118751918
Test: visual inspection & make -j RunSettingsRoboTests
Change-Id: I40f983b03ad470d785bf104e645dbc92e7897d2d
jackqdyulei [Tue, 19 Mar 2019 17:18:19 +0000 (10:18 -0700)]
Add fp icon with background shape
Fixes:
126425211
Test: RunSettingsRoboTests
Change-Id: I779f76f597b80d73b6dd6eb9e43a96abc9fee0bb
tmfang [Fri, 22 Mar 2019 15:41:08 +0000 (23:41 +0800)]
Add String for new graph from Privacy screen
Test: rebuild
Bug:
129132950
Change-Id: I25b9edf80d0ed11e504724d475d902eac485f85d
TreeHugger Robot [Fri, 22 Mar 2019 18:35:58 +0000 (18:35 +0000)]
Merge "Updated privacy settings to launch custom content capture settings when available."
Antony Sargent [Fri, 22 Mar 2019 16:41:20 +0000 (09:41 -0700)]
Switch some strings to 'Downloaded SIM' instead of 'eSIM'
We also added a '/' divider to distinguish the two bits of state that
these strings convey - active vs inactive, and SIM vs eSIM (aka
downloaded sim).
Fixes:
127821561
Test: m Settings
Change-Id: Ibaa611bb5585dd9797e4db2fb4d684274be26791
Antony Sargent [Fri, 22 Mar 2019 15:49:14 +0000 (08:49 -0700)]
Strings for erase SIM preference
These are strings for a preference and its associated dialogs allowing a
user to erase an eSIM profile.
Bug:
124254555
Test: m Settings
Change-Id: Ieb57121544687ff96ad2c939144497aaf7d29367
TreeHugger Robot [Fri, 22 Mar 2019 17:21:15 +0000 (17:21 +0000)]
Merge "Add unofficial intent for BatterySaverSchedule screen"
Salvador Martinez [Thu, 21 Mar 2019 16:51:28 +0000 (09:51 -0700)]
Rename battery saver schedule mode apis
The APIs that back these settings got renamed so this CL just
refactors all the calls to use the new names.
Test: robotests still pass
Bug:
126944845
Change-Id: I2975c7c79998823058db2c0ced2e5cf02216a106
Alex Kershaw [Fri, 22 Mar 2019 16:44:19 +0000 (16:44 +0000)]
Merge "Add new policy transparency UI strings."
Irina Dumitrescu [Fri, 22 Mar 2019 16:12:39 +0000 (16:12 +0000)]
Merge "Fail the screen lock flow if the old password has already changed."
Ryan Mitchell [Fri, 22 Mar 2019 15:10:20 +0000 (08:10 -0700)]
Fix Settings test that uses OverlayInfo
Now that targetOverlayableName has been added to OverlayInfo, the tests
that construct the info objects must be fixed.
Bug:
128830059
Test: atest SettingsRoboTestStub
Change-Id: I2cee25e417ec643f758ebe40551cc97b1f0828ac
Felipe Leme [Wed, 20 Mar 2019 15:54:56 +0000 (08:54 -0700)]
Updated privacy settings to launch custom content capture settings when available.
Test: manual verification
Test: atest EnableContentCapturePreferenceControllerTest \
CtsContentTestCases:android.content.cts.AvailableIntentsTest#testRequestEnableContentCaptureIntent
Test: adb shell am start-activity -a android.settings.REQUEST_ENABLE_CONTENT_CAPTURE
Fixes:
119264902
Change-Id: I2a030c31d966d40feb6ba449e4bbc9ef8cf0565b
Rubin Xu [Fri, 22 Mar 2019 15:06:56 +0000 (15:06 +0000)]
Do no crash when profile is deleted
Catch the exception and finish the activity.
Change-Id: I45deec32fd49119ab7943a941158bca82b63c432
Fix:
122823738
Test: manual
TreeHugger Robot [Fri, 22 Mar 2019 13:57:29 +0000 (13:57 +0000)]
Merge "More strings for bubble settings"
Alex Kershaw [Thu, 21 Mar 2019 12:35:11 +0000 (12:35 +0000)]
Add new policy transparency UI strings.
This will ultimately be used in CL
Iffbe4d466e4dc8ba5255b8a37d828da09b52a3b3.
Bug:
123930863
Test: Not applicable
Change-Id: I7ed8ebc97e34dd7f1ea5f82244686ab3723646b9
TreeHugger Robot [Fri, 22 Mar 2019 12:51:10 +0000 (12:51 +0000)]
Merge "Add strings for "swipe to dismiss" bottom bar style."
Irina Dumitrescu [Thu, 28 Feb 2019 15:35:36 +0000 (15:35 +0000)]
Fail the screen lock flow if the old password has already changed.
Test: atest RunSettingsRoboTests
Bug:
120039091
Change-Id: Ib0860ccbc1ba84a2ac8dafcf3cf33f6ddf160e4c
TreeHugger Robot [Fri, 22 Mar 2019 11:29:42 +0000 (11:29 +0000)]
Merge "Handle navigation back problem from About Phone"
Lucas Lin [Fri, 22 Mar 2019 10:28:52 +0000 (03:28 -0700)]
[automerger skipped] Merge "Modify dialog message for partial connectivity" am:
f467ee4a28 am:
8701e18275
am:
0fa267fd0b -s ours
am skip reason: change_id I0e87f6f2ede173f45a7b6fcf842b4f9a83d8efa1 with SHA1
7335c594be is in history
Change-Id: I7a1e1ca059c0f61cbe29ea0576542c46bf1b0317
Arc Wang [Fri, 22 Mar 2019 09:05:01 +0000 (17:05 +0800)]
Add divider line in Preference for scan QR code button and share hotspot button
Use com.android.settingslib.R.layout.preference_two_target in
WifiTetherSsidPreference to add divider line.
Bug:
128940862
Test: manual test
Change-Id: I46dabcee31a91b68b8c2e57c9840a59f8a1be304
Yi-Ling Chuang [Fri, 22 Mar 2019 08:25:13 +0000 (16:25 +0800)]
Add strings for "swipe to dismiss" bottom bar style.
Bug:
126214056
Test: rebuild
Change-Id: I823d1c0ed82d81f415f303810197246ede15690d
TreeHugger Robot [Fri, 22 Mar 2019 08:18:16 +0000 (08:18 +0000)]
Merge "Revert "Add divider line in Preference for scan QR code button and share hotspot button""
Sunny Shao [Fri, 22 Mar 2019 07:22:36 +0000 (15:22 +0800)]
Handle navigation back problem from About Phone
Removed the android:parentActivityName attribute in .Settings$MyDeviceInfoActivity.
Fixes:
128941539
Test: manual test & view
Change-Id: Id5929bd8bcd8b136610fff76e406f62b2ffef8c2
TreeHugger Robot [Fri, 22 Mar 2019 06:48:36 +0000 (06:48 +0000)]
Merge "Change suggestion dismiss day"
Xiangyu/Malcolm Chen [Fri, 22 Mar 2019 06:48:23 +0000 (06:48 +0000)]
Merge "Move SIM select logic from SimSelectNotification to Telephony."