Commit Graph

53915 Commits

Author SHA1 Message Date
Mehdi Alizadeh
ecf3028123 Merge "Disables the Gesture nav option if 3P launcher is default" into qt-dev am: cad67cdc0a
am: c4be5512a7

Change-Id: I61477938f506b07ce01ad8d3b6214fb38df1936a
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

Change-Id: Icba26f525b33f2a09a014fb88a4076362a289681
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

Change-Id: I9458cdbcc819e1d203266a8ff5b3b4ade1f3aeef
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

Change-Id: I092fe40a705cd17a6a2648e1dfc749c220d01801
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

Change-Id: Ie5f0581cad536a08d557aa29c455a2fce8ab34e0
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

Change-Id: I93b95f8096ad0af84a9368c357776c0c1ca7ce17
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

Change-Id: Iaadee52c55098da5941dab5edfa1087dac7822c3
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

Change-Id: Iaa78037289c2f2d6fcf93030b00b5d350d0552ec
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

Change-Id: I9f194a6e97a0f23cc4cd81ae328207c66cfd9831
2019-05-31 10:59:46 -07:00
Julia Reynolds
7b3315797d Merge "Update notification settings animation" into qt-dev am: 1746ccca94
am: c816aa26bd

Change-Id: I9fa208f11caffaa9e278d2ba22bee1d6ae3decae
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

Change-Id: I9b4a73685b8091760f375b58ad58d501046386d9
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

Change-Id: If2fe2025fcdcecd6a432a76b4eac4545249b39dc
2019-05-31 10:42:17 -07:00
Lei Yu
fad8cec592 Merge "Fix issues in battery usage accounting" into qt-dev
am: 2148c1a207

Change-Id: Ia73d2e5ab630668b73a6dd6b69aa831a6262a80b
2019-05-31 10:41:54 -07:00
Julia Reynolds
2c47160eff Merge "Update notification settings animation" into qt-dev
am: 1746ccca94

Change-Id: I0901382721e411cdd3a3970fe85f13524853b944
2019-05-31 10:41:13 -07:00
Lei Yu
677d5a5e01 Merge "Fix issues in battery usage accounting" into qt-dev
am: 2148c1a207

Change-Id: Ifd2d4c3928ba706071a575c28db21c7586a2e692
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

Change-Id: I7024b636826f915e83bf2cb14c6c84addd4ba24a
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

Change-Id: I2ccf4ea47a87e16f0da8408d66ab372c4151abcc
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

Change-Id: I0d10bdd2cc36b599ee9d932dafe20e6baef94b1d
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

Change-Id: Id704c498feb80d8c66c472b08505dd492cbd708d
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

Change-Id: I933e00d2d75fbfe1c1d370f61df5b004bb99ec91
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

Change-Id: Ia64d44b5fd36823c1750ed8afc998f7619155824
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.

Bug: 132292477
Test: None.
Change-Id: Icae2cd4edbb22e2f3ea72e20f0ebd818f1ac6629
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

Change-Id: Idca81960cd2b22246afe4d197d906b69ab69699c
2019-05-31 06:42:56 -07:00
Julia Reynolds
dd806ce357 Merge "Reorder notification settings" into qt-dev am: 1abcbaa093 am: 760f617502
am: ef7ba1918a

Change-Id: I0478f3cbc6129a8674711bc2d717e7198557be52
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

Change-Id: I4766ad312a9bb06c66ccc74e25ebd141fd7db7b1
2019-05-31 06:37:30 -07:00
Julia Reynolds
ef7ba1918a Merge "Reorder notification settings" into qt-dev am: 1abcbaa093
am: 760f617502

Change-Id: I2b5f4e74eb601a78c7944cfb5e31b333c8c707bf
2019-05-31 06:37:28 -07:00
Julia Reynolds
760f617502 Merge "Reorder notification settings" into qt-dev
am: 1abcbaa093

Change-Id: I083414ad1486c393a89622a9d61f4dc8a9703e85
2019-05-31 06:32:30 -07:00
Julia Reynolds
53bbf9b78d Merge "Reorder notification settings" into qt-dev
am: 1abcbaa093

Change-Id: I0e6baba13bfeeee2bdb78b1eeb68f484e5c94b78
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

Change-Id: Ia8bb00f368a78471bf113d0c0d69e9791fb8082c
2019-05-31 06:18:22 -07:00
Joel Galenson
5a9c0f861e Merge "Remove Permissions Hub." into qt-dev am: 63088840c4 am: 58246f66db
am: 0709624634

Change-Id: I9ebf8ab89c1bd7cdbb0f46df75cd842dc50a3bee
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
Joel Galenson
0709624634 Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: 58246f66db

Change-Id: I87733a341c28ebd6bbaa3bfe846fc835dc4a745e
2019-05-31 06:12:29 -07:00
Joel Galenson
4e6553d435 Merge "Remove Permissions Hub." into qt-dev am: 63088840c4
am: d8efe209f7

Change-Id: I74cc8a834e40712dfc30e57768a7a603cd6bb5b6
2019-05-31 06:12:27 -07:00
Joel Galenson
d8efe209f7 Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I4d086debe20235d132fd62d96441c358ffe01b48
2019-05-31 06:07:30 -07:00
Joel Galenson
58246f66db Merge "Remove Permissions Hub." into qt-dev
am: 63088840c4

Change-Id: I59cef5b593630d75b6db51ae324c94f9dc3a8841
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
ff5dde9f05 Merge "Fix exception on non face-enabled devices" into qt-r1-dev am: 1a3112ab32
am: d3e686fc33

Change-Id: I067abe881c9ac0f511cf184343c12a6ac74d1e9d
2019-05-30 21:33:17 -07:00
TreeHugger Robot
c0fbb533d2 Merge "Guard NPE when using search view" 2019-05-31 04:27:43 +00:00