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
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
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
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
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
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
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
Change-Id: Iee088214fe89cc79a33bff4b7de98a7648ace5cf
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
Beverly
811998f4b9
Update DND strings - use pull-down shade
...
- "Notification list" updated to "pull-down shade"
- DND text messages should be messages
Test: manual
Fixes: 131434487
Change-Id: I2740a462042867e58f190f4b49e1aa7a8f1cf126
2019-04-29 08:52:21 -04:00
Yi-Ling Chuang
ec01bff5c4
Only shows two suggestion cards at once.
...
Displaying too many cards may overwhelm users, so limit
the number of suggestion cards that should be displayed to two.
Fixes: 126213965
Test: robotests
Change-Id: I17c43746f475b31121c5809e0e8c6cf932efb99d
2019-04-29 18:30:28 +08:00
Julia Reynolds
a540fa56d4
Fix visibility and editability of importance fields
...
- Block field should always be visible
- Locked by OEM: cannot block or change importance
- Locked by default app: cannot block, can change importance
- Locked by system app: cannot block, can change importance
- system app but blockable: can block, can change importance
Test: robotests
Fixes: 131248127
Change-Id: Ifa718c84573dd5125aefa4f672a79dc4f267d515
2019-04-28 22:01:36 -04:00
Pasty Chang
54cddc70e5
Merge "Set QR scan activity to light theme in setup flow" into qt-dev
2019-04-29 01:52:11 +00:00
Ilya Matyukhin
8979f84865
Show fingerprint preferences after enrolling from settings
...
Bug: 131231334
Test: tested on blueline
Change-Id: Ifd43f28001fcb42ec61a62ad6656d2da2a0629eb
2019-04-28 16:31:54 -07:00
Ilya Matyukhin
cee87535e2
Run postEnroll() after enrolling from SUW
...
Bug: 131231334
Test: tested on blueline
Change-Id: I225725edb1c3379f2f3f5bc8b5cbe9adddb49f59
2019-04-28 16:24:29 -07:00
Malcolm Chen
3b5a28e2e9
Adding new strings needed for Enable MMS toggle.
...
Bug: 130222866
Test: build
Change-Id: If2a5cc20260fd2d1ed000e5c5531c2c11ab58b3c
2019-04-27 10:06:35 -07:00
Clown SHEN
fbcf3708a6
Merge "Show "Disconnected" instead of "Saved" in detail page summary" into qt-dev
2019-04-27 06:42:45 +00:00