Commit Graph

66120 Commits

Author SHA1 Message Date
Treehugger Robot
37ee14a792 [automerger skipped] Merge changes I6194592d,I5a02f847 am: 44146c8e3b am: ebea74264a -s ours
am skip reason: Change-Id I6194592d9a7bf4d4b7993fc344d7392bf5c296aa with SHA-1 c67a0d853b is in history

Change-Id: I3e9b8218b9ad4fdeb4b7d91b66f66881344b5036
2020-04-30 03:33:51 +00:00
Malcolm Chen
38687bab76 [automerger skipped] Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f am: b6fa2277f6 -s ours
am skip reason: Change-Id I5a02f847531988217cc6ab47e3b35ed319c1027c with SHA-1 80be9de6d0 is in history

Change-Id: I2151c3c3abe64328ef6f69adade622fb7b9700b5
2020-04-30 03:33:49 +00:00
Blake Kragten
6fe60521d1 Merge "Remove enhanced connectivity switch for non-pixel" into rvc-dev 2020-04-30 03:24:52 +00:00
Treehugger Robot
ebea74264a Merge changes I6194592d,I5a02f847 am: 44146c8e3b
Change-Id: I2ebc5edd89fb32b2698c8cfd6acb20342c9cec17
2020-04-30 03:17:19 +00:00
Malcolm Chen
b6fa2277f6 Define a helper link for 5G limitation in DSDS footer. am: 5e68080b1f
Change-Id: I3377b9cbc1d4722a8a96c18f40d1118e476c4ef7
2020-04-30 03:17:16 +00:00
Jay Aliomer
41ee5663ab Twilight Location off text
When location is disabled, dark theme and night light
will show text and button to take the user to location page

Fixes: 153115261
Fixes: 153115618
Test: manually turn off location and observe view
Change-Id: I24be2f26a4c9e1b3f2a17e83e6f91cb7685f2e28
2020-04-29 23:14:32 -04:00
Treehugger Robot
44146c8e3b Merge changes I6194592d,I5a02f847
* changes:
  Add check of canConnectTo5GInDsds to show NrDisabledInDsdsFooter
  Define a helper link for 5G limitation in DSDS footer.
2020-04-30 02:56:34 +00:00
Tim Peng
be4ed2a3cb Add "Play <APP> to" string
Bug: 155345595
Test: build pass
Change-Id: Ib656f0db2efa6f777ada2c2565493775e72634ae
2020-04-30 02:13:24 +00:00
Yanting Yang
9dc0a45fd8 Fix NPE crash when opening the app info from shortcut suggestion
It occurs NPE in invoking refreshUi() of AppButtonsPreferenceController
when user fully install the instant app from google play and then
directly open app info from the shortcut suggestion in launcher.

Root cause:
AppButtonsPreferenceController.refreshUi() will be invoked when user
directly open app info from the shortcut suggestion in launcher. In
refreshUi(), we will update the information of button preference, but
the preferences will not be initialized if device existed an instant
version for the app.

Solution:
Check button preference and initial them if need in refreshUi().

