Fan Zhang
aa08a2cc0e
Use slice uri from slice index db directly.
...
During SettingsSliceProvider#onGetSliceDescendants, use the uris from
database directly instead of getting the key and construct the uris
manually.
Bug: 126222433
Test: robotest
Change-Id: Iad4e9fc28ec4442b6bb323878503d743582b35ac
2019-05-31 16:03:33 -07:00
Joel Galenson
9e05bf902a
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev am: 4a9055a99c
...
am: efbf351167
2019-05-31 15:34:06 -07:00
Joel Galenson
efbf351167
Merge "Revert "Remove Permissions Hub."" into qt-r1-dev
...
am: 4a9055a99c
2019-05-31 15:04:56 -07:00
Mehdi Alizadeh
34a615bc57
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: 9b378dd381
...
am: 860d96d676
2019-05-31 15:04:37 -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
793cb2c9c7
Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a am: c4be5512a7
...
am: ecf3028123
2019-05-31 14:43:50 -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
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
b76a4911e6
Merge "Update notification settings animation" into qt-dev am: 1746ccca94 am: 2c47160eff
...
am: b362588949
2019-05-31 11:17:48 -07:00
Lei Yu
4d07c5bc94
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: 677d5a5e01
...
am: 4ffd4f09e7
2019-05-31 11:15:55 -07:00
Julia Reynolds
0b0763ce2e
Merge "Update notification settings animation" into qt-dev am: 1746ccca94 am: c816aa26bd
...
am: 7b3315797d
2019-05-31 11:13:40 -07:00
Lei Yu
09c60c349f
Merge "Fix issues in battery usage accounting" into qt-dev am: 2148c1a207 am: fad8cec592
...
am: a22bf1cd8b
2019-05-31 11:10:26 -07:00
TreeHugger Robot
75a5ef8c16
Merge "Override 2 getSliceUri() instance to return platform slice"
2019-05-31 18:03:44 +00: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
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
0213ca3583
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff am: ab5e939b72
...
am: 754416c28f
2019-05-31 09:58:50 -07:00
Salvador Martinez
412815e2b7
Merge "Change switch text color to black in dark mode" into qt-dev am: ccbdd834ff am: 154c485209
...
am: 1825608cde
2019-05-31 09:54:28 -07: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
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
Julia Reynolds
210f0fef70
Merge "Merge "Reorder notification settings" into qt-dev am: 1abcbaa093 am: 53bbf9b78d" into qt-r1-dev-plus-aosp
...
am: 409d8687d1
2019-05-31 06:42:56 -07:00
Julia Reynolds
dd806ce357
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093 am: 760f617502
...
am: ef7ba1918a
2019-05-31 06:42:31 -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
Julia Reynolds
21a9e1c43f
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
...
am: 53bbf9b78d
2019-05-31 06:37:30 -07:00
Julia Reynolds
ef7ba1918a
Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
...
am: 760f617502
2019-05-31 06:37:28 -07:00
Julia Reynolds
760f617502
Merge "Reorder notification settings" into qt-dev
...
am: 1abcbaa093
2019-05-31 06:32:30 -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
1884a64d0a
Merge "Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: d8efe209f7" into qt-r1-dev-plus-aosp
...
am: 6b0da3c2af
2019-05-31 06:18:22 -07:00
Joel Galenson
5a9c0f861e
Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
...
am: 0709624634
2019-05-31 06:17:32 -07:00
Android Build Merger (Role)
6b0da3c2af
Merge "Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: d8efe209f7" into qt-r1-dev-plus-aosp
2019-05-31 13:12:50 +00:00
