Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
65,814 Commits 1 Branch 0 Tags
26684c05005a60242d8d76b0c62a409e50b1c00a
Commit Graph

31756 Commits

Author SHA1 Message Date
Julia Reynolds
37e316a427 Update configure notifications screen am: f43cf08634 am: b84e194474 am: fa8f3a84dd am: 245a2af879 
Change-Id: I572c46d4847973262e28171256ee6529f5f5d8c6
 2020-04-17 22:13:09 +00:00
Julia Reynolds
fa8f3a84dd Update configure notifications screen am: f43cf08634 am: b84e194474 
Change-Id: I8844a5951be6d1932d40bd00c872d96d8e15dc56
 2020-04-17 21:17:24 +00:00
Julia Reynolds
b84e194474 Update configure notifications screen am: f43cf08634 
Change-Id: Idc63949ef2f2ecaaae7891a01d6eb48cbf830eaa
 2020-04-17 20:58:04 +00:00
Julia Reynolds
f43cf08634 Update configure notifications screen 
Test: atest
Bug: 153150072
Change-Id: I99ebe2cad5036a154c40bce54dbd6ddbd23c2323
 2020-04-17 12:47:06 -04:00
TreeHugger Robot
0570778831 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0 am: 3cab004e92 am: 6a29024181 
Change-Id: I39ac4373d34d9f9f92f8ab6feca93d6e1cff693f
 2020-04-17 11:16:59 +00:00
TreeHugger Robot
3cab004e92 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0 
Change-Id: Icfe81f6b080d5305de4492467804bad83bc157ca
 2020-04-17 10:39:57 +00:00
Yanting Yang
8356672f57 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 am: aefa9ea849 am: 0bef3161a7 
Change-Id: I0e5cda5fdad841388ee14138aef6bc0ddb999008
 2020-04-17 10:18:57 +00:00
TreeHugger Robot
e1e61d67b0 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 
Change-Id: Ie8fa7609ffaf252d012cdbf54d758ed20f5e06e9
 2020-04-17 10:18:53 +00:00
TreeHugger Robot
87883c7634 Merge "Fix incorrect app count displayed under special app access" into rvc-dev 2020-04-17 10:07:21 +00:00
Yanting Yang
aefa9ea849 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 
Change-Id: I0296e6afd75136175907f6dbf7ee80b30762d31f
 2020-04-17 09:46:48 +00:00
Yanting Yang
e611ebfb33 Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 
Change-Id: I23093ff82e7a4b5e51570653d1dfa015f09da675
 2020-04-17 09:26:42 +00:00
Yanting Yang
674e2c23a3 Merge "Do not generate copyable slices for Settings Search" into rvc-dev 2020-04-17 09:06:28 +00:00
Yanting Yang
b6c30a2c31 Do not generate copyable slices for Settings Search 
Copyable slices is to provide user a quickly sub-text copying way on
Settings Search. Since we plan to remove all sub-text from Settings
Search, the copying feature is no longer available.

Therefore, we don't need to generate copyable slices in Settings
anymore.

Impact search result:
Build number, Phone number, Hardware version, Serial number and IMEI

Bug: 143118037
Test: visual and robotests
Change-Id: I81474aed994678c42d73cc59e169573880de1378
 2020-04-17 13:25:22 +08:00
Tom Hsu
77ea4e4f92 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53 am: 4cf73d2013 am: a1eeca3949 
Change-Id: Idea1197a5437680b3812cd4ad22a670fb1fd1215
 2020-04-17 05:12:28 +00:00
Tom Hsu
4cf73d2013 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: 68f1de2a53 
Change-Id: I15e426aa232e07314e16c1cf875525cc645fe4ea
 2020-04-17 04:44:32 +00:00
Tom Hsu
68f1de2a53 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 
Change-Id: I3f950f8a09bc89fe6769206ac5d2d2c1e2648478
 2020-04-17 04:22:44 +00:00