Fixes: 137854835
Test: visual, robotests
Change-Id: Id5c3e53b9db2683cab970c10eace7925d889eea3
2020-04-30 08:53:16 +08:00
TreeHugger Robot
56e5e5ab06 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 4bcea44f9c am: 9926c76546
Change-Id: I04fcb53c64b0205fa5e2c9a08dacf3cf91297ae4
2020-04-30 00:01:28 +00:00
TreeHugger Robot
9926c76546 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 4bcea44f9c
Change-Id: I2060be60ad1ebb12497513cafe7788589a34d000
2020-04-29 23:47:52 +00:00
TreeHugger Robot
90e7005350 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 7a41660242 am: 4539d41abc
Change-Id: I34a1f8cbefba2160f54a674a99b89a2486078946
2020-04-29 23:43:19 +00:00
TreeHugger Robot
43f77e46d3 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09 am: 7c24739c48
Change-Id: I66ca0f87fa6bb070c69d7ad04a0f750f7a041d7c
2020-04-29 23:41:14 +00:00
TreeHugger Robot
4539d41abc Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 7a41660242
Change-Id: I12983c2ed072beec2082bd671b35602663437e63
2020-04-29 23:29:41 +00:00
TreeHugger Robot
4bcea44f9c Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09
Change-Id: I55105a7dfa82b656c8a361606bc345837885880b
2020-04-29 23:29:33 +00:00
TreeHugger Robot
7c24739c48 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84 am: 9e4e794f09
Change-Id: Ibfec3437d07726fda09d4cf4a8976356965930d3
2020-04-29 23:29:05 +00:00
Treehugger Robot
bc5007dd72 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984 am: 8d55c46017
Change-Id: Ib7d729d1b146d7acb392ebceeea520300cb0bc62
2020-04-29 23:28:44 +00:00
Bob Badour
6e707e0189 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab am: 7c198d980d am: f761f7f7b5
Change-Id: Ia9cd5a77240c9b09201143dcdf754b2085c990cc
2020-04-29 23:28:02 +00:00
TreeHugger Robot
9e4e794f09 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
Change-Id: Ib54bda42c21dca85c8b58374d03c19f2f9c3ce15
2020-04-29 23:19:53 +00:00
TreeHugger Robot
7a41660242 Merge "Fix history task stack" into rvc-dev am: 7d1cfa4d84
Change-Id: I6112f47da149986b167befee9198d9f62d0c974d
2020-04-29 23:19:32 +00:00
Treehugger Robot
8d55c46017 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4 am: 99c2ccf984
Change-Id: I2f8c1e5b290340ae03addbf9eb46b8ac9011a79c
2020-04-29 23:17:54 +00:00
Bob Badour
f761f7f7b5 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab am: 7c198d980d
Change-Id: I76f3dae6858c484dee5ddb09a3956cdaac12f331
2020-04-29 23:17:47 +00:00
TreeHugger Robot
7d1cfa4d84 Merge "Fix history task stack" into rvc-dev 2020-04-29 23:04:13 +00:00
Treehugger Robot
99c2ccf984 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17 am: d6859736a4
Change-Id: I77a6c089aec6fe57f79ef7dc7f6630ee8fc68ae7
2020-04-29 23:01:07 +00:00
Bob Badour
7c198d980d Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5 am: 2cd2b9e4ab
Change-Id: I0f269573abc1d68816664f1ef020cb04dacfa69e
2020-04-29 23:00:38 +00:00
Treehugger Robot
d6859736a4 Merge "Disable 'Mobile data' selection after removing SIM" am: 87d1e30f17
Change-Id: I14dc87ff0f185bdbfb5734b6501f727e2cb19792
2020-04-29 22:50:24 +00:00
Bob Badour
2cd2b9e4ab Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5
Change-Id: Ifabb259302be383fad6555849876a4d7e3a0a71a
2020-04-29 22:50:17 +00:00
Treehugger Robot
87d1e30f17 Merge "Disable 'Mobile data' selection after removing SIM" 2020-04-29 22:34:39 +00:00
Grace Jia
7098379555 Disable 'Mobile data' selection after removing SIM
Bug: 153895858
Test: Manually remove SIM and test
Change-Id: I5934b01c047172ae2269e77e2fe0945aacba4ca1
Exempt-From-Owner-Approval: Telephony settings
2020-04-29 22:34:29 +00:00
Bob Badour
2ab7555be5 Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" 2020-04-29 22:32:10 +00:00
Bob Badour
edb5a95f5d Remove MODULE_LICENSE_APACHE2 from apps/Settings
Repositories containing third-party code need a METADATA and a
license_type. Repositories containing only first-party code no longer
need a MODULE_LICENSE_* file.

Bug: 68860345
Bug: 69058154
Bug: 151953481

Test: no code changes
Change-Id: I818112c2ff1f9c2fffeb92291b03c7753c0b083e
2020-04-29 13:12:26 -07:00
TreeHugger Robot
17887fea31 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 9e400e14c3 am: 9b697898d6
Change-Id: I39b1efe058cb0b7dd28f6ba4dd56ec1e86144dd4
2020-04-29 19:29:56 +00:00
TreeHugger Robot
d7bea7e161 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 7bb2488099
Change-Id: Icb25eb558ec6443c1e41906cb6eff5e490345c27
2020-04-29 19:10:27 +00:00
TreeHugger Robot
c8b2d09997 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9 am: e22a776b12
Change-Id: I8633badcf8c7ca68b9d7a48eb2272ab3162f0d57
2020-04-29 19:09:30 +00:00
TreeHugger Robot
9b697898d6 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662 am: 9e400e14c3
Change-Id: I927d2a024ef5c09a5acc4064d7577c759d464ad0
2020-04-29 19:09:29 +00:00
TreeHugger Robot
9e400e14c3 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662
Change-Id: If3c8e5947552fc3ec1455ef8215acf58a9ee31aa
2020-04-29 18:55:09 +00:00
TreeHugger Robot
7bb2488099 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: f57fcea662
Change-Id: Ic026c305eabbd86dc780292d666d0aa47e0c8ca9
2020-04-29 18:55:06 +00:00
TreeHugger Robot
e22a776b12 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3 am: 4d6ad1dec9
Change-Id: I72bfce2fd18f59c010ccb89203a7a7b3feb73ca6
2020-04-29 18:54:56 +00:00
TreeHugger Robot
4d6ad1dec9 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
Change-Id: Ia1d018e763df06a1bd9c750f805573a3070e7296
2020-04-29 18:40:34 +00:00
TreeHugger Robot
f57fcea662 Merge "Fix icon color in dark theme." into rvc-dev am: 7e94c5e3b3
Change-Id: Id187f39dc00fc84479f43545b71f70a64fab03d2
2020-04-29 18:40:08 +00:00
TreeHugger Robot
7e94c5e3b3 Merge "Fix icon color in dark theme." into rvc-dev 2020-04-29 18:02:45 +00:00
kholoud mohamed
7c84508e16 Fix icon color in dark theme.
Bug: 154582949
Test: visual testing
Change-Id: Ibb17f06c5b1d9745294af460565aa078c4e2baf2
2020-04-29 17:43:34 +01:00
Julia Reynolds
8f438d94c0 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6 am: c40e8da0e8
Change-Id: I8ade2d99ae85db6c5f6e4a2136b0115451f68c07
2020-04-29 16:23:06 +00:00
Julia Reynolds
f225e2e9b3 Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d am: de38eab8ff
Change-Id: I4f462887554f8f7da28439bdc46a3bb55fac9840
2020-04-29 16:22:52 +00:00
Julia Reynolds
573cd1d0aa Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: c6fe4407fe am: c50085fed5
Change-Id: Ia6037a761f3583bad69468c9ab6d1007c698e97c
2020-04-29 16:06:29 +00:00
Automerger Merge Worker
44c2169ca8 Merge "Fix bubble tests am: 99b363fb18 am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp am: e994133351
Change-Id: I11efdc0234e75d99e125a9f6bd82c973f455be5c
2020-04-29 16:06:21 +00:00
Julia Reynolds
c106e6bc03 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 68d3972a36
Change-Id: Id0e3fb0481c695fc2814df9ef66cb23c2cf8980e
2020-04-29 16:06:03 +00:00
Julia Reynolds
c40e8da0e8 Merge "Remove unused development setting" into rvc-dev am: e2eb832033 am: 04b6152ef0 am: 34190304f6
Change-Id: Idd375fa19764da78b9578fde838dec0d5e28def2
2020-04-29 16:05:01 +00:00
Julia Reynolds
de38eab8ff Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d574727d
Change-Id: If6b8048c2bd31b5554d2a9edb534da0ed67e4f2d
2020-04-29 16:04:33 +00:00
Julia Reynolds
e546135a18 Fix bubble tests am: 99b363fb18 am: d4045296ba am: 90d41ad625
Change-Id: Id579763544b0fb0f4e5dff56806596d70faeedf4
2020-04-29 16:04:32 +00:00