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
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
c50085fed5
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
am: c6fe4407fe
...
Change-Id: I5a1dd1e140503957a3335b92f0687a928aa40b30
2020-04-29 15:53:15 +00:00
Automerger Merge Worker
e994133351
Merge "Fix bubble tests am: 99b363fb18
am: 8c5d6b6d5f" into rvc-d1-dev-plus-aosp
2020-04-29 15:53:06 +00:00
Julia Reynolds
d695f0e907
Fix bubble tests am: 99b363fb18
am: 8c5d6b6d5f
...
Change-Id: I6b29bb7f13044a899ef05094851bf9246bf3a283
2020-04-29 15:53:02 +00:00
Julia Reynolds
68d3972a36
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
am: 04b6152ef0
...
Change-Id: I14a3372d2ca7304667e3923b94d1a377eb927aa9
2020-04-29 15:52:56 +00:00
Julia Reynolds
90d41ad625
Fix bubble tests am: 99b363fb18
am: d4045296ba
...
Change-Id: I5eef62051373d7efbeb2b1bc63629f60edef931d
2020-04-29 15:52:44 +00:00
Julia Reynolds
04b6152ef0
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: Ic77ae688d2b211a1dc3ad5c0b8e2b5967698604e
2020-04-29 15:42:46 +00:00
Julia Reynolds
c6fe4407fe
Merge "Remove unused development setting" into rvc-dev am: e2eb832033
...
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
2020-04-29 15:42:45 +00:00
Julia Reynolds
d4045296ba
Fix bubble tests am: 99b363fb18
...
Change-Id: If84a190e7c59cdaed74c0277a2703860b85785e1
2020-04-29 15:42:00 +00:00
Julia Reynolds
8c5d6b6d5f
Fix bubble tests am: 99b363fb18
...
Change-Id: Ie06e993258c7c3069e28fb280ed24bed32675133
2020-04-29 15:41:47 +00:00
Julia Reynolds
e2eb832033
Merge "Remove unused development setting" into rvc-dev
2020-04-29 15:25:24 +00:00
Julia Reynolds
99b363fb18
Fix bubble tests
...
Test: atest
Fixes: 155239388
Change-Id: I8a32098b9a36ea1c8eabaf235b37d1e190419937
2020-04-29 13:58:46 +00:00
TreeHugger Robot
90cd472a7e
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
am: d5cf3b0a5e
...
Change-Id: I054b6c61d3724fc8041fd19fb7dd8b4650cd5d50
2020-04-29 13:38:28 +00:00
TreeHugger Robot
27c76c3075
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
am: 5c6094bcf4
...
Change-Id: I84b0ddf08b3efa97c7b082c613c18b254471c61d
2020-04-29 13:38:14 +00:00
TreeHugger Robot
d5cf3b0a5e
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
...
Change-Id: Idfd8ff9e9da16191add8c764370e20b5b6ad174f
2020-04-29 13:22:56 +00:00
TreeHugger Robot
5c6094bcf4
Merge "Fix the preference index conflict problem" into rvc-dev am: e76cdc27d0
...
Change-Id: Ibc3eb51b98ea8dbb864731f92cc5a503d297d857
2020-04-29 13:22:48 +00:00
TreeHugger Robot
e76cdc27d0
Merge "Fix the preference index conflict problem" into rvc-dev
2020-04-29 13:01:45 +00:00
Neil Fuller
d76d0c680b
Merge "Fix missing zone strings in some cases" am: 738df11447
am: 6a19fdf877
am: 6bcbd8ed89
...
Change-Id: I696eafa89264541b6c98d864f8d75c2cdeb4926d
2020-04-29 12:57:22 +00:00
Neil Fuller
6bcbd8ed89
Merge "Fix missing zone strings in some cases" am: 738df11447
am: 6a19fdf877
...
Change-Id: Id54f91141814eb0f1adda28f9ec72b48f434c997
2020-04-29 12:45:01 +00:00
Neil Fuller
6a19fdf877
Merge "Fix missing zone strings in some cases" am: 738df11447
...
Change-Id: I66ba5583cdd3632c6e6efb47fb1c0a0ea3b137cb
2020-04-29 12:30:24 +00:00
Neil Fuller
738df11447
Merge "Fix missing zone strings in some cases"
2020-04-29 12:18:53 +00:00
jasonwshsu
e76f541f7c
Logs accessibility service user trigger status.
...
* Uses the atom AccessibilityServiceReported in westworld.
Bug: 151285965
Test: make statsd_testdrive && ./out/host/linux-x86/bin/statsd_testdrive 267
Change-Id: Id6a109e4e90c09f2310d92533cd4632875712f81
2020-04-29 20:16:14 +08:00
Sunny Shao
502a5eb1c5
Fix the preference index conflict problem
...
Bug: 153888035
Test: manual test
Change-Id: I6c67d2fea752487ceb5fa05c6537df980a0f8d6a
2020-04-29 11:53:55 +00:00
hoffc
dbb42d1e8f
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
-s ours am: 01b5c4b51f
-s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 d6c805f0bb
is in history
Change-Id: Ice6979bfa5ec74ae5802fe156fe3b1a475db5bd1
2020-04-29 10:33:13 +00:00
hoffc
3bb45a9d9e
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
am: 535ebae5fb
-s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
is in history
Change-Id: I92bdadf3a9c5a93376c1392cf01c28a17fe35f3b
2020-04-29 10:32:49 +00:00
hoffc
01b5c4b51f
[automerger skipped] Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
-s ours
...
am skip reason: Change-Id I0b10a07c1767cda74096dc44ef7ffa7839a9aae4 with SHA-1 4b575ec0d1
is in history
Change-Id: I2f1e4bbf75585aad6d6cfe04b3a40e988d02b437
2020-04-29 10:12:45 +00:00
hoffc
535ebae5fb
Settings: Fix force close when destory sim lock fragment view am: d6c805f0bb
...
Change-Id: I1c1c3b249f938ee487dc9346bcad4c9223e2e4e7
2020-04-29 10:12:39 +00:00
SongFerng Wang
4d8db97e90
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
am: 7999b0a9a2
am: d5cc228c82
...
Change-Id: I0a4007846f5a75bf83fd6c5a4992eb72bad505f0
2020-04-29 09:24:18 +00:00
Neil Fuller
eafec7a244
Fix missing zone strings in some cases
...
ICU's TimeZoneNames requires a "canonical" zone ID, otherwise it will
return no data. Usually the ID being used is the same as the canonical
ID so there's no problem. TZDB version 2020a switched the ID of one of
Greenland's zones from America/Godthab to America/Nuuk, and ICU/CLDR
hold their translation data against America/Godthab in the current
version of ICU on Android.
Bug: 155167041
Test: Manual - viewed settings on a device with the tzdb 2020a update
Change-Id: Ia89c777a832f8b41c8d56d3327a9b7370ba44b52
2020-04-29 10:16:19 +01:00
SongFerng Wang
d5cc228c82
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
am: 7999b0a9a2
...
Change-Id: I99e0482c5102182c50d171c733927b7c29dddbca
2020-04-29 09:08:42 +00:00
Alex Johnston
f4b2859be1
Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
am: 20555b3e39
...
Change-Id: Ie3c5f305b2c4eb25dc12ce6db4df0428a3b9e047
2020-04-29 08:50:25 +00:00
SongFerng Wang
7999b0a9a2
Merge "Settings: Fix force close when destory sim lock fragment view" am: 0d4010c5e5
...
Change-Id: I1799dd42b0400e29772bb01ddeb957031df6aa8b
2020-04-29 08:50:04 +00:00