Fan Zhang
ecf5deee74
[automerger skipped] Merge "Delete bad translation for a few strings" into qt-dev
...
am: c962ea0978c962ea0978
2019-05-01 07:06:28 -07:00
Fan Zhang
3f7b3d653f
Merge "Remove parent activity from TTS_SETTINGS" into qt-dev
...
am: 87631db975
2019-04-30 21:58:18 -07:00
Lifu Tang
3ee7292958
Merge "Update location app stats" into qt-dev
...
am: 5bfa4b24e2
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
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
2019-04-30 21:56:01 -07:00
Lei Yu
cdce15c670
Merge "Fix a crash in battery settings page" into qt-dev
...
am: 116d4f14dc
2019-04-30 19:21:41 -07:00
Leon Liao
458f15a1da
Merge "Replace the placeholder animation." into qt-dev
...
am: fc20597133
2019-04-30 17:28:03 -07:00
Beverly
532ba82f14
Merge "Add null check to avoid settings crash" into qt-dev
...
am: a02cbbf23f
2019-04-30 17:26:59 -07:00
Ilya Matyukhin
e1a84e5c23
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
...
am: 64693e31d9
2019-04-30 17:26:12 -07:00
Julia Reynolds
4c77fd575c
Merge "Fix visibility and editability of importance fields" into qt-dev
...
am: 7c802e553f
2019-04-30 17:25:17 -07:00
Beverly
aa4adeda1c
Merge "Update DND strings - use pull-down shade" into qt-dev
...
am: 34fb0485fa
2019-04-30 17:24:26 -07:00
Fan Zhang
abdcf0038d
Merge "Tweak paddings for apps filter in app info screen" into qt-dev
...
am: 2da861cd52
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
2019-04-30 11:41:18 -07:00
Malcolm Chen
6baa0e1422
Adding new strings needed for Enable MMS toggle.
...
am: 3b5a28e2e9
2019-04-30 11:40:29 -07:00
Clown SHEN
dba84b1781
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
...
am: fbcf3708a6
2019-04-30 07:20:47 -07:00
TreeHugger Robot
c962ea0978
Merge "Delete bad translation for a few strings" into qt-dev
2019-04-30 09:31:43 +00:00
Bill Yi
91eefed117
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
...
am: 47b32d0939
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
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
2019-04-30 00:14:16 -07:00
Andrew Sapperstein
706db87435
Merge "Remove "data usage" from search." into qt-dev
...
am: 655e2e55e9
2019-04-30 00:13:08 -07:00
Andrew Sapperstein
e8bd1c48d0
Merge "Move SIM_SUB_INFO_SETTINGS to NetworkDashboardActivity." into qt-dev
...
am: 067332ca9e
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
2019-04-30 00:11:37 -07:00
Fan Zhang
7ba7f47ae3
Merge "Fix incorrect mapping to get subscriptioninfo" into qt-dev
...
am: 4fe327858f
2019-04-30 00:10:49 -07:00
Lei Yu
f6ff7a02fb
Merge "Hide number label if info is opportunistic" into qt-dev
...
am: 1a66d9b22f
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
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
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
2019-04-30 00:07:39 -07:00
Lifu Tang
68310109ef
Merge "Add timestamp to recent used apps" into qt-dev
...
am: 80be930357
2019-04-30 00:06:49 -07:00
Kevin Chyn
4fcd3c6056
Merge changes I74d677dc,I17f4db85 into qt-dev
...
am: 8888d346d1
2019-04-30 00:05:57 -07:00
Lei Yu
c86d7fb326
Merge "Update color filter for battery saver mode" into qt-dev
...
am: 30991963e4
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
2019-04-30 00:04:22 -07:00
Salvador Martinez
958dea2303
Merge "Add keywords for battery saver schedule" into qt-dev
...
am: 3825e09706
2019-04-30 00:03:30 -07:00
Salvador Martinez
0677441d03
Merge "Fix broken dark ui test" into qt-dev
...
am: 1eb92917c9
2019-04-30 00:02:41 -07:00
Yanting Yang
4bcd5b2cfd
Merge "Improve the latency of NotificationChannelSlice" into qt-dev
...
am: c7564be562
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
TreeHugger Robot
15524dbaee
Merge "Only shows two suggestion cards at once." into qt-dev
2019-04-30 00:58:18 +00:00
TreeHugger Robot
116d4f14dc
Merge "Fix a crash in battery settings page" into qt-dev
2019-04-30 00:19:39 +00:00
Fan Zhang
d87f485a6f
Delete bad translation for a few strings
...
- wifi_calling_mode_choices
- wifi_calling_mode_choices_without_wifi_only
Fixes: 130333622
Test: rebuild
Change-Id: Ie879f914b4c720842115e2d266eb7c44f358c36a
2019-04-29 16:17:11 -07:00
Leon Liao
fc20597133
Merge "Replace the placeholder animation." into qt-dev
2019-04-29 23:03:02 +00:00
Lei Yu
aa625bd06e
Fix a crash in battery settings page
...
Regression from ag/7161923, in this case we should use onResume/onPause
pair. Also sort the method to fit android lifecycle.
Bug: 131615524
Test: RunSettingsRoboTests
Change-Id: I299032bfeb119dac293039917c6673dd4c0ef4e0
2019-04-29 15:43:57 -07:00
Fan Zhang
bcd8a25e00
Remove parent activity from TTS_SETTINGS
...
So back button takes user back within their original nav stack.
Fixes: 131395471
Test: manual
Change-Id: I144f4122dca2db6c416412737f9aa07507c5a45f
2019-04-29 13:35:20 -07:00
TreeHugger Robot
a02cbbf23f
Merge "Add null check to avoid settings crash" into qt-dev
2019-04-29 20:26:26 +00:00
Salvador Martinez
dfc1da749f
Merge "Update BatteryUtils to update system battery estimate cache" into qt-dev
...
am: b96e56b16e
2019-04-29 13:25:23 -07:00
TreeHugger Robot
64693e31d9
Merge changes from topic "fingerprint-settings-after-enrollment" into qt-dev
...
* changes:
Show fingerprint preferences after enrolling from settings
Run postEnroll() after enrolling from SUW
2019-04-29 18:03:45 +00:00
TreeHugger Robot
7c802e553f
Merge "Fix visibility and editability of importance fields" into qt-dev
2019-04-29 17:04:02 +00:00
TreeHugger Robot
34fb0485fa
Merge "Update DND strings - use pull-down shade" into qt-dev
2019-04-29 16:50:25 +00:00
Fan Zhang
2da861cd52
Merge "Tweak paddings for apps filter in app info screen" into qt-dev
2019-04-29 16:29:30 +00:00
Beverly
23c07c8727
Add null check to avoid settings crash
...
Test: manual
Fixes: 131580180
Change-Id: I128d1b23ca33c06f049d8fe4ca3e56c5abefae5f
2019-04-29 15:40:14 +00:00
