OSDN Git Service
SongFerngWang [Fri, 11 Oct 2019 15:16:03 +0000 (08:16 -0700)]
String "CDME" is wrong
am:
dfd9aa99e5
Change-Id: I6d3dab30dbd9282a3a6589efebbf5e08a1359c4a
SongFerngWang [Thu, 10 Oct 2019 12:18:30 +0000 (20:18 +0800)]
String "CDME" is wrong
Bug:
142376028
Test: build pass
Change-Id: Ifaed6ca8aba8f34ecb27abb863aeaf679132934f
Android Build Merger (Role) [Sun, 6 Oct 2019 22:10:28 +0000 (22:10 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
aa605a2ff8 -s ours am:
6fa03d4cad -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sun, 6 Oct 2019 22:10:17 +0000 (15:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
aa605a2ff8 -s ours
am:
6fa03d4cad -s ours
am skip reason: subject contains skip directive
Change-Id: I907eb3de51fb2427bc525282a87ceea97581815c
Bill Yi [Sun, 6 Oct 2019 22:10:15 +0000 (15:10 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
aa605a2ff8 -s ours
am:
165a3e6152 -s ours
am skip reason: subject contains skip directive
Change-Id: I22a3b3c49c309e7ccd9424f16841722fd1a228b0
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
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: I8582fd40ccfab6c247144759b8eac47e021b3ee4
Bill Yi [Sun, 6 Oct 2019 20:21:35 +0000 (13:21 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
42eff7e319 -s ours
am skip reason: subject contains skip directive
Change-Id: I35cc62652e4cb9c2a7448b1db141cbba125c6f04
TreeHugger Robot [Sun, 6 Oct 2019 19:48:23 +0000 (19:48 +0000)]
Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
SongFerngWang [Sun, 6 Oct 2019 16:20:09 +0000 (09:20 -0700)]
Preferred network list add 5G item
am:
dd7f9b57f6
Change-Id: I70f89c6c5e5c43107788c58f1fc3ca44383b4ce5
SongFerngWang [Sun, 6 Oct 2019 16:20:06 +0000 (09:20 -0700)]
RadioInfo network mode list and network mode string add 5G
am:
ec384c2f6f
Change-Id: I280fb1f3e0acddcb3a85eee876112e491bd4f8f4
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
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 [Thu, 3 Oct 2019 17:13:25 +0000 (10:13 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
ccd0c91498 -s ours
am skip reason: subject contains skip directive
Change-Id: I2f2bcc99472507969722b03882633814370e3e10
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:53:31 +0000 (19:53 -0700)]
Merge "[Settings Telephony] Carrier name API replacement" into qt-qpr1-dev
am:
556b34d03d
Change-Id: Ibffb60c57aa4152b4681f3fe95dae7175f2e878e
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 [Wed, 2 Oct 2019 00:07:00 +0000 (17:07 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
d57831b7d2 -s ours
am skip reason: subject contains skip directive
Change-Id: Idf60f77bdffa5efdd33d01c20f4e12076f9b9b87
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
Bill Yi [Tue, 1 Oct 2019 22:18:03 +0000 (15:18 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
833512a1d2 -s ours
am skip reason: subject contains skip directive
Change-Id: I20fe79ea6a6f6b3fd54da7ab03eaa233913287c1
Joshua Mccloskey [Tue, 1 Oct 2019 22:17:26 +0000 (15:17 -0700)]
Merge "Added new string." into qt-qpr1-dev
am:
262f5fe91f
Change-Id: If8467461e0963648886c02159353c177e9b88d41
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
Paul Hu [Tue, 1 Oct 2019 10:15:14 +0000 (03:15 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am:
a67ca4cfd7 am:
3a728ae13b
am:
a6dadc465b
Change-Id: I08a04f4e627ce876a3cabd194a9838a0b5ce8459
Paul Hu [Tue, 1 Oct 2019 10:09:15 +0000 (03:09 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED" am:
a67ca4cfd7
am:
3a728ae13b
Change-Id: Id211709644b505fa866b0661f9657991c36dbaf6
Paul Hu [Tue, 1 Oct 2019 10:03:36 +0000 (03:03 -0700)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
am:
a67ca4cfd7
Change-Id: I7a2a4d76d1e0092188121d390c75c12eac20cdab
Paul Hu [Tue, 1 Oct 2019 09:50:28 +0000 (09:50 +0000)]
Merge "[Settings] Replace CONNECTIVITY_INTERNAL to TETHER_PRIVILEGED"
Bill Yi [Mon, 30 Sep 2019 19:42:10 +0000 (12:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
0631ad6efb -s ours
am skip reason: subject contains skip directive
Change-Id: I1338a125768855043cf83c6c5c759b470e12e7d4
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
Bill Yi [Sat, 28 Sep 2019 21:16:37 +0000 (14:16 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
b01e0ab05c -s ours
am skip reason: subject contains skip directive
Change-Id: Ie644497f111a2029d99a700b6333d3dec43fa948
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 23:41:36 +0000 (16:41 -0700)]
Changed string for translations.
am:
186dbc65af
Change-Id: Id48a469817c96a13ac1311792ad4b8bcd61fe88f
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 08:07:02 +0000 (01:07 -0700)]
Fix FaceSetupSliceTest
am:
acde97cf90
Change-Id: Ied72d5ae4b891ef1c5600b8d416b016d0aede23e
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 [Fri, 27 Sep 2019 03:06:48 +0000 (20:06 -0700)]
Added different flow for re-enrollment
am:
bba7632f28
Change-Id: Ie5174848a3a35df197177b0aa2cf6c324813b8dd
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
Taesu Lee [Thu, 26 Sep 2019 06:28:11 +0000 (23:28 -0700)]
Merge "Fix to show eUICC preference in eng build" am:
e825c30137 am:
9e81a2f4a8
am:
c4c8f51bb0
Change-Id: I58dae46adec67c855a5e26542d75d15f116c37dc
Taesu Lee [Thu, 26 Sep 2019 06:21:12 +0000 (23:21 -0700)]
Merge "Fix to show eUICC preference in eng build" am:
e825c30137
am:
9e81a2f4a8
Change-Id: I777273344c8eb4f791756be7fcb9755a5bf9e8b8
Taesu Lee [Thu, 26 Sep 2019 06:14:10 +0000 (23:14 -0700)]
Merge "Fix to show eUICC preference in eng build"
am:
e825c30137
Change-Id: Ie6ca5a575e5c5caa4c841286421d037649765397
Treehugger Robot [Thu, 26 Sep 2019 05:53:10 +0000 (05:53 +0000)]
Merge "Fix to show eUICC preference in eng build"
joshmccloskey [Wed, 25 Sep 2019 17:58:00 +0000 (10:58 -0700)]
Added mandatory scrolling for FaceIntroduction
am:
af1e831ab7
Change-Id: I1877ce4650fd393d08e2ff1c15944df8fbd4d6d7
Bill Yi [Wed, 25 Sep 2019 14:46:21 +0000 (07:46 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
500e7b2b71 -s ours
am:
444eac4f4a -s ours
am skip reason: subject contains skip directive
Change-Id: Ic8198769cb6d796e2add9491f538723fa3381d4c
Bill Yi [Wed, 25 Sep 2019 14:30:56 +0000 (07:30 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
500e7b2b71 -s ours
am skip reason: subject contains skip directive
Change-Id: I4a84a614577ee9558b05de1e30fe543ff2ece1d3
Bill Yi [Wed, 25 Sep 2019 01:54:26 +0000 (18:54 -0700)]
Import translations. DO NOT MERGE
Change-Id: I0f9786915ebc5c168487e7a5386d4f2060d27a12
Auto-generated-cl: translation import
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
Daniel Huang [Tue, 24 Sep 2019 09:45:00 +0000 (02:45 -0700)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am:
51cb777530 am:
f28625bcf1
am:
1fec213233
Change-Id: Ifed2aeb3759051ce1ddc490fb695b50642b76402
Daniel Huang [Tue, 24 Sep 2019 09:39:02 +0000 (02:39 -0700)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's" am:
51cb777530
am:
f28625bcf1
Change-Id: Ie151d421eae8321dc684f7d4a684f582fb60c3ac
Daniel Huang [Tue, 24 Sep 2019 09:32:29 +0000 (02:32 -0700)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
am:
51cb777530
Change-Id: I7d6675734eed90cbfb0ccda46c047883e460962f
Daniel Huang [Tue, 24 Sep 2019 09:21:51 +0000 (09:21 +0000)]
Merge "In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's"
Yi-Ling Chuang [Mon, 23 Sep 2019 03:16:25 +0000 (20:16 -0700)]
Merge "Enable dismissal feature on legacy suggestions." am:
ee39335edc am:
8d8c3e19b5
am:
b26711944b
Change-Id: I0edf1eff42cf54e644e60a11ba97219c38891e93
Yi-Ling Chuang [Mon, 23 Sep 2019 03:09:51 +0000 (20:09 -0700)]
Merge "Enable dismissal feature on legacy suggestions." am:
ee39335edc
am:
8d8c3e19b5
Change-Id: I8fae05f98c2ad04e0d7fba7a2aa409c08f781c0b
Yi-Ling Chuang [Mon, 23 Sep 2019 03:03:21 +0000 (20:03 -0700)]
Merge "Enable dismissal feature on legacy suggestions."
am:
ee39335edc
Change-Id: Ibce2403de032bd3d7fce750f6cd80191a8b14441
Treehugger Robot [Mon, 23 Sep 2019 02:45:25 +0000 (02:45 +0000)]
Merge "Enable dismissal feature on legacy suggestions."
Android Build Merger (Role) [Sun, 22 Sep 2019 19:59:59 +0000 (19:59 +0000)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours am:
cbfc75bb00 -s ours am skip reason: subject contains skip directive" into qt-qpr1-dev-plus-aosp
Bill Yi [Sun, 22 Sep 2019 19:59:44 +0000 (12:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours
am:
99f04da5dc -s ours
am skip reason: subject contains skip directive
Change-Id: I6f6945b78fd9a192c61d03a0741f62e7ea93fdcb
Bill Yi [Sun, 22 Sep 2019 19:59:44 +0000 (12:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours
am:
cbfc75bb00 -s ours
am skip reason: subject contains skip directive
Change-Id: I93d10d5ed7938c69b3b26c3b22d9d56ebc03f6ed
Bill Yi [Sun, 22 Sep 2019 19:54:00 +0000 (12:54 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am:
59e1c0a768 -s ours
am skip reason: subject contains skip directive
Change-Id: Iaf1cc92e717e2a7cdada89267ee6b5f3cc55a5b0
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
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: I31f45d935e2c9a13feb71186730b99fffc102c9b
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 09:07:52 +0000 (02:07 -0700)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev
am:
07ea1dc815
Change-Id: Ia7f62e46c3c9d7c9b7a55686be911891764ff75d
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
Yi-Ling Chuang [Thu, 19 Sep 2019 20:39:53 +0000 (13:39 -0700)]
Enable dismissal feature on legacy suggestions.
Add back the close button for legacy suggestions.
Fixes:
140786274
Test: robotest
Change-Id: Iaf0376bd482db4c4ff7d04a68131071c29c01ced
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
苗苗 (Miao Miao) [Tue, 17 Sep 2019 01:14:08 +0000 (09:14 +0800)]
In sim1 APN settings interface and hot plug out/in sim2, APN information change to sim2's
STEPS TO REPRODUCE:
1. Insert two sim into device, sim1 is CUCC, sim2 is CMCC
2. Goto Settings-Network & Internet-sim1-MobileNetworkSettings-Access Point Names. It shows CUCC APN information
3. Hot plug out sim2
4. Hot plug in sim2, APN information changes to CMCC APN information
EXPECTED RESULTS:
When hot plug out/in sim2, sim1 APN settings interface should still keep its APN information instead of changing to sim2 APN information
Change-Id: I04c769f60ba1686b2c9bebcd07e3a04685979442
Bug:
141087659
Test:In sim1 APN settings interface, hot plug out/in sim2, it shows sim1 APN information all the time, test pass.
Bonian Chen [Thu, 19 Sep 2019 20:25:31 +0000 (13:25 -0700)]
Merge "[Help Page] Support help content under 2 CDMA SIM" into qt-qpr1-dev
am:
20290d0451
Change-Id: I0b3cb958eff31ede7daa3292987684c26e9111d5
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 [Wed, 18 Sep 2019 03:30:28 +0000 (20:30 -0700)]
Updated face remove dialog string.
am:
7abb800c9f
Change-Id: I22d614cd7c6868e4c28d894ea2a3fe48f8266457
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
Neil Fuller [Tue, 17 Sep 2019 17:17:41 +0000 (10:17 -0700)]
Merge "Remove use of deprecated Time class" am:
b3f8696c4d am:
b83ddefb5c
am:
42b55bc6f6
Change-Id: I69ea913c7596017ab2d08dfe67c8376527d01603
Neil Fuller [Tue, 17 Sep 2019 17:06:03 +0000 (10:06 -0700)]
Merge "Remove use of deprecated Time class" am:
b3f8696c4d
am:
b83ddefb5c
Change-Id: Iafc1b00c254a5f7cc6af80b3eeeaf4418fbdbaf9
Neil Fuller [Tue, 17 Sep 2019 16:56:45 +0000 (09:56 -0700)]
Merge "Remove use of deprecated Time class"
am:
b3f8696c4d
Change-Id: Ie6dcfcde7ec223ed83b2d8d33f059924e3a566e9
Treehugger Robot [Tue, 17 Sep 2019 16:32:47 +0000 (16:32 +0000)]
Merge "Remove use of deprecated Time class"
Neil Fuller [Tue, 17 Sep 2019 12:53:17 +0000 (13:53 +0100)]
Remove use of deprecated Time class
Remove a use of the deprecated Time class.
Bug:
16550209
Test: treehugger only
Change-Id: If97b0d8ea78a76d613652ab623c3a48f5aa9aabb
Mady Mellor [Mon, 16 Sep 2019 22:22:08 +0000 (15:22 -0700)]
[automerger skipped] Merge "qt-r1-bubbles-dev @ build
5835883" into qt-qpr1-dev
am:
eac42583a1 -s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1
ea79e343f0 is in history
Change-Id: I80f853b777590b66aa8689e36864b381a947cb72
Mady Mellor [Mon, 16 Sep 2019 22:16:35 +0000 (15:16 -0700)]
[automerger skipped] qt-r1-bubbles-dev @ build
5835883
am:
91ba8e9b66 -s ours
am skip reason: change_id I58f0287ed99a4daf3758316e4004bca05f17b0d1 with SHA1
ea79e343f0 is in history
Change-Id: I4bcd05a7b87d9735c545a4599fffefc82e0c4856
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 22:28:41 +0000 (15:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
1ae748b09f -s ours
am skip reason: subject contains skip directive
Change-Id: Ibb1bf53b21569e91e4d9e1ce47577fa525aaaec0
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:28:52 +0000 (02:28 -0700)]
Merge "Fix "skip lock screen" not working for a secondary user" into qt-qpr1-dev
am:
3df43a3eae
Change-Id: Iaeaedcde2e27f07cb5849a2cf670219fd143b934
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:49:20 +0000 (17:49 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours
am:
5c90432dc1 -s ours
am skip reason: subject contains skip directive
Change-Id: Ic722d4de71c99e005a84f5650c8bf9c82c392cd0
Bill Yi [Fri, 13 Sep 2019 00:42:18 +0000 (17:42 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
86dfbd6254 -s ours
am:
edbddf7f42 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib0eeb1f2ac5bff404717b4550d48c32bc536ef61
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 [Fri, 13 Sep 2019 00:28:34 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
f066797849 -s ours
am skip reason: subject contains skip directive
Change-Id: I83269163f1e1f3752a85cb4eaed860316efba142
Bill Yi [Fri, 13 Sep 2019 00:28:33 +0000 (17:28 -0700)]
[automerger skipped] Import translations. DO NOT MERGE
am:
86dfbd6254 -s ours
am skip reason: subject contains skip directive
Change-Id: Ib139ea535e149923d50d835e030636df7edbf7cc
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
cosmohsieh [Thu, 12 Sep 2019 21:09:30 +0000 (14:09 -0700)]
Merge "[Network Connection] Call NetworkRequestUserSelectionCallback#reject() if user quit activity without selection" into qt-qpr1-dev
am:
17cbea0112
Change-Id: Icc3c00f542746c1ffa423c04c160ba85e53ad834