PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,234 Commits 1 Branch 0 Tags
0af5bc2a6aa746ad57d4faa216c2e96e1fb28a23
Commit Graph

61234 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0af5bc2a6a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours am: d37783a7ac -s ours 
am skip reason: subject contains skip directive

Change-Id: I84e509f236d3ea7b26a6014ec3b911314810f438
 2020-04-19 17:06:43 +00:00
TreeHugger Robot
d37783a7ac [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours am: a1dd01f5c3 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ia9d2b6c706a79da6a2a2772137b50ca0ccd1a720
 2020-04-19 16:53:40 +00:00
TreeHugger Robot
a1dd01f5c3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 517dfeb385 -s ours 
am skip reason: subject contains skip directive

Change-Id: I4bdcdfb0126c7ca79e7726bd70db546537133763
 2020-04-19 16:28:45 +00:00
TreeHugger Robot
517dfeb385 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-04-19 15:48:36 +00:00
Bill Yi
4437f7dc4b [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours am: 935ff6a18a -s ours am: b0ee01b3ab -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib3b50ea9b089ebc045c4048978015b215359f0e5
 2020-04-19 09:05:20 +00:00
Bill Yi
b0ee01b3ab [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours am: 935ff6a18a -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie466022993d60576aa4371dc96240cd2d44eac61
 2020-04-19 08:48:38 +00:00
Bill Yi
1b87a5528c Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I01bde29a6ada6179c207cf2f0f6bde1a8dbffceb
 2020-04-19 01:38:42 -07:00
Bill Yi
935ff6a18a [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours am: 90cce123e5 -s ours 
am skip reason: subject contains skip directive

Change-Id: I2ca017ad434243993b9ac12f0b3be09789374b69
 2020-04-19 08:22:40 +00:00
Bill Yi
90cce123e5 [automerger skipped] Import translations. DO NOT MERGE am: f6f96f8a85 -s ours 
am skip reason: subject contains skip directive

Change-Id: I3e5cce528fa6eccc7e7de29516b96e54cfddddb1
 2020-04-19 08:05:02 +00:00
Bill Yi
f6f96f8a85 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: Ia460d84145b5e6f1ff7a4fb93ad34510ed1a6800
 2020-04-18 22:28:22 -07:00
Julia Reynolds
708bc1c530 Update configure notifications screen am: f43cf08634 am: b84e194474 am: c1235654ef 
Change-Id: I94467b851985d6fe74cafe2f3f76fb83a9fef887
 2020-04-17 21:51:00 +00:00
Julia Reynolds
c1235654ef Update configure notifications screen am: f43cf08634 am: b84e194474 
Change-Id: Iceef427af06d9faa17737801fb5ab0274716fcc4
 2020-04-17 21:19:13 +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
16f174c543 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0 am: 9e72486b90 
Change-Id: I4f234f0843f4178c0c82e8978ffc0b2d3999b060
 2020-04-17 11:00:31 +00:00
TreeHugger Robot
9e72486b90 Merge "Fix incorrect app count displayed under special app access" into rvc-dev am: 87883c7634 am: e1e61d67b0 
Change-Id: I21a71cd24ff61441392ab30a2253bf87a1e8a2ac
 2020-04-17 10:40:10 +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
ddc74cdc3c Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 am: 7cfd82900c 
Change-Id: Ia38c2792f01c81033e64bb45c714c532e759f3ae
 2020-04-17 10:02:21 +00:00
Yanting Yang
7cfd82900c Merge "Do not generate copyable slices for Settings Search" into rvc-dev am: 674e2c23a3 am: e611ebfb33 
Change-Id: Iec93b0c7624a143328f229bb88a95eea48af96ee
 2020-04-17 09:47:01 +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
791d1150aa Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 am: 857d656932 
Change-Id: I851677c1e927f19bcc27686a1c8ffe8d3448a36e
 2020-04-17 04:57:16 +00:00
Tom Hsu
857d656932 Merge "Fix failures on com.android.settings.network.ApnEditorTest" into rvc-dev am: 7c84dc9959 am: a733ead043 
Change-Id: I6cc2492adeb4ed057f23c1d8e94209c6f6d897bf
 2020-04-17 04:44:38 +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
9c690ed79e Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 am: 1963474117 
Change-Id: Ie8f192c76ae04321994ce1e3c66f2089cceac6f0
 2020-04-17 03:38:32 +00:00
Zhen Zhang
1963474117 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev am: 7e3e5dfa06 am: 987a70e750 
Change-Id: I48653122c49815b166b0e3cd3f3db8ce0ff2b05e
 2020-04-17 03:22:58 +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
Zhen Zhang
7e3e5dfa06 Merge "[Settings] Fix crashes caused by null bluetooth adapter and ethernet manager" into rvc-dev 2020-04-17 02:56:50 +00:00
Edgar Wang
d6379749f5 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 am: 23b5b359a0 
Change-Id: I89c2d1cc0d87dd3ad6c44aa19a864e5b952d224a
 2020-04-17 02:49:07 +00:00
Edgar Wang
23b5b359a0 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d am: 27c1b456a5 
Change-Id: Idc8b2c8b62d0f66783c286e526fce434d1581442
 2020-04-17 02:36:11 +00:00
Edgar Wang
27c1b456a5 Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev am: 2b01f9ba7d 
Change-Id: I48970cfd18aef705790b20a6af6e5e9a08a1bc1a
 2020-04-17 02:13:30 +00:00
Edgar Wang
2b01f9ba7d Merge "Remove duplicated search index data of "Live Caption"" into rvc-dev 2020-04-17 01:53:00 +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
Eugene Susla
5cfdd8ad6b Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 am: d088583349 
Change-Id: I854650864de7323c517e9e219c991411d2626da3
 2020-04-16 23:42:32 +00:00
Eugene Susla
d088583349 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 am: 1184cec4a2 
Change-Id: I34a643bf08482d3bbbdc8e97f24377082593dd2f
 2020-04-16 23:28:19 +00:00
Eugene Susla
1184cec4a2 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev am: ff8b793427 
Change-Id: Ifc857fe8d776d8353d8787a9ce0521f7495a821e
 2020-04-16 23:12:00 +00:00
Eugene Susla
ff8b793427 Merge "Implement auto revoke user whitelist intent handler" into rvc-dev 2020-04-16 22:52:45 +00: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
90dbc28e57 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c am: 58b434ad02 
Change-Id: I6a9c98ab6eb996c678bd5c9e005959a5449dbfc6
 2020-04-16 16:42:19 +00:00
TreeHugger Robot
58b434ad02 Merge "Fallback to AOSP emergency info if the original intent is broken" into rvc-dev am: afbf9e60c0 am: 8f39c1380c 
Change-Id: I0b32dd33d9713759978b16effc55bbe2e197fff6
 2020-04-16 16:29:56 +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
Julia Reynolds
5b949236c4 Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 am: 34c66fd94e 
Change-Id: I52a20c4411220162db138f6f9b5e8bdc0c07084e
 2020-04-16 14:42:43 +00:00
TreeHugger Robot
307ee6b828 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:26 +00:00
TreeHugger Robot
15a22292f8 Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-04-16 14:34:23 +00:00
Julia Reynolds
34c66fd94e Merge "Launch subscreens with the correct user" into rvc-dev am: 0c99ecaec1 am: f1801907d8 
Change-Id: I8ec8602c1e8753ce03d4c6acc75dcdf58be8c24e
 2020-04-16 14:26:36 +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