OSDN Git Service
TreeHugger Robot [Fri, 6 Dec 2019 01:05:30 +0000 (01:05 +0000)]
Merge changes from topic "update_battery_icon" into qt-qpr1-dev
* changes:
Sync dimen from SystemUI
Battery icon is too large
TreeHugger Robot [Thu, 5 Dec 2019 18:33:31 +0000 (18:33 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Thu, 5 Dec 2019 11:22:50 +0000 (03:22 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5889a4f6f9637d34eb5df1f844770dd68cc04e39
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 5 Dec 2019 02:49:13 +0000 (02:49 +0000)]
Merge "Always use local timezone for parsing date" into qt-qpr1-dev
Tsung-Mao Fang [Tue, 3 Dec 2019 08:57:00 +0000 (16:57 +0800)]
Always use local timezone for parsing date
Use local time zone to be in line with entry
in phonesky mainline module.
Test: Rebuild
Bug:
143357811
Change-Id: I1ecf57ec7952cff580af932e58c453622d4536f0
Jay Aliomer [Wed, 27 Nov 2019 22:46:58 +0000 (17:46 -0500)]
Battery saver mode should disable dark mode modification
disable toggle options and disable the dark theme drop down selection
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes:
145098277
Fixes:
145297188
Fixes:
145254016
Change-Id: I5c81a295810cc2d9a45657978104647e9c15da46
timhypeng [Fri, 15 Nov 2019 04:01:26 +0000 (12:01 +0800)]
Sync dimen from SystemUI
Bug:
141139595
Test: manual
Change-Id: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
(cherry picked from commit
3dd4f2cc19f4390db253e121a24157d4169b3a7a)
Merged-In: Ifa9a31750b9a926e09aec9262aa89e8de66c91e2
timhypeng [Thu, 14 Nov 2019 02:53:32 +0000 (10:53 +0800)]
Battery icon is too large
-sync layout from SystemUI
Bug:
141139595
Test: make -j42 RunSettingsRoboTests
Change-Id: I5e165e953682fcfdebf0d06475bb1abd171684d9
(cherry picked from commit
c71f996da97a520a90afbccac4eb4d4d16435bec)
Merged-In: I5e165e953682fcfdebf0d06475bb1abd171684d9
Bill Yi [Sun, 24 Nov 2019 12:38:04 +0000 (04:38 -0800)]
Import translations. DO NOT MERGE
Change-Id: I0258ef130ec225a374ae445da558755f621556d0
Auto-generated-cl: translation import
Jay Aliomer [Fri, 22 Nov 2019 22:29:43 +0000 (22:29 +0000)]
Merge "Revert "Revert "Add settings for scheduling dark theme""" into qt-qpr1-dev
Jay Aliomer [Fri, 22 Nov 2019 14:51:08 +0000 (14:51 +0000)]
Revert "Revert "Add settings for scheduling dark theme""
This reverts commit
50c0fa136ce54dab58a0eb1dd094f9ced6e39a5e.
Reason for revert: Fixed the error which is code incompatibility
Test: run all settings tests
Change-Id: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Merged-In: I8f05b50f8198c4b2565bb9b6f62ddda5029c8365
Bug:
141567787
Bill Yi [Fri, 22 Nov 2019 18:44:01 +0000 (10:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I64d2c2f4a3053bf7d163962d8a27929fd055b24b
Auto-generated-cl: translation import
Hai Shalom [Fri, 22 Nov 2019 03:46:02 +0000 (03:46 +0000)]
Merge "Revert submission" into qt-qpr1-dev
Hai Shalom [Thu, 21 Nov 2019 19:23:09 +0000 (19:23 +0000)]
Revert submission
Reason for revert: Incomplete fix that causes additional issues which were not anticipated earlier.
Change-Id: I65868205cc8241f8179006256e6e13698ad79d64
Merged-In: I5f3a6e31dc96fbc016e6ab5f56c3c68eb9e7723f
Preston O'Neal [Thu, 21 Nov 2019 22:41:18 +0000 (22:41 +0000)]
Merge "Revert "Add settings for scheduling dark theme"" into qt-qpr1-dev
Preston O'Neal [Thu, 21 Nov 2019 22:09:53 +0000 (22:09 +0000)]
Revert "Add settings for scheduling dark theme"
This reverts commit
7141b142dfb21433d8a9465d38f6b7f714a0adbc.
Reason for revert: This is breaking builds on git_qt-qpr1-dev
Change-Id: I7766826d3fc86a12fc8411b027a52eceb5a66019
Jay Aliomer [Thu, 21 Nov 2019 21:44:41 +0000 (21:44 +0000)]
Merge "DarkUIPreferenceController null exception" into qt-qpr1-dev
Jay Aliomer [Thu, 21 Nov 2019 15:44:57 +0000 (10:44 -0500)]
DarkUIPreferenceController null exception
The DarkUIPreferenceController doesnt need to show dialog in all cases
we added a null check for mFragment
Fixes:
144899194
Test: atest DarkUIPreferenceControllerTest
Change-Id: Ia5ed89bd46f28f4b92d955911223f9157e55c622
(cherry picked from commit
c49f266af0f834ef6db1d53fab80ab8fbfcbb382)
Jay Aliomer [Thu, 24 Oct 2019 17:42:38 +0000 (13:42 -0400)]
Add settings for scheduling dark theme
Adding a settings page similar to night light for Dark theme. it will allow the user to schedule
dark mode from sunrise to sunset
Test: make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.DarkUIPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeActivationPreferenceControllerTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeObserverTest" && \
make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.display.darkmode.DarkModeScheduleSelectorControllerTest"
Fixes:
141567787
Change-Id: I3094b655c04f59c23a95162a1be5ee8260e28a48
(cherry picked from commit
0828e6be9c0a6921b27d3e9da506ad4b7b5b14cc)
TreeHugger Robot [Tue, 19 Nov 2019 01:26:30 +0000 (01:26 +0000)]
Merge "Add a dark theme slice" into qt-qpr1-dev
Hai Shalom [Mon, 18 Nov 2019 21:29:41 +0000 (21:29 +0000)]
Merge "[WPA3] Hide connect button for cloned networks not in range" into qt-qpr1-dev
TreeHugger Robot [Sat, 16 Nov 2019 02:04:24 +0000 (02:04 +0000)]
Merge "Fix non responding slice toggling" into qt-qpr1-dev
Hai Shalom [Fri, 15 Nov 2019 21:39:00 +0000 (13:39 -0800)]
[WPA3] Hide connect button for cloned networks not in range
Cloned networks are WPA2 or Open networks that have a WPA3 or OWE
cloned networks with the same SSID and credentials. When an AP
in transition mode is in the area, the scan results will only
report the higher security level. In order to prevent a case
where the user forcely connects to the AP with the lower security,
disable this option for those networks. Otherwise, it will look
that Wi-Fi is connected, but Wi-Fi picker will not show a connected
network.
Bug:
143843364
Test: Manual test
Change-Id: Id002b109bd056105ec8335acd298fa3b314c73f3
Merged-In: I7244c41d3bf12ba573c3cfca077d0ac2cfdcf5ed
Bill Yi [Fri, 15 Nov 2019 20:09:15 +0000 (12:09 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8c576fcd3e758334750e0fa24253cff9ee95466b
Auto-generated-cl: translation import
Sunny Shao [Mon, 4 Nov 2019 06:51:05 +0000 (14:51 +0800)]
Add a dark theme slice
Fixes:
142476879
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.homepage.contextualcards.slices.DarkThemeSliceTest
Change-Id: I4865c3c4a807bc4ac96762a882b193a3e2595019
Yi-Ling Chuang [Mon, 7 Oct 2019 02:24:27 +0000 (10:24 +0800)]
Fix non responding slice toggling
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.
Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to
prevent from getting PendingIntent.CancelExcpetion from SliceActionView
when toggling slices.
This change only applies on those auto converted Slices.
Bug:
140719905
Test: toggle slices in Settings Search and NGA
Change-Id: Iff724ce5f6a1e6a7d9ca85b8ce76539a72e72964
Merged-In: Iff724ce5f6a1e6a7d9ca85b8ce76539a72e72964
(cherry picked from commit
ddf6cefcaccf669150bb4d61e37c1d78ccbe91b0)
Jason Chiu [Mon, 28 Oct 2019 10:17:04 +0000 (18:17 +0800)]
Fix Settings creating too many threads unexpectedly
Limit the number of threads by using the shared thread pool in
ThreadUtils.
Bug:
143434413
Test: manual
Change-Id: I4afe1f641a11e218616772c1d5446efcc99cd1cc
Merged-In: I4afe1f641a11e218616772c1d5446efcc99cd1cc
(cherry picked from commit
3e4c47dbc090310edcf14b1c5094259f74ff0525)
Bill Yi [Sat, 9 Nov 2019 07:40:50 +0000 (23:40 -0800)]
Import translations. DO NOT MERGE
Change-Id: I5b9dc323282c81680df423e4df855f9f25e3c028
Auto-generated-cl: translation import
Sunny Shao [Tue, 29 Oct 2019 08:20:48 +0000 (16:20 +0800)]
Fix the MMS messages toggle preference not working
- MMS messages toggle preference doesn't work while the default Mobile data is on then switches off.
- Recall the displayPreference to execute the preference.setOnPreferenceChangeListener
in the AbstractPreferenceController.
Fixes:
143204818
Test: make RunSettingsGoogleRoboTests -j ROBOTEST_FILTER=com.android.settings.network.telephony.MmsMessagePreferenceControllerTest
Change-Id: Ida65d04b095b7d2556fa5bdd93be7a67cba77206
Merged-In: Ida65d04b095b7d2556fa5bdd93be7a67cba77206
(cherry picked from commit
054e0eab872a795d81efce7629d03845e9bfb92c)
TreeHugger Robot [Tue, 5 Nov 2019 05:34:41 +0000 (05:34 +0000)]
Merge "Fix Battery page animation" into qt-qpr1-dev
Raff Tsai [Mon, 19 Aug 2019 08:40:36 +0000 (16:40 +0800)]
Fix Battery page animation
TextView summary1 has default height 2 line. If the content is longer
than 2 line, the TextView increases itself which causes the animation.
By increasing minLines to 3, it can avoid the animation. And remove
summary2 because it is only for debug purpose, the debug information
can be merged to summary1.
Fixes:
139554919
Test: visual, make RunSettingsRoboTests
Change-Id: I167ac87c9bd83035e00d4991961599e76f4f69e1
(cherry picked from commit
648ada031d932adc73a2a521473d2c7309a16139)
Merged-In: I167ac87c9bd83035e00d4991961599e76f4f69e1
Bill Yi [Sun, 3 Nov 2019 00:25:40 +0000 (17:25 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie3137ceba6f623d0a7aa1176166930b522dee60e
Auto-generated-cl: translation import
Kevin Chyn [Fri, 1 Nov 2019 17:01:32 +0000 (17:01 +0000)]
Merge "Revert "Remove attention controller"" into qt-qpr1-dev
Kevin Chyn [Fri, 18 Oct 2019 18:19:18 +0000 (18:19 +0000)]
Revert "Remove attention controller"
Bug:
142979808
This reverts commit
8e1d1ca3abbd35530019318361afd99901840d38.
Change-Id: I78b7572bcb384de2984f4d81946aceb03aec6758
Kevin Chyn [Sat, 19 Oct 2019 00:54:36 +0000 (00:54 +0000)]
Revert "Update attention string"
Bug:
142979808
This reverts commit
821fbc83a1f5ec3c914a37821b218471f0bc8431.
Change-Id: Ibe426d3175b8b44fadaf78316201031f229d736e
Bill Yi [Thu, 31 Oct 2019 01:50:23 +0000 (18:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I7256e981ee4f567d1b09dce74e476375f4f58bb3
Auto-generated-cl: translation import
Bill Yi [Sun, 27 Oct 2019 15:01:49 +0000 (08:01 -0700)]
Import translations. DO NOT MERGE
Change-Id: I519674aef33bc822977cf0e00edf02aff7b8245f
Auto-generated-cl: translation import
Bill Yi [Sat, 19 Oct 2019 07:50:29 +0000 (00:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0d35ecce542fee9f4f6367d2a11a4cca2d4b4b60
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 17 Oct 2019 01:32:14 +0000 (01:32 +0000)]
Merge "Fix non responding slice toggling problem." into qt-qpr1-dev
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong
Bug:
142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Bill Yi [Sun, 6 Oct 2019 22:03:16 +0000 (15:03 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
aa605a2ff8 -s ours
am skip reason: subject contains skip directive
Change-Id: I67820e45b4aceb3a9d3c141cc3be69e899551e2e
TreeHugger Robot [Sun, 6 Oct 2019 19:48:23 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sun, 6 Oct 2019 14:50:11 +0000 (07:50 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ie4fdf91f299defd2a361d76455093db5a410d0d6
Auto-generated-cl: translation import
Bill Yi [Sun, 6 Oct 2019 14:36:10 +0000 (07:36 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1af1cc81e5fffb4ead2146f8871efa5115f91be2
Auto-generated-cl: translation import
Yi-Ling Chuang [Fri, 27 Sep 2019 04:21:59 +0000 (12:21 +0800)]
Fix non responding slice toggling problem.
The issue happens when users are toggling slices. Sometimes the toggle
doesn't work as expected because the pending intent of the toggle action
seems to be canceled for some reasons.
Hence, we replace FLAG_CANCEL_CURRENT with FLAG_UPDATE_CURRENT to prevent from
getting PendingIntent.CancelExcpetion from SliceActionView when toggling
slices.
Note that this change would only apply on Wifi, MobileData, Flashlight
and Bluetooth Slices.
Bug:
140719905
Test: rebuild and switch toggles
Change-Id: Iddbb16ddcbcf97b6f6e680b43645c04fbc061f39
SongFerngWang [Fri, 30 Aug 2019 08:06:41 +0000 (16:06 +0800)]
Preferred network list add 5G item
Preferred network list add 5G item, and change "recommended" from 4G to
5G, and add summary for 5G.
Bug:
138544359
Test: 1.fake the device network type bitmask to 5G, UI show 5G list
2.atest EnabledNetworkModePreferenceControllerTest.java :pass
Change-Id: I4a78e2e7fbb067ce841df4aaf1d5161607fdcf90
SongFerngWang [Fri, 23 Aug 2019 10:03:27 +0000 (18:03 +0800)]
RadioInfo network mode list and network mode string add 5G
Bug:
131888757
Test: 1.build pass 2.RadioInfo set network mode work.
Change-Id: I945d3c2fd175f45151bbeee475e388ccc2d67642
Bill Yi [Wed, 2 Oct 2019 23:55:04 +0000 (16:55 -0700)]
Import translations. DO NOT MERGE
Change-Id: I33d1ef5a92b84fc166b35f7b5b341e7a92b35820
Auto-generated-cl: translation import
Bonian Chen [Wed, 2 Oct 2019 02:44:34 +0000 (02:44 +0000)]
Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 23:05:46 +0000 (16:05 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
141777841
Change-Id: I5ef0e8ee2f723c81d4cc1c0be5daf311c7c38e84
TreeHugger Robot [Tue, 1 Oct 2019 22:08:03 +0000 (22:08 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Joshua Mccloskey [Tue, 1 Oct 2019 22:05:41 +0000 (22:05 +0000)]
Merge "Added new string." into qt-qpr1-dev
Bill Yi [Tue, 1 Oct 2019 19:53:15 +0000 (12:53 -0700)]
Import translations. DO NOT MERGE
Change-Id: I594742575ea6729d9c71e0ef04658f6513875aaf
Auto-generated-cl: translation import
Bonian Chen [Mon, 9 Sep 2019 07:10:13 +0000 (15:10 +0800)]
[Settings Telephony] Carrier name API replacement
Replacing TelephonyManager.getNetworkOperatorName() by
Obtaining carrier name from SubscriptionInfo.getCarrierName().
TelephonyManager.getNetworkOperatorName() only be used when there's no
SubscriptionInfo can be found.
Bug: b/
140443508
Test: Manual testing
atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
Bill Yi [Mon, 30 Sep 2019 10:35:57 +0000 (03:35 -0700)]
Import translations. DO NOT MERGE
Change-Id: I10e5b04a3a580ba34f945305d011ac192a3c4dd3
Auto-generated-cl: translation import
TreeHugger Robot [Sat, 28 Sep 2019 21:05:31 +0000 (21:05 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sat, 28 Sep 2019 11:11:34 +0000 (04:11 -0700)]
Import translations. DO NOT MERGE
Change-Id: Idfb9ca3c6ddf6aa0a9bc04a262b8e0fd76032867
Auto-generated-cl: translation import
joshmccloskey [Fri, 27 Sep 2019 22:09:05 +0000 (15:09 -0700)]
Added new string.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: I48e34de15460c93c8f50d26821c4d64984f20c6d
joshmccloskey [Fri, 27 Sep 2019 21:54:38 +0000 (14:54 -0700)]
Changed string for translations.
Fixes:
141762646
Test: Verified that string translates to spanish after changing
the language.
Change-Id: Ieebb2ec15cf5cff2afcfefcb130193bdce6086fe
Kevin Chyn [Fri, 27 Sep 2019 05:01:56 +0000 (22:01 -0700)]
Fix FaceSetupSliceTest
Bug:
141380252
Test: make -j56 RunSettingsRoboTests
Change-Id: Ifb9a29d8f3115759a9e8e93e3721135c6ba229bf
joshmccloskey [Thu, 19 Sep 2019 18:23:29 +0000 (11:23 -0700)]
Added different flow for re-enrollment
In order to enable this new flow, a user must currently have an enrolled
face and the security setting face_unlock_re_enroll must be non-zero.
Ex.
1. Enroll Face.
2. adb shell settings put
(secure face_unlock_re_enroll|secure_face_unlock_must_re_enroll) 1
3. If settings is opened, close it.
4. Open settings
5. Verify the new flow appears.
Bug:
141380252
Bug:
141254937
Test: Verified that the user's face is deleted after clicking delete.
Test: Verified that the user can re-enroll after removing their face.
Change-Id: I2b36a0bda5cb10fb33dfb2a5627d8fa40f14fb7e
joshmccloskey [Tue, 24 Sep 2019 22:07:08 +0000 (15:07 -0700)]
Added mandatory scrolling for FaceIntroduction
Test: Verified in SUW/Settings user must scroll through contents in
order to go to the next screen.
Bug:
141380294
Change-Id: I483ab6ae6a282c81ba2f2c4d1d9d1f21c6cb9453
Bill Yi [Sun, 22 Sep 2019 19:53:43 +0000 (12:53 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
73915b77ed -s ours
am skip reason: subject contains skip directive
Change-Id: Ief64a890db8759f6361b58d304ff4f7e333739c6
TreeHugger Robot [Sun, 22 Sep 2019 19:42:36 +0000 (19:42 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Sun, 22 Sep 2019 14:52:20 +0000 (07:52 -0700)]
Import translations. DO NOT MERGE
Change-Id: I92110fede16a12a445efbd96896e17f46f89a203
Auto-generated-cl: translation import
Bill Yi [Sun, 22 Sep 2019 14:38:24 +0000 (07:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: Ib6e2dcd3084a0399fec672c4fff3a51e8dd0d195
Auto-generated-cl: translation import
Edgar Wang [Sat, 21 Sep 2019 08:54:47 +0000 (08:54 +0000)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
Edgar Wang [Thu, 19 Sep 2019 11:23:01 +0000 (19:23 +0800)]
Handle Aware sensor status for Always On
- "Always On" preference will be hiden when aware
sensor is available
- Extract NavModeCandidateInfo from SystemNavigationGestureSettings
Bug:
136610131
Test: robotest & manual
Change-Id: If58c70549339b66116f19df7193d85bb04e3f1b7
Bonian Chen [Thu, 19 Sep 2019 20:07:20 +0000 (20:07 +0000)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
Bonian Chen [Wed, 11 Sep 2019 06:35:15 +0000 (14:35 +0800)]
[Help Page] Support help content under 2 CDMA SIM
Fix the design for displaying help content.
Launch help content from notification (PendingIntent) could not be resolved correctly.
Route through HelpTrampoline to fix it.
Bug:
139040358
Test: Manual with fake from framework side for dual CDMA SIM
Change-Id: Iff3a6e9095c3908b3c5b1a25e2535bcab1858ae2
joshmccloskey [Tue, 17 Sep 2019 20:04:08 +0000 (13:04 -0700)]
Updated face remove dialog string.
Test: Verified that the correct string shows after deleting
face data.
Fixes:
141145591
Change-Id: I836c79fb4775157ae4995f706e05d1fd1233bc8f
Mady Mellor [Mon, 16 Sep 2019 21:55:52 +0000 (21:55 +0000)]
Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
Bill Yi [Sun, 15 Sep 2019 01:38:18 +0000 (18:38 -0700)]
Import translations. DO NOT MERGE
Change-Id: If6b8f670eb54a3f5b45efa0ba2a540cd25327260
Auto-generated-cl: translation import
Ilya Matyukhin [Fri, 13 Sep 2019 09:10:32 +0000 (09:10 +0000)]
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
Ilya Matyukhin [Wed, 11 Sep 2019 20:58:12 +0000 (13:58 -0700)]
Fix "skip lock screen" not working for a secondary user
Bug:
140878309
Test: "Skip lock screen" is no longer grayed-out for a secondary user
Change-Id: I3aab6582bee07760b671034b0971c98b1c946a1c
Bill Yi [Fri, 13 Sep 2019 00:39:37 +0000 (17:39 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: I9979a3422b5926a7e210ded393484f6eb28e8600
Bill Yi [Thu, 12 Sep 2019 23:10:45 +0000 (16:10 -0700)]
Import translations. DO NOT MERGE
Change-Id: I27cfc6c9ffa9def49d83eea920b88a5ce762fb53
Auto-generated-cl: translation import
Bill Yi [Thu, 12 Sep 2019 22:54:53 +0000 (15:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I1cf797286a22443416d4b401e38f8923bb4edd43
Auto-generated-cl: translation import
TreeHugger Robot [Thu, 12 Sep 2019 20:49:56 +0000 (20:49 +0000)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
TreeHugger Robot [Thu, 12 Sep 2019 08:05:21 +0000 (08:05 +0000)]
Merge "[Wi-Fi] Can't change EAP method for a saved enterprise Wi-Fi network" into qt-qpr1-dev
Bill Yi [Thu, 12 Sep 2019 05:50:27 +0000 (22:50 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
8173de150d -s ours
am skip reason: subject contains skip directive
Change-Id: Ica53f59adc22c9442b6c823abc35a63c2e864d8e
Bill Yi [Thu, 12 Sep 2019 02:26:07 +0000 (19:26 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1b2826dd790519a2946d8505aec03f72b1815f04
Bill Yi [Thu, 12 Sep 2019 02:10:50 +0000 (19:10 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I60bd87b13925d699bc7db9f6f215321ff20eea44
Mady Mellor [Thu, 29 Aug 2019 22:38:40 +0000 (15:38 -0700)]
qt-r1-bubbles-dev @ build
5835883
Test: presubmit setup on source branch
Bug:
129158983
Bug:
136034310
Bug:
137876221
Change-Id: I5ade70c2101d09eed4698ce29bd3242483ec7f8b
Merged-In: If2b813f24cf5998829fe417e32179c5e8283d308
Merged-In: I58f0287ed99a4daf3758316e4004bca05f17b0d1
Bill Yi [Wed, 11 Sep 2019 19:03:00 +0000 (12:03 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am:
09c08d1da0 -s ours
am skip reason: subject contains skip directive
Change-Id: I07fe60817626b45ba59b9e0f823aa7f462533b19
TreeHugger Robot [Wed, 11 Sep 2019 18:41:53 +0000 (18:41 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
TreeHugger Robot [Wed, 11 Sep 2019 18:18:32 +0000 (18:18 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Wed, 11 Sep 2019 05:37:57 +0000 (22:37 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1ee6e4e49b18ed13ab3e431583d316c0663a4f8f
Bill Yi [Wed, 11 Sep 2019 05:24:00 +0000 (22:24 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
64712476
Change-Id: I1163141368fc482f675e7d9dd7b4503dfcd309bf
TreeHugger Robot [Wed, 11 Sep 2019 03:43:27 +0000 (03:43 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
Bill Yi [Wed, 11 Sep 2019 03:15:44 +0000 (20:15 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
c1bfd1f50d -s ours
am skip reason: subject contains skip directive
Change-Id: I6fcd972f09510bdba25fd0732dd37e168d356a70
Bill Yi [Wed, 11 Sep 2019 02:41:30 +0000 (19:41 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ica56884b49d5f16a84096f4c4f34bc0b639ad3e1
Bill Yi [Wed, 11 Sep 2019 01:35:47 +0000 (18:35 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Bug:
140445577
Change-Id: Ife760913fdf573fb8820f604e90fae666cab08e5
Miranda Kephart [Tue, 10 Sep 2019 20:24:04 +0000 (20:24 +0000)]
Merge "Merging from qt-qpr1-sysui-dev @ build
5855545" into qt-qpr1-dev
joshmccloskey [Tue, 10 Sep 2019 06:20:26 +0000 (23:20 -0700)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
am:
ff01d52d50
Change-Id: Idcddf14e8aa3cfcd50b78ed112d51bf06424b840
TreeHugger Robot [Tue, 10 Sep 2019 06:02:39 +0000 (06:02 +0000)]
Merge "Change cancel button type to skip for SUW" into qt-r1-dev
joshmccloskey [Mon, 9 Sep 2019 23:11:27 +0000 (16:11 -0700)]
Change cancel button type to skip for SUW
Test: Verified in SUW that enrollment will skip after
tapping the cancel button in the Introduction.
Fixes:
140702414
Change-Id: I9d9da0ff6d10b6ee6929cb52ff4a03a684f43d17
Miranda Kephart [Fri, 6 Sep 2019 14:40:29 +0000 (10:40 -0400)]
Merging from qt-qpr1-sysui-dev @ build
5855545
Test: manual, presubmit on the source branch
Merged-In: Idc3d5c39427722a5486552312552f7f77ef40980
Merged-In: Ieea5138da3d182735fb92eedd607f52750c91e19
Change-Id: Iefbdac334e3e1807f61e4832f7ac66b9023047f6
Bill Yi [Sun, 8 Sep 2019 01:27:34 +0000 (18:27 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
53e826122d -s ours
am skip reason: subject contains skip directive
Change-Id: Idcf6bcf772195798c2853d81e1ab6623b17bf8df
Bill Yi [Fri, 6 Sep 2019 16:27:30 +0000 (09:27 -0700)]
Import translations. DO NOT MERGE
Auto-generated-cl: translation import
Change-Id: Ie16be62ead2b453c69d0201a5aa5e7ae3411405f
OSDN Git Service