Tom Hsu
a733ead043 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 
Change-Id: Ifd84da0751b08efa551bcde8a3d7a2c21b2e4f20
 2020-04-17 04:22:28 +00:00
Tom Hsu
7c84dc9959 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev 2020-04-17 04:01:10 +00:00
Zhen Zhang
9ed9c96d7c Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 
Change-Id: Id92f2edb0527b8f27a7c838a778831639c68d80a
 2020-04-17 03:22:45 +00:00
Zhen Zhang
5d6960e996 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 
Change-Id: Icf8bd0a19597127e27b6b736123143dc431fbabf
 2020-04-17 03:05:33 +00:00
Zhen Zhang
987a70e750 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 
Change-Id: If882edbe92b6efa5407be82528664b80f20d3e3f
 2020-04-17 03:05:22 +00:00
Weilun Du
f8757b7112 [Settings] Fix crashes caused by null bluetooth adapter and ethernet 
manager

Emulator system image doesn't support bluetooth and ethernet manager
yet.
BUG: 150408099

Signed-off-by: Weilun Du <wdu@google.com>
Change-Id: Iab4f7b962f01755fe7d84956f9b54374f1e17408
(cherry picked from commit 08e95d0db0)
 2020-04-16 16:56:28 -07:00
tom hsu
969a6a613c Fix failures on com.android.settings.network.ApnEditorTest 
Bug: 152376182
Test: make RunSettingsRoboTests
Change-Id: Ib718a4ed0163e07be748857a0dc7b2af92036c3f
 2020-04-17 03:45:40 +08:00
TreeHugger Robot
88ab771034 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: bafc52f0f0 am: 5e159c017c 
Change-Id: I9ce7751d0ae92ba6dc13c8204a5882364a62fb0c
 2020-04-16 16:55:33 +00:00
TreeHugger Robot
bafc52f0f0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c 
Change-Id: I3c86265ed7e91afe94b7b36ec2252f998758ea2c
 2020-04-16 16:29:43 +00:00
TreeHugger Robot
8f6de85b27 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 
Change-Id: I21981e1ceb800febebd1f4e5d819ea4831eb3896
 2020-04-16 16:16:22 +00:00
TreeHugger Robot
8f39c1380c Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 
Change-Id: I921ee0886440878a8ec0c231cb511019148be8f5
 2020-04-16 16:16:16 +00:00
TreeHugger Robot
afbf9e60c0 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev 2020-04-16 16:01:43 +00:00
Tom Hsu
b22f5daf13 Merge "Revert "Fix failures on com.android.settings.network.ApnEditorTest"" 2020-04-16 15:05:40 +00:00
Julia Reynolds
dbef46a5d5 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: d2d8115ac9 am: fb328c7bc6 
Change-Id: I8384671d90c0bb08df14840ddd9813129da63bfd
 2020-04-16 14:53:53 +00:00
Julia Reynolds
d2d8115ac9 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 
Change-Id: Iddf2bda7005bffe799b76f9a21d8937925fee693
 2020-04-16 14:25:55 +00:00
Julia Reynolds
27d039315f Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 
Change-Id: I739234dc3861dba8de2502424dbca9ee454c5b50
 2020-04-16 14:12:43 +00:00
Julia Reynolds
f1801907d8 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 
Change-Id: I40f34bf9f15c76ad1474a8d6096d47027d37b13a
 2020-04-16 14:12:27 +00:00
Julia Reynolds
0c99ecaec1 Merge "Launch subscreens with the correct user" into rvc-dev 2020-04-16 13:57:50 +00:00
Sunny Shao
d63c5ebff5 Fix incorrect app count displayed under special app access 
- This special app Google Play services will change its hasLauncherEntry
  value after receiving the MSG_LOAD_LAUNCHER.
- Update the summary while SpecialAppAccessPreferenceController is
  receiving the onLauncherInfoChanged callback.

Fixes: 150480524
Test: manual test
Change-Id: I26b99fce54606644ee5603b4ca4730267c0f7ce5
 2020-04-16 21:38:03 +08:00
Tom Hsu
b3bc413443 Revert "Fix failures on com.android.settings.network.ApnEditorTest" 
This reverts commit 66a530ec97.

Reason for revert: <have useless code>

Change-Id: Ic3190e168e74f196ef29a3af4e41fbb2ae129d17
 2020-04-16 13:08:16 +00:00
TreeHugger Robot
6313dd37e9 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 am: 30fdfef476 am: 3c290d9860 
Change-Id: I27ec15f9f0e3c9a6902b1754177b4d93d6c6c655
 2020-04-16 11:57:47 +00:00
TreeHugger Robot
30fdfef476 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 am: 8142527b35 
Change-Id: I392761026ae6e0bd76b5612a2794063c3591ef18
 2020-04-16 11:31:47 +00:00
TreeHugger Robot
3ca1b39596 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 
Change-Id: I483ba72fa1243efd2822b778b1621a431df200e3
 2020-04-16 11:15:56 +00:00
TreeHugger Robot
8142527b35 Merge "Support another new intent for mainline module intent" into rvc-dev am: 158bbe17f3 
Change-Id: Ibeb68b99a9c40bc61edc9706d596809d0c11e4f0
 2020-04-16 11:15:44 +00:00
TreeHugger Robot
158bbe17f3 Merge "Support another new intent for mainline module intent" into rvc-dev 2020-04-16 11:03:19 +00:00
Tsung-Mao Fang
54150c9942 Support another new intent for mainline module intent 
Mainline module team would like to create a new intent to support v2 UX.
In Settings side, if we found system supports this intent,
then we should navigate user to new place.

Test: Run robo test
Fix: 151189987
Change-Id: If4b437236b70c83a1f29a5c3d9e322178c8a6ec6
 2020-04-16 17:35:38 +08:00
Tsung-Mao Fang
b3bb7a0237 Fallback to AOSP emergency info if the original intent is broken 
If the variant of emergency info is broken, we should try to show
AOSP emergency info instead.

Test: Rebuilt rom and see the Ui. Run robo test
Fix: 154114259
Change-Id: I5bc3f6cbf9102a7b7299c3edf718a58101effbf8
 2020-04-16 17:23:52 +08:00
tim peng
92275727ce Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e am: 5c68b4a9a8 am: f693064f34 
Change-Id: I00964ca1b5fc7e1dac0ad663d6776756749d08f8
 2020-04-16 07:23:08 +00:00
tim peng
5c68b4a9a8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 am: 4d97cc4e8e 
Change-Id: I24505a511d0932c2ea17baad7750c1701d247d5a
 2020-04-16 06:52:38 +00:00
tim peng
93b092fff8 Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 
Change-Id: Ice66c6c264c880246dbeec4e072fa1f902294fcb
 2020-04-16 06:37:19 +00:00
tim peng
4d97cc4e8e Merge "Incorrect panel layout after rotation" into rvc-dev am: ea3a83e288 
Change-Id: Ia96f690a596633fab838eac2c5be99eec92508fc
 2020-04-16 06:37:06 +00:00
Tom Hsu
132526487f Merge "Fix failures on com.android.settings.network.ApnEditorTest" 2020-04-16 06:36:02 +00:00
tim peng
ea3a83e288 Merge "Incorrect panel layout after rotation" into rvc-dev 2020-04-16 06:10:15 +00:00
TreeHugger Robot
727a473fa4 Merge "Update flows for notification history" into rvc-dev am: 79a38a733f am: 10052a54ab am: 9ade4f4cb4 am: 79a1fa33a2 am: c7cd4f525f 
Change-Id: I42899bb9666e9d17c8a95acb29719343fccb8d0f
 2020-04-16 00:03:03 +00:00