Commit Graph

61126 Commits

Author SHA1 Message Date
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
Bob Badour
2cd2b9e4ab Merge "Remove MODULE_LICENSE_APACHE2 from apps/Settings" am: 2ab7555be5
Change-Id: Ifabb259302be383fad6555849876a4d7e3a0a71a
2020-04-29 22:50:17 +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
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
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
c6fe4407fe Merge "Remove unused development setting" into rvc-dev am: e2eb832033
Change-Id: I834d268678426e9173edacb0c5c9a52fe6941946
2020-04-29 15:42:45 +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
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
e76cdc27d0 Merge "Fix the preference index conflict problem" into rvc-dev 2020-04-29 13:01:45 +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
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
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
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
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
hoffc
d6c805f0bb Settings: Fix force close when destory sim lock fragment view
Sim lock fragment does not override its parent onCreateView method and diretly
return null, which results in NPE when destory after removing Sim card.

Override its parent onCreateView when no sim card inserted.

Bug: 154743278
Test: build pass
Change-Id: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
Merged-In: I0b10a07c1767cda74096dc44ef7ffa7839a9aae4
2020-04-29 16:34:21 +08:00
Alex Johnston
20555b3e39 Merge "Check if FRP policy is supported in Settings" into rvc-dev am: d1408a66a6
Change-Id: Ia730a919a16bb89f4d4543bc5cd592885ff730fd
2020-04-29 08:34:00 +00:00
SongFerng Wang
0d4010c5e5 Merge "Settings: Fix force close when destory sim lock fragment view" 2020-04-29 08:31:05 +00:00
Alex Johnston
d1408a66a6 Merge "Check if FRP policy is supported in Settings" into rvc-dev 2020-04-29 08:19:14 +00:00
Menghan Li
36d7ad2e0d Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev am: 981d10db0b
Change-Id: Iae5b3d775430bbdbb789be190a61dfbfb7975463
2020-04-29 08:14:13 +00:00
Menghan Li
981d10db0b Merge "Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog." into rvc-dev 2020-04-29 07:59:35 +00:00
Zoey Chen
5ef8e70bba Merge "Improve the performance of displaying preference." into rvc-dev am: e6b7e24a09
Change-Id: I501cd6da5ab4672cc7989b07a9c351953238ffae
2020-04-29 06:12:00 +00:00
Zoey Chen
e6b7e24a09 Merge "Improve the performance of displaying preference." into rvc-dev 2020-04-29 05:57:12 +00:00
menghanli
de1258f9cf Fix InvisibleToggle type service does not turn on or turn off correctly when edit shortcut dialog.
Root cause: service status is not updated after the shortcut status
changed.

Next: Add callback to update the service status

Bug: 155157599
Test: Manual test
Change-Id: I286a04d43066c787304c54eb7b0dfdac5728b6ac
2020-04-29 13:44:54 +08:00
TreeHugger Robot
2ec23fb8ab [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8c28127323 -s ours
am skip reason: subject contains skip directive

Change-Id: I2a33923cdeb291084ee314a7ad77431aae6492ce
2020-04-29 05:40:15 +00:00
TreeHugger Robot
8c28127323 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:37:45 +00:00
TreeHugger Robot
9acc933b12 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: fdb8558d88 -s ours
am skip reason: subject contains skip directive

Change-Id: I43ddf4d5c4a2db654146693b204237aa04139f90
2020-04-29 05:33:38 +00:00
TreeHugger Robot
b47f88ee05 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev am: 4c221d1609
Change-Id: I5db9bb66a86b1377f43bbf35b4410a44a79d4755
2020-04-29 05:33:23 +00:00
TreeHugger Robot
fdb8558d88 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-29 05:24:29 +00:00
TreeHugger Robot
4c221d1609 Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev 2020-04-29 05:17:30 +00:00
zoey chen
84587b1aa3 Improve the performance of displaying preference.
- Set a variable to record the status then replace getAvailabilityStatus() with it.

Test: manual test, use command to run MobileNetworkSettings and record it.
Bug: 154061428
Change-Id: Ia13a75a3821bb6c17d0dfeffb5043f47b60adf61
2020-04-29 11:21:36 +08:00
Paul Chang
efe10c0b7b Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev am: e52353609e
Change-Id: I507f80a8acfac98fac9594d45a1fb86588aab65c
2020-04-29 02:55:09 +00:00
Paul Chang
e52353609e Merge "Fix - Bug report handler settings is not shown when it is launched by a work profile app." into rvc-dev 2020-04-29 02:38:45 +00:00
TreeHugger Robot
f2df3a44d6 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev am: 7a2f3dd8a7
Change-Id: I212bb31c2b1bf27b23da75853a0dbfa7074247a8
2020-04-29 02:00:40 +00:00
TreeHugger Robot
7a2f3dd8a7 Merge "Fix NPE if CarrierConfigManager is not available" into rvc-dev 2020-04-29 01:44:42 +00:00
Bill Yi
6de079f842 Import translations. DO NOT MERGE
Change-Id: Ia9288eff67da11149c3207ff4c99093b5b4a2271
Auto-generated-cl: translation import
2020-04-28 17:26:06 -07:00
Bill Yi
2a3fe1c938 Import translations. DO NOT MERGE
Change-Id: I110ea7607bf1a03f53ec852eb9fa791f7ad7a2f3
Auto-generated-cl: translation import
2020-04-28 16:54:21 -07:00
Julia Reynolds
6b2716fce0 Remove unused development setting
Test: atest
Fixes: 151821676
Change-Id: I59338340ac88873d20cd715c82723590af64acd3
2020-04-28 19:11:47 -04:00
Kevin Chyn
1895f8b5f2 Move ImeAwareTextEdit to android.widget
Allows it to be used in more projects

Bug: 154161590

Test: Manually opened each setting that was impacted
Change-Id: Ife59074e5f8ffa76c2c81cca4022ca200bb59526
2020-04-28 15:57:40 -07:00
Mady Mellor
ec9e965d90 Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev am: 2b42301a6e
Change-Id: I382f080699006d2a3d160290f7b71d84cd65f033
2020-04-28 22:30:18 +00:00
Mady Mellor
2b42301a6e Merge "Add list of selected/excluded convos to bubble settings" into rvc-dev 2020-04-28 22:17:05 +00:00
Julia Reynolds
b97501ff23 Fix some icons on conversation screen am: 1a2e7ad52f
Change-Id: Iee93e4294fb026c6d62f7bd1cb7bdc37404e9619
2020-04-28 20:33:48 +00:00
Mady Mellor
a27918494f Add list of selected/excluded convos to bubble settings
* Some changes to extend AppConversationListPrefController
* When a user removes something from the selected or
  excluded list that resets the channel setting

Bug: 148619540
Test: make -j40 RunSettingsRoboTests ROBOTEST_FILTER="Bubble"
Change-Id: I7a9ed7b70208dbdefca6c3c09d34d55c65f06408
2020-04-28 13:18:56 -07:00
Julia Reynolds
1a2e7ad52f Fix some icons on conversation screen
Test: manual
Fixes: 154930822
Change-Id: Ic480203f494eaccd743a7c77895596174f52539b
2020-04-28 19:07:08 +00:00