android-build-team Robot
611f77ef7b
Snap for 5627702 from b53bebe6ec to qt-c2f2-release
...
Change-Id: Icceef4085d1dd7f79b359b819cd7b796dd685c21
2019-06-02 23:09:22 +00:00
Bill Yi
7b4a46a156
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: b53bebe6ec
2019-06-02 00:36:26 -07:00
Bill Yi
712c90abe1
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
...
am: b53bebe6ec
2019-06-02 00:36:24 -07:00
TreeHugger Robot
907f2239bc
Merge "Import translations. DO NOT MERGE" into qt-r1-bubbles-dev
2019-06-02 07:34:37 +00:00
TreeHugger Robot
b53bebe6ec
Merge "Import translations. DO NOT MERGE" into qt-r1-dev
2019-06-02 07:27:07 +00:00
android-build-team Robot
fd6ef908bb
Snap for 5626642 from 5540373d4f to qt-c2f2-release
...
Change-Id: I84e72386d849bd337799cb85a4d464ba0e2d2c1d
2019-06-01 23:16:56 +00:00
android-build-team Robot
12508aa776
Snap for 5626731 from 2407b65709 to qt-release
...
Change-Id: I8f10ee0b0307882ca5c79dea97fecd736ebc43a3
2019-06-01 23:12:09 +00:00
Android Build Merger (Role)
8d32123425
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours am: 5540373d4f -s ours am skip reason: subject contains skip directive" into qt-r1-dev-plus-aosp
2019-06-01 18:41:21 +00:00
Bill Yi
8f87b4534d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
...
am: 5540373d4f
2019-06-01 11:41:04 -07:00
Bill Yi
884f7c7370
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
...
am: 59faf30c59
2019-06-01 11:41:03 -07:00
Bill Yi
4083bbbefc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
...
am: 5540373d4f
2019-06-01 11:41:02 -07:00
Bill Yi
59faf30c59
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 2407b65709
2019-06-01 11:36:05 -07:00
Bill Yi
5540373d4f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 2407b65709
2019-06-01 11:36:05 -07:00
TreeHugger Robot
2407b65709
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-06-01 18:17:35 +00:00
Bill Yi
c3f412e385
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6f9fce5b981349174e0ca9480a237d8f118a8333
2019-06-01 10:46:42 -07:00
Bill Yi
79bc6c08a1
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I9675532a8f4b1f551c8130e9243262a52cd8a3d2
2019-06-01 10:26:48 -07:00
Bill Yi
6f9e016e2d
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I861f60fb68f5bb9d20d0c0e7c338144e70c077eb
2019-06-01 10:06:36 -07:00
Joel Galenson
efbf351167
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
2019-05-31 15:04:56 -07:00
Joel Galenson
a27d4a9f49
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
2019-05-31 15:02:30 -07:00
TreeHugger Robot
4a9055a99c
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
2019-05-31 21:54:29 +00:00
Mehdi Alizadeh
860d96d676
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: 9b378dd381
2019-05-31 14:46:58 -07:00
Mehdi Alizadeh
ecf3028123
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: c4be5512a7
2019-05-31 14:34:09 -07:00
Mehdi Alizadeh
a9c1fa34c9
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
...
am: c4be5512a7
2019-05-31 14:32:18 -07:00
Mehdi Alizadeh
9b378dd381
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
2019-05-31 14:30:18 -07:00
Mehdi Alizadeh
c4be5512a7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
...
am: cad67cdc0a
2019-05-31 14:26:04 -07:00
Mehdi Alizadeh
cad67cdc0a
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev
2019-05-31 21:08:08 +00:00
Mehdi Alizadeh
ffea2ae488
Disables the Gesture nav option if 3P launcher is default
...
Disables the Gesture navigation radio button if 3P launcher is set as
default for current user. Also shows an info icon on the right side that
opens a dialog explaining why it is disables.
Bug: 129532605
Test: Manual test with 3P launcher
Test: make RunSettingsRoboTests ROBOTEST_FILTER=RadioButtonPreferenceWithExtraWidgetTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationGestureSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SystemNavigationPreferenceControllerTest
Change-Id: I90000c74246699fa9391ac042c87d7f0ece03637
2019-05-31 12:26:28 -07:00
Julia Reynolds
b362588949
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
...
am: 2c47160eff
2019-05-31 11:00:27 -07:00
Lei Yu
4ffd4f09e7
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: 677d5a5e01
2019-05-31 10:59:46 -07:00
Julia Reynolds
7b3315797d
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
...
am: c816aa26bd
2019-05-31 10:56:38 -07:00
Lei Yu
a22bf1cd8b
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: fad8cec592
2019-05-31 10:53:59 -07:00
Raff Tsai
50ec2c218e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f
2019-05-31 17:51:00 +00:00
Raff Tsai
5d9328571e
Do not allow draw on top for App notification settings
...
Fixes: 119115683
Test: manual
Change-Id: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
Merged-In: Ib7b878a23b4a99171c58b5de992fb87feca8a28a
(cherry picked from commit fe86a2a51f
2019-05-31 17:50:17 +00:00
Julia Reynolds
1fb8ca0ace
Merge "Update notification settings animation" into qt-dev am: 1746ccca94
...
am: 2c47160eff
2019-05-31 10:44:11 -07:00
Lei Yu
85820eb66f
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207
...
am: 677d5a5e01
2019-05-31 10:43:51 -07:00
Julia Reynolds
c816aa26bd
Merge "Update notification settings animation" into qt-dev
...
am: 1746ccca94
2019-05-31 10:42:17 -07:00
Lei Yu
fad8cec592
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
2019-05-31 10:41:54 -07:00
Julia Reynolds
2c47160eff
Merge "Update notification settings animation" into qt-dev
...
am: 1746ccca94
2019-05-31 10:41:13 -07:00
Lei Yu
677d5a5e01
Merge "Fix issues in battery usage accounting" into qt-dev
...
am: 2148c1a207
2019-05-31 10:40:50 -07:00
Julia Reynolds
1746ccca94
Merge "Update notification settings animation" into qt-dev
2019-05-31 17:27:09 +00:00
Lei Yu
ded55a1401
Use new API to build NetworkTemplate
...
This CL is built to make CBRS show correct data usage, by merging
all subscriberId under same groupuuid.
Bug: 133865338
Test: RunSettingsRoboTests
Change-Id: I3c717d0f1a1b95aa21c2ccefe4d1cefb4d854cb5
2019-05-31 10:19:17 -07:00
Lei Yu
2148c1a207
Merge "Fix issues in battery usage accounting" into qt-dev
2019-05-31 17:17:51 +00:00
Salvador Martinez
754416c28f
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
...
am: ab5e939b72
2019-05-31 09:37:17 -07:00
Salvador Martinez
1825608cde
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
...
am: 154c485209
2019-05-31 09:32:26 -07:00
Salvador Martinez
06445ce292
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff
...
am: 154c485209
2019-05-31 09:26:24 -07:00
Salvador Martinez
ab5e939b72
Merge "Change switch text color to black in dark mode" into qt-dev
...
am: ccbdd834ff
2019-05-31 09:16:12 -07:00
Salvador Martinez
154c485209
Merge "Change switch text color to black in dark mode" into qt-dev
...
am: ccbdd834ff
2019-05-31 09:15:12 -07:00
TreeHugger Robot
ccbdd834ff
Merge "Change switch text color to black in dark mode" into qt-dev
2019-05-31 15:59:42 +00:00
Joel Galenson
2118f8a63f
Revert "Remove Permissions Hub."
...
This reverts commit 1e7c172ad5
2019-05-31 07:55:19 -07:00
Android Build Merger (Role)
409d8687d1
Merge "Merge "Reorder notification settings" into qt-dev am: 1abcbaa093 am: 53bbf9b78d" into qt-r1-dev-plus-aosp
2019-05-31 13:37:39 +00:00
