OSDN Git Service
TreeHugger Robot [Tue, 1 Oct 2019 04:00:18 +0000 (04:00 +0000)]
Merge "Remove summary loader in some fragments"
Raff Tsai [Mon, 30 Sep 2019 10:28:16 +0000 (18:28 +0800)]
Remove summary loader in some fragments
- Summary Loader only works in injected items, but those fragments
are not injected to Settings UI. The SummaryLoader class them are
useless.
Bug:
141653158
Test: robolectric
Change-Id: I1ca0bf5a1f417b7fe86b28e96aff7d4aee2cf2d3
Bill Yi [Mon, 30 Sep 2019 19:47:28 +0000 (12:47 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
0631ad6efb -s ours
am:
beb37b072f -s ours
am skip reason: subject contains skip directive
Change-Id: I13bb676b52e10295a805a8a2f381f5493fdb80be
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
TreeHugger Robot [Mon, 30 Sep 2019 13:29:33 +0000 (13:29 +0000)]
Merge "Update enabled state of ZenRulePreference"
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 [Mon, 30 Sep 2019 09:36:56 +0000 (09:36 +0000)]
Merge "Fix UI display abnormal of DatePickerDialog in landscape mode"
Sunny Shao [Fri, 27 Sep 2019 13:32:11 +0000 (21:32 +0800)]
Fix UI display abnormal of DatePickerDialog in landscape mode
Update the themes.xml and styles.xml.
Fixes:
141577901
Test: manual view
Change-Id: I24cadcc972bdc0ee1f6601e3b496d0f69bb5089c
Raff Tsai [Mon, 30 Sep 2019 03:14:31 +0000 (11:14 +0800)]
Fine tune language UI to match preference style
Fixes:
141830486
Test: visual
Screenshot: https://screenshot.googleplex.com/LVv2W9D963s
Screenshot: https://screenshot.googleplex.com/VbJQ0cSPBKK
Change-Id: I44b0ac8ac2bd32b3beeabee195aab928ec4bacc2
Bill Yi [Sat, 28 Sep 2019 21:23:40 +0000 (14:23 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am:
b01e0ab05c -s ours
am:
37703c090a -s ours
am skip reason: subject contains skip directive
Change-Id: I08cf95cb7336d3a3208aa3e3f618d47093402ea8
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 [Sat, 28 Sep 2019 08:22:30 +0000 (01:22 -0700)]
Changed string for translations. am:
186dbc65af
am:
515772802f
Change-Id: I7554b0e974393e7df7cde9ff4355b3713d0997d5
Kevin Chyn [Sat, 28 Sep 2019 08:20:03 +0000 (01:20 -0700)]
Fix FaceSetupSliceTest am:
acde97cf90
am:
a9c14ab4b1
Change-Id: Ic96ff261766e750e0fff6b3ff73e21d0588b0222
joshmccloskey [Sat, 28 Sep 2019 01:38:20 +0000 (18:38 -0700)]
Added different flow for re-enrollment am:
bba7632f28
am:
3511ad89ca
Change-Id: I2b06407f4df37f8d16f95c6068de0ac3523df293
TreeHugger Robot [Fri, 27 Sep 2019 23:54:07 +0000 (23:54 +0000)]
Merge "Update the color of the preference category"
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 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
Beverly [Fri, 27 Sep 2019 17:50:15 +0000 (13:50 -0400)]
Update enabled state of ZenRulePreference
Test: manual
1. Settings > Sound > Do Not Disturb > Schedules > Sleeping
2. Toggle enable state of DND rule to ON
3. Navigate back
4. Observe: Sleeping rule is enabled visually (check box is checked)
Fixes:
140090071
Change-Id: I44078cdba9642eea93f9b6d2eb3eef486d3c38bc
TreeHugger Robot [Fri, 27 Sep 2019 13:19:42 +0000 (13:19 +0000)]
Merge "Fix print page starts multiple activities"
TreeHugger Robot [Fri, 27 Sep 2019 12:03:02 +0000 (12:03 +0000)]
Merge "Fix upper back button behavior of MobileDataUsageListActivity"
TreeHugger Robot [Fri, 27 Sep 2019 11:18:39 +0000 (11:18 +0000)]
Merge "Execute getting battery info on the parallel executor"
Yanting Yang [Fri, 27 Sep 2019 10:34:04 +0000 (18:34 +0800)]
Fix upper back button behavior of MobileDataUsageListActivity
Fixes:
141622125
Test: visual
Change-Id: I5a8fac02428fe811e2d0f340b1469ff948637623
Raff Tsai [Fri, 27 Sep 2019 10:15:03 +0000 (18:15 +0800)]
Fix print page starts multiple activities
- Finish old activity when user select new user profile to start a
new activity
Fixes:
140154015
Test: manual
Change-Id: I4f05af4dd8a489c4a563cb51428d8a1277f95cd3
Jason Chiu [Fri, 27 Sep 2019 09:33:08 +0000 (17:33 +0800)]
Execute getting battery info on the parallel executor
Getting battery info is time consuming and may block other tasks in the
same background thread.
Executing it on the parallel executor can improve app launch performance.
Bug:
141694556
Test: robotest
Change-Id: I55517e03961929c2b288e230ed474d45915d63fd
Kevin Chyn [Fri, 27 Sep 2019 08:07:02 +0000 (01:07 -0700)]
Fix FaceSetupSliceTest
am:
acde97cf90
Change-Id: Ied72d5ae4b891ef1c5600b8d416b016d0aede23e
Sunny Shao [Fri, 27 Sep 2019 05:16:44 +0000 (13:16 +0800)]
Update the color of the preference category
Use the new attribute preferenceCategoryTitleTextColor to change the color of
the preference category.
Bug:
117402186
Test: manual view
Change-Id: If2df5529a63ff9cd96f242a9ea5f3dac053b0fd2
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
Bonian Chen [Thu, 26 Sep 2019 07:16:42 +0000 (07:16 +0000)]
Merge "[Manual Network Selection] UX improvement"
TreeHugger Robot [Thu, 26 Sep 2019 06:51:17 +0000 (06:51 +0000)]
Merge "Use SettingsLib Indexable"
Taesu Lee [Thu, 26 Sep 2019 06:35:06 +0000 (23:35 -0700)]
Merge "Fix to show eUICC preference in eng build" am:
e825c30137 am:
9e81a2f4a8 am:
c4c8f51bb0
am:
1c20ea5644
Change-Id: I531faa4430a0fa914b239383d97ef5af58c8bb0b
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"
Bonian Chen [Thu, 26 Sep 2019 03:33:14 +0000 (03:33 +0000)]
Merge "[Owner] Add allenwtsu into Settings Telephony part"
joshmccloskey [Wed, 25 Sep 2019 19:43:03 +0000 (12:43 -0700)]
Added mandatory scrolling for FaceIntroduction am:
af1e831ab7
am:
ab5bf98c03
Change-Id: Ifc33c6e4f34f1f66bd48cc0f2e5f4e7c7e164e55
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:59:25 +0000 (07:59 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
500e7b2b71 -s ours am:
444eac4f4a -s ours
am:
5f968e68c7 -s ours
am skip reason: subject contains skip directive
Change-Id: I5e644b647bb95697d556727ca64dcaab5098b06c
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
Bonian Chen [Wed, 25 Sep 2019 13:25:17 +0000 (21:25 +0800)]
[Owner] Add allenwtsu into Settings Telephony part
Add allenwtsu into owner list of Telephony part within Settings apk
Bug: 0
Test: none
Change-Id: Ic2820bc113bc26fc0d162c42c7925477177127ae
Bonian Chen [Wed, 25 Sep 2019 10:37:12 +0000 (18:37 +0800)]
[Manual Network Selection] UX improvement
Original design abort a network scan when screen off and restart scan
when screen on.
Under the situation of network scan time longer than screen off time,
user may not get any result but keeping in scanning screen.
This CL improve this situation by avoiding stop and rescan for the case
user didn't leave this UI and previous scan is in progressing.
Bug:
140448617
Test: Manual testing leave and back to UI, and screen off-on.
Change-Id: I74ffa574dac932ca7fcd76411cad4ec0cc88f25f
Raff Tsai [Wed, 25 Sep 2019 03:19:06 +0000 (11:19 +0800)]
Use SettingsLib Indexable
- Use SettingsLib Indexable
- Directly use resource id in getPreferenceScreenResId
Bug:
135053028
Test: roboletric
Change-Id: I05f493b55e8b6e2091301e9231ba5615215618e6
TreeHugger Robot [Wed, 25 Sep 2019 08:27:51 +0000 (08:27 +0000)]
Merge "Error handler for start dialog from adb command"
Bonian Chen [Wed, 25 Sep 2019 06:45:50 +0000 (06:45 +0000)]
Merge "[Settings Telephony] Carrier name API replacement"
hughchen [Wed, 25 Sep 2019 02:55:15 +0000 (10:55 +0800)]
Error handler for start dialog from adb command
This CL added null check for the case that dialog
is started from adb command.
Bug:
129783237
Test: manually
Change-Id: I47d47cb5ddfe3487e2d616d1cf2ed08bd11d215d
TreeHugger Robot [Wed, 25 Sep 2019 05:33:44 +0000 (05:33 +0000)]
Merge "Fix highlight animation"
Tsung-Mao Fang [Wed, 25 Sep 2019 03:35:28 +0000 (11:35 +0800)]
Fix highlight animation
Set correct from-to color for highlight animation
Fixes:
141535322
Test: visual
Change-Id: I1cec8d57fca1435922ad196a4b314d8cee2be9f0
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
Bonian Chen [Tue, 24 Sep 2019 10:05:23 +0000 (10:05 +0000)]
Merge "[ManualNetworkSelect] Improve error handling"
TreeHugger Robot [Tue, 24 Sep 2019 09:57:50 +0000 (09:57 +0000)]
Merge "Do not block UI when this page didn't have slice"
Daniel Huang [Tue, 24 Sep 2019 09:51:19 +0000 (02:51 -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
am:
f7b4dc1dc7
Change-Id: Iacb97f589587a06212591ce9a83f5eadba7b59f7
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"
Raff Tsai [Tue, 24 Sep 2019 09:10:56 +0000 (09:10 +0000)]
Merge "Directly use BaseIndexableProvider"
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:
140443508
Test: Manual testing
atest MobileNetworkUtilsTest
atest OpenNetworkSelectPagePreferenceControllerTest
Change-Id: I7a86395c86d31fe2ba54c04ac16b1a0ebfc843f3
Bonian Chen [Mon, 23 Sep 2019 03:29:54 +0000 (11:29 +0800)]
[ManualNetworkSelect] Improve error handling
1. [batch mode] Support graceful app stop behavior
Avoid thread crash when UI abort the request.
2. [incremental mode] Stop search UI earlier when error during API access
Generate error instead of keeping UI in progressing
when fail to access Telephony API
Bug:
139398483
Bug:
140448617
Test: atest NetworkScanHelperTest
Change-Id: I429f3aa2ef692c27100514faa413b16dbd2459d7
hughchen [Tue, 24 Sep 2019 02:30:49 +0000 (10:30 +0800)]
Do not block UI when this page didn't have slice
This CL before, if controller have UIBlocker interface
will going to blocker condition to make whole page
invisible for a certain time until slice is fully loaded.
This CL add the check condition that if the controller
have UIBlocker inferface but didn't have slice uri will
not go to blocker condition.
Bug:
141292712
Test: make -j42 RunSettingsRoboTests ROBOTEST_FILTER=DashboardFragmentTest
Change-Id: I79daae131654f8fd823a9c8f1be46ad6c7921908
TreeHugger Robot [Tue, 24 Sep 2019 01:51:46 +0000 (01:51 +0000)]
Merge "Use FooterPreference in xml to replace the header"
TreeHugger Robot [Mon, 23 Sep 2019 17:10:51 +0000 (17:10 +0000)]
Merge "Remove enum logic from callers of requestbugreport()"
Raff Tsai [Thu, 19 Sep 2019 09:06:45 +0000 (17:06 +0800)]
Directly use BaseIndexableProvider
- Add function getXmlResourceId, Fragments don't need to write
xml resource id twice.
- Remove getPreferenceControllers from Indexable.java. Because it will
move to SettingsLib later for other apps which don't need this function
Bug:
135053028
Test: robolectric
Change-Id: I1e74519aecdea3dde64a5aea79f08d766dbc0003
TreeHugger Robot [Mon, 23 Sep 2019 15:07:13 +0000 (15:07 +0000)]
Merge "Developer option off must not affect laser sensor"
Abhijeet Kaur [Thu, 22 Aug 2019 14:07:55 +0000 (15:07 +0100)]
Remove enum logic from callers of requestbugreport()
Make callers use wrapper functions in ActivityManagerService.java.
The code to send broadcast to trigger API workflow (after checking the API
flag) is added in requestBugreport() in ActivityManagerService.java.
Remove that logic from this file.
Bug:
137825297
Bug:
141355059
Test: builds and full/interactive bugreports work as expected
Change-Id: Ibc305e4aca7d38fd4878b60f3f7f8c3274719c13
Sunny Shao [Mon, 23 Sep 2019 09:29:06 +0000 (17:29 +0800)]
Use FooterPreference in xml to replace the header
Fixes:
141450664
Test: manual test
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.enterprise
Change-Id: Ia6ec0e363b9a472ff104ffbc529856a21840af27
TreeHugger Robot [Mon, 23 Sep 2019 07:08:42 +0000 (07:08 +0000)]
Merge "Add search key word for Profile HWUI rendering"
TreeHugger Robot [Mon, 23 Sep 2019 07:00:49 +0000 (07:00 +0000)]
Merge "Show "Display over other apps" in search"
Tsung-Mao Fang [Mon, 23 Sep 2019 06:06:37 +0000 (14:06 +0800)]
Add search key word for Profile HWUI rendering
Test: Rebuild, and see the search result
Fixes:
141096384
Change-Id: Ic25eb9f4b7bbffd33323eabbb80092d620d8da17
Tsung-Mao Fang [Mon, 23 Sep 2019 05:43:06 +0000 (13:43 +0800)]
Show "Display over other apps" in search
Since there're same two keys in settings app,
search indexes this preference fail.
Test: Rebuild, and see search result again.
Bug:
141096384
Change-Id: I8b1edfe1728b44d98d59ba2e790b29e33901308a
Yi-Ling Chuang [Mon, 23 Sep 2019 03:23:28 +0000 (20:23 -0700)]
Merge "Enable dismissal feature on legacy suggestions." am:
ee39335edc am:
8d8c3e19b5 am:
b26711944b
am:
3b8a14e86f
Change-Id: I97bcdc54f908db6f5895d99f284ee24fb4015433
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."
Bill Yi [Sun, 22 Sep 2019 20:14:15 +0000 (13:14 -0700)]
Merge "[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours am:
cbfc75bb00 -s ours
am:
df8a9839fc -s ours
am skip reason: subject contains skip directive
Change-Id: I7e3017dd68cf06822a7e971a48f3fd271a6ebae2
Bill Yi [Sun, 22 Sep 2019 20:08:45 +0000 (13:08 -0700)]
[automerger skipped] Import translations. DO NOT MERGE am:
73915b77ed -s ours am:
99f04da5dc -s ours
am:
66d00b68c6 -s ours
am skip reason: subject contains skip directive
Change-Id: I0eded95e9433b1779cecc3016fe880e9b567465b
Bill Yi [Sun, 22 Sep 2019 20:08:04 +0000 (13:08 -0700)]
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am:
59e1c0a768 -s ours
am:
f5e74d30d6 -s ours
am skip reason: subject contains skip directive
Change-Id: Iedf4b71e4cc4b2f81145cb2219c2413fb70412d7
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:14:54 +0000 (02:14 -0700)]
Merge "Handle Aware sensor status for Always On" into qt-qpr1-dev am:
07ea1dc815
am:
18839c1fbc
Change-Id: Ief79ab0c23790d60650f1f6375c794a20872a8b1
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
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
Emilian Peev [Thu, 19 Sep 2019 17:47:32 +0000 (10:47 -0700)]
Developer option off must not affect laser sensor
Turning developer settings to on or off must not
change the current laser sensor preference.
Bug:
140016130
Test: mma ROBOTEST_FILTER=CameraLaserSensorPreferenceControllerTest,
manual using Settings application
Change-Id: Ieb30527e5df97abcb00a6624e1ced93f9198c713
TreeHugger Robot [Fri, 20 Sep 2019 14:24:24 +0000 (14:24 +0000)]
Merge "Update notification log"