Lei Yu
f770bf78f5
Merge "Use new API to build NetworkTemplate" into qt-dev am: c9fbd2ee50
...
am: 7f8a269a3a
2019-06-03 10:54:34 -07:00
Lei Yu
7f8a269a3a
Merge "Use new API to build NetworkTemplate" into qt-dev
...
am: c9fbd2ee50
2019-06-03 10:06:14 -07:00
Lei Yu
c9fbd2ee50
Merge "Use new API to build NetworkTemplate" into qt-dev
2019-06-03 16:54:29 +00: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
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
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
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
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
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
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
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
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
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
Julia Reynolds
4a236e0e16
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
...
am: 53bbf9b78d
2019-05-31 06:37:28 -07:00
Julia Reynolds
53bbf9b78d
Merge "Reorder notification settings" into qt-dev
...
am: 1abcbaa093
2019-05-31 06:32:29 -07:00
TreeHugger Robot
1abcbaa093
Merge "Reorder notification settings" into qt-dev
2019-05-31 13:24:17 +00:00
Julia Reynolds
e3da5c15a4
Update notification settings animation
...
Test: manual
Fixes: 133874971
Change-Id: I8dc399f9de578197322cadbb7cc2c5f75902461d
2019-05-31 09:18:42 -04:00
Joel Galenson
dce770dae2
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
...
am: 58246f66db
2019-05-31 06:12:23 -07:00
Joel Galenson
58246f66db
Merge "Remove Permissions Hub." into qt-dev
...
am: 63088840c4
2019-05-31 06:07:29 -07:00
TreeHugger Robot
63088840c4
Merge "Remove Permissions Hub." into qt-dev
2019-05-31 13:02:12 +00:00
Lucas Dupin
dc8500209f
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
...
am: 1a3112ab32
2019-05-30 21:27:13 -07:00
TreeHugger Robot
1a3112ab32
Merge "Fix exception on non face-enabled devices" into qt-r1-dev
2019-05-31 04:15:54 +00:00
Ilya Matyukhin
ee909b418a
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
...
am: dbe399a023
2019-05-30 18:04:02 -07:00
TreeHugger Robot
dbe399a023
Merge "Add generateChallenge() in onResume()" into qt-r1-dev
2019-05-31 00:52:11 +00:00
Bill Yi
62a0fa3606
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d1ddb16617 -s ours
...
am: 71edc54326
2019-05-30 17:47:50 -07:00
Bill Yi
71edc54326
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: d1ddb16617
2019-05-30 17:42:52 -07:00
TreeHugger Robot
d1ddb16617
Merge "Import translations. DO NOT MERGE" into qt-dev
2019-05-31 00:30:42 +00:00
Joshua Mccloskey
efb4757e03
Merge "String update." into qt-r1-dev
...
am: b471e2439c
2019-05-30 16:34:49 -07:00
Joshua Mccloskey
b471e2439c
Merge "String update." into qt-r1-dev
2019-05-30 23:12:53 +00:00
Alex Salo
6c1949edce
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
...
am: fa127bd6f7
2019-05-30 16:12:36 -07:00
Alex Salo
fa127bd6f7
Merge "Adds contextual cards for screen attention in Settings Homepage" into qt-r1-dev
2019-05-30 22:59:12 +00:00
Mehdi Alizadeh
7618b00cd1
Merge "Increase char limit to 60 for string translation" into qt-dev am: 178d4a7f8f
...
am: 4937d4ca1f
2019-05-30 15:20:20 -07:00
Bill Yi
bd1ab2754b
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: I6da271a883e0a62cc5f32890c3411e64ef856fa7
2019-05-30 15:17:06 -07:00
Mehdi Alizadeh
4937d4ca1f
Merge "Increase char limit to 60 for string translation" into qt-dev
...
am: 178d4a7f8f
2019-05-30 15:16:16 -07:00
