Fan Zhang
cad5eb221c
Merge "Delete a broken test" into qt-dev
...
am: c824a0cb82
Change-Id: I03296dda94edb42b9c9911a8594aca35bcb6465b
2019-05-01 07:10:51 -07:00
Mill Chen
f323f072de
Merge "Add synonym to "Add an account"" into qt-dev
...
am: 5f45c17a60
Change-Id: Iaf7353b0c761cc5a05422e9f054cf087765eb98c
2019-05-01 07:09:57 -07:00
Yohei Yukawa
93ddd72aa9
Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev
...
am: 104906b344
Change-Id: I8972d88937c8b84b820292a19058d0dc431bea02
2019-05-01 07:09:07 -07:00
Antony Sargent
4e1273c53f
Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
...
am: 2740c4a052
Change-Id: I7fe388644b137549807d74b0a7888fdd9d7eab74
2019-05-01 07:08:19 -07:00
Sunny Shao
6fba302a0d
Merge "Show mobile data slice in Search even no SIM card" into qt-dev
...
am: 8b285f2355
Change-Id: Ibb7ab1b8b0425938092b27dad980ef0c11ee2b66
2019-05-01 07:07:32 -07:00
Fan Zhang
ecf5deee74
[automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev
...
am: c962ea0978
-s ours
am skip reason: SHA1 c962ea0978
skipped by user hansson
Change-Id: I439b8949e02e823d34b22c615caa4341db612247
2019-05-01 07:06:28 -07:00
Fan Zhang
3f7b3d653f
Merge "Remove parent activity from TTS_SETTINGS" into qt-dev
...
am: 87631db975
Change-Id: I7e3bf0d7fb79a6529e4b06cfe5e770148b867843
2019-04-30 21:58:18 -07:00
Lifu Tang
3ee7292958
Merge "Update location app stats" into qt-dev
...
am: 5bfa4b24e2
Change-Id: Ida6d56aa38861ae76654f7a01e2a0921bd1b5e6f
2019-04-30 21:57:34 -07:00
hughchen
4d33bdc909
Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev
...
am: 9efd0c9685
Change-Id: Iaf9dc9b055e5ae544d499d52437c57d609b196b4
2019-04-30 21:56:49 -07:00
Yi-Ling Chuang
191e38abec
Merge "Only shows two suggestion cards at once." into qt-dev
...
am: 15524dbaee
Change-Id: I628873293315d2850f95e8f42fbb011417dc50a5
2019-04-30 21:56:01 -07:00
Lei Yu
cdce15c670
Merge "Fix a crash in battery settings page" into qt-dev
...
am: 116d4f14dc
Change-Id: Icf99350b41c88a6f3f6aaafd34477e5af57a49d3
2019-04-30 19:21:41 -07:00
Leon Liao
458f15a1da
Merge "Replace the placeholder animation." into qt-dev
...
am: fc20597133
Change-Id: I00743475bc757c197a1b53f8f3af90ab01c3eb82
2019-04-30 17:28:03 -07:00
Beverly
532ba82f14
Merge "Add null check to avoid settings crash" into qt-dev
...
am: a02cbbf23f
Change-Id: I2f142ae998946dd84fbb4c0e46b3d48b94b0ade3
2019-04-30 17:26:59 -07:00
Ilya Matyukhin
e1a84e5c23
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
...
am: 64693e31d9
Change-Id: I93a19028b425eadb10317b93cc5de7a60f9ccaa3
2019-04-30 17:26:12 -07:00
Julia Reynolds
4c77fd575c
Merge "Fix visibility and editability of importance fields" into qt-dev
...
am: 7c802e553f
Change-Id: I84ed085ac5dba8423f6d49beb2045c8a9460c6ed
2019-04-30 17:25:17 -07:00
Beverly
aa4adeda1c
Merge "Update DND strings - use pull-down shade" into qt-dev
...
am: 34fb0485fa
Change-Id: If173adf304c1ac232f34bc852df93873fd06f25b
2019-04-30 17:24:26 -07:00
Fan Zhang
c824a0cb82
Merge "Delete a broken test" into qt-dev
2019-04-30 20:55:35 +00:00
TreeHugger Robot
5f45c17a60
Merge "Add synonym to "Add an account"" into qt-dev
2019-04-30 20:12:40 +00:00
Fan Zhang
abdcf0038d
Merge "Tweak paddings for apps filter in app info screen" into qt-dev
...
am: 2da861cd52
Change-Id: I64d9c58d2ccca79ad461f79106d508ac62e84f1f
2019-04-30 11:42:32 -07:00
Pasty Chang
9f8406d876
Merge "Set QR scan activity to light theme in setup flow" into qt-dev
...
am: 54cddc70e5
Change-Id: I93fb36b2a44b37484f938a3a2066c0b5767de021
2019-04-30 11:41:18 -07:00
Malcolm Chen
6baa0e1422
Adding new strings needed for Enable MMS toggle.
...
am: 3b5a28e2e9
Change-Id: I28547d24978b048d9d3145520dce369daea2705f
2019-04-30 11:40:29 -07:00
Fan Zhang
e2e104f563
Delete a broken test
...
The test has been broken for a while.
Fixes: 120505691
Test: robotest
Change-Id: I92537d1676ba1dc94595e87893ca7324d4740a70
2019-04-30 11:37:21 -07:00
TreeHugger Robot
104906b344
Merge "Let Settings app use InputMethodInfo#loadIcon()" into qt-dev
2019-04-30 18:31:13 +00:00
TreeHugger Robot
2740c4a052
Merge "Add 'Erase SIM' to mobile network details page" into qt-dev
2019-04-30 16:47:54 +00:00
Clown SHEN
dba84b1781
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
...
am: fbcf3708a6
Change-Id: I9d3f7e0d3c5afe2c339401aceebaef82e6761d0e
2019-04-30 07:20:47 -07:00
TreeHugger Robot
8b285f2355
Merge "Show mobile data slice in Search even no SIM card" into qt-dev
2019-04-30 11:05:37 +00:00
TreeHugger Robot
c962ea0978
Merge "Delete bad translation for a few strings" into qt-dev
2019-04-30 09:31:43 +00:00
Mill Chen
fb4f7f8ab7
Add synonym to "Add an account"
...
To index the term "work profile" for "Add an account" setting, we added
a synonym to this setting.
Fixes: 111519999
Test: manual
Change-Id: Iabaac8d36433ef75790768fb46d14fe9b2553ad4
2019-04-30 17:31:43 +08:00
Bill Yi
91eefed117
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 47b32d0939
-s ours
am skip reason: subject contains skip directive
Change-Id: Icf4f2eb62d1e07c2a766bce1cda027db96bbf7c2
2019-04-30 00:15:16 -07:00
Andrew Sapperstein
d45dbafd4c
Merge "Add a gap in the ordering for phone numbers." into qt-dev
...
am: d464f67e31
Change-Id: I7c96c514fb4f665adc9095036f9fd6bb437fdbc2
2019-04-30 00:15:00 -07:00
Antony Sargent
ec2dcef796
Merge "Remove empty MNC filtering when retrieving available subscriptions" into qt-dev
...
am: 06da2980a0
Change-Id: I924eb0f0fdf4f95294b45f171f752784f8db4604
2019-04-30 00:14:16 -07:00
Andrew Sapperstein
706db87435
Merge "Remove "data usage" from search." into qt-dev
...
am: 655e2e55e9
Change-Id: I4dd878cc6377d15c2cfbebef9555c9b6c384e1c8
2019-04-30 00:13:08 -07:00
Andrew Sapperstein
e8bd1c48d0
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
...
am: 067332ca9e
Change-Id: I7659232cad1d477864b310cc83d41ae6a9bd4f0f
2019-04-30 00:12:23 -07:00
Raff Tsai
5458399357
Merge "Fix toggle button is enabled state but can't click" into qt-dev
...
am: f9fd3b9e17
Change-Id: I08bd28a91fa7d6e4d13d9844a72e3b26036f60a2
2019-04-30 00:11:37 -07:00
Fan Zhang
7ba7f47ae3
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
...
am: 4fe327858f
Change-Id: Ieaaf0c62fb2e4d5d6aa25ccd2cc62ad2dea04a41
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb
Merge "Hide number label if info is opportunistic" into qt-dev
...
am: 1a66d9b22f
Change-Id: I5163816c04b825a98067e63db18d4020dfbcdcd1
2019-04-30 00:10:07 -07:00
Andy Chou
5f82b6e72e
Merge "Avoid IMEI overrided by getSummary() for dual SIM condition" into qt-dev
...
am: 8c16ef2906
Change-Id: I2b024b585edf065d94d9f25dc97d333bf3a289c3
2019-04-30 00:09:23 -07:00
Chandan Nath
2ab7fab9a8
Merge "Always show backup settings (even if backup is deactivated)." into qt-dev
...
am: 2f2a3c4055
Change-Id: Ic6af3ffd48b508d93bbda564187547c90249337f
2019-04-30 00:08:26 -07:00
hughchen
a35353d687
Merge "Fix media output slice is empty even BT device is paired" into qt-dev
...
am: 668edcfb95
Change-Id: If6fa5506edd2e89a1a725414ed791284825ad8a5
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef
Merge "Add timestamp to recent used apps" into qt-dev
...
am: 80be930357
Change-Id: I9efc997ecef8785f9da838a5cbadb36e81006614
2019-04-30 00:06:49 -07:00
Kevin Chyn
4fcd3c6056
Merge changes I74d677dc,I17f4db85 into qt-dev
...
am: 8888d346d1
Change-Id: I0d6523d1a67b4dd1c99d30ebcdd3637535944983
2019-04-30 00:05:57 -07:00
Lei Yu
c86d7fb326
Merge "Update color filter for battery saver mode" into qt-dev
...
am: 30991963e4
Change-Id: Ida0eced5ae330de91a0f647f3f2c7eda60f1d8db
2019-04-30 00:05:05 -07:00
Fan Zhang
85dde88aa5
Merge "Include always ask button in SIM picker dialog" into qt-dev
...
am: d414c64dc3
Change-Id: I121e662ca5dad110ac53caa55cb8b72501e2bf4a
2019-04-30 00:04:22 -07:00
Salvador Martinez
958dea2303
Merge "Add keywords for battery saver schedule" into qt-dev
...
am: 3825e09706
Change-Id: If0efe8c77fa296dca1a9f5ab2638b9bf1be87617
2019-04-30 00:03:30 -07:00
Salvador Martinez
0677441d03
Merge "Fix broken dark ui test" into qt-dev
...
am: 1eb92917c9
Change-Id: I96fb30ab6a4fd1a0b82727c4e3969b2e59c5d721
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
...
am: c7564be562
Change-Id: I86c35f4c8d4dde32592ddec09926e226dbcc0751
2019-04-30 00:01:51 -07:00
TreeHugger Robot
87631db975
Merge "Remove parent activity from TTS_SETTINGS" into qt-dev
2019-04-30 03:40:22 +00:00
TreeHugger Robot
5bfa4b24e2
Merge "Update location app stats" into qt-dev
2019-04-30 02:50:58 +00:00
TreeHugger Robot
9efd0c9685
Merge "Make UI smoothly when switch device in MediaOuput slice" into qt-dev
2019-04-30 01:52:37 +00:00
Yohei Yukawa
8cb387adae
Let Settings app use InputMethodInfo#loadIcon()
...
This is a follow up CL to my previous CL [1], which attempted to show
the most appropriate IME icon even when multiple IMEs are implemented
in a single APK.
This CL simplifies the way how IME icon is obtained in the Settings
app, by simply using InputMethodInfo#loadIcon(), which already does
what we want.
Notable user-visible behavior changes are:
- Like before my previous CL was submitted, android:logo will not be
used in the IME settings (again).
- Icons shown in IME settings start having (user) badges like other
settings pages.
- If no icon is available in IME,
PackageManager#getDefaultActivityIcon() will be used. This is
actually consistent with other settings pages.
[1]: I406ccc0d53e6ec69793c2fc8be8c6c1c90b34811
2cae5b8952
Bug: 28204635
Fix: 131432102
Test: Manually verified as follows.
1. Build aosp_taimen-userdebug and flash it
2. Install TestDPC.
3. Set up a work profile
4. Open Settings App -> System -> Languages & input
-> Advanced -> Virtual keyboard for work
5. Make sure the icon of "Android Keyboard (AOSP)" has a small badge.
6. Tap "Manage keyboards"
7. Make sure the icon of "Android Keyboard (AOSP)" has the same icon
as the step 5.
8. Open Settings App -> System -> Languages & input
-> Virtual keyboard
9. Make sure the icon of "Android Keyboard (AOSP)" does not have a
small badge on it.
10. Tap "Manage keyboards"
11. Make sure the icon of "Android Keyboard (AOSP)" has the same icon
as the step 9.
Change-Id: Ie9be1eb3071abcc2df7723ceb10d76fe458c4808
2019-04-29 18:11:33 -07:00