Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
476,498 Commits 3 Branches 0 Tags
2336c0b0ab7aa7e07d2ea7a8f9cd90a1d0b1432c
Commit Graph

476498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Antoan Angelov
2336c0b0ab Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev am: 8c6b17b1ad am: 9d5d422717 am: 92cdbb60d1 
Change-Id: Ice7f401e3f3ea67b2f46b781c610e2d7f7e97700
 2020-03-23 17:54:44 +00:00
TreeHugger Robot
ad839710bd [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: afcd0d2be6 -s ours am: f9dc0ce8b8 -s ours am: 5e85d65240 -s ours 
am skip reason: subject contains skip directive

Change-Id: I5fe8f9041fbd720a6468ff5a8858752bbf424a1b
 2020-03-23 17:54:32 +00:00
Anton Hansson
a9c25c2a47 Merge "Add default configs for module service stubs" into rvc-dev am: 4299ac20c9 am: 92dc17455e am: 30ef2c44aa 
Change-Id: I7e94093931e75561b80f8b32c7b00148402ee5bd
 2020-03-23 17:54:14 +00:00
Antoan Angelov
92cdbb60d1 Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev am: 8c6b17b1ad am: 9d5d422717 
Change-Id: I33f956164b9ace8b1468e899429a33efa772b451
 2020-03-23 17:37:43 +00:00
TreeHugger Robot
5e85d65240 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: afcd0d2be6 -s ours am: f9dc0ce8b8 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ifcad92d9d48dcb751ac8ba02c087aa7cd2bdb72c
 2020-03-23 17:37:29 +00:00
Anton Hansson
30ef2c44aa Merge "Add default configs for module service stubs" into rvc-dev am: 4299ac20c9 am: 92dc17455e 
Change-Id: Iaaf00ce5777611c80fe29de8648e9bb8cb4492a1
 2020-03-23 17:37:16 +00:00
Bill Yi
074463f3ad [automerger skipped] Import translations. DO NOT MERGE am: 7c64b0da0d -s ours am: 5562d464c6 -s ours am: 56b602c09b -s ours am: 418134fc7a -s ours 
am skip reason: subject contains skip directive

Change-Id: I7879a3c914c602b27bcee0b778aaaddbec2fe0c9
 2020-03-23 17:19:27 +00:00
Antoan Angelov
9d5d422717 Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev am: 8c6b17b1ad 
Change-Id: I7cfd08bf67ffc53c54926ec45e309654a06d5754
 2020-03-23 17:13:47 +00:00
TreeHugger Robot
f9dc0ce8b8 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: afcd0d2be6 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ife529ddea33b17087b7b9bda7d63c8909bb2104c
 2020-03-23 17:13:21 +00:00
Anton Hansson
92dc17455e Merge "Add default configs for module service stubs" into rvc-dev am: 4299ac20c9 
Change-Id: Ifc289770281e1fdb1d7cc501e15995db6b3fc500
 2020-03-23 17:12:37 +00:00
Bill Yi
418134fc7a [automerger skipped] Import translations. DO NOT MERGE am: 7c64b0da0d -s ours am: 5562d464c6 -s ours am: 56b602c09b -s ours 
am skip reason: subject contains skip directive

Change-Id: I9b693d6cd4c2e7a3e9b0dffcc2097cfb34e215c2
 2020-03-23 17:05:15 +00:00
Antoan Angelov
8c6b17b1ad Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev 2020-03-23 16:56:51 +00:00
TreeHugger Robot
afcd0d2be6 Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-03-23 16:56:07 +00:00
Anton Hansson
4299ac20c9 Merge "Add default configs for module service stubs" into rvc-dev 2020-03-23 16:54:05 +00:00
Bill Yi
56b602c09b [automerger skipped] Import translations. DO NOT MERGE am: 7c64b0da0d -s ours am: 5562d464c6 -s ours 
am skip reason: subject contains skip directive

Change-Id: Ie9974f4dd6a7ce52c98f7b7fc5d8075bf1372e9b
 2020-03-23 16:38:30 +00:00
Bill Yi
5562d464c6 [automerger skipped] Import translations. DO NOT MERGE am: 7c64b0da0d -s ours 
am skip reason: subject contains skip directive

Change-Id: Ib26161178030a9c6adf5370514fd1ca87f85f298
 2020-03-23 16:23:11 +00:00
TreeHugger Robot
87b9e5a531 Merge "Don't notify about explicit personal app suspension." into rvc-dev am: e39a7b6a80 am: e68a57ee7c am: 0f3856219c 
Change-Id: Id31ca7e0837264fddefd0ce350e65fc415dde0ac
 2020-03-23 16:22:45 +00:00
TreeHugger Robot
0f3856219c Merge "Don't notify about explicit personal app suspension." into rvc-dev am: e39a7b6a80 am: e68a57ee7c 
Change-Id: Ic91033873e1b3aba4b13988fce40688873c64877
 2020-03-23 16:04:17 +00:00
TreeHugger Robot
e68a57ee7c Merge "Don't notify about explicit personal app suspension." into rvc-dev am: e39a7b6a80 
Change-Id: I2f8754df7876026e42ab9c6b3b82541986894220
 2020-03-23 15:43:42 +00:00
Anton Hansson
a569dd29fa Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682eab3 am: 177941f861 am: 1bc7758be2 
Change-Id: I844c0f31977db215a83fbf357e0ebfdf8e7852a8
 2020-03-23 15:32:15 +00:00
Ben Murdoch
7114b7fbc5 Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework." into rvc-dev am: 801f12923d am: a19e9881f7 am: 63409a8227 
Change-Id: Ifef13cad9aae83a0130fd73708cf9ef915788303
 2020-03-23 15:32:02 +00:00
Wei Sheng Shih
5834175f10 Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c88 am: 03e13aa7bb am: 2ee512971a 
Change-Id: I1dca52f436b1d16c12d91a7acb1350b9655a4a0b
 2020-03-23 15:31:32 +00:00
Abhijeet Kaur
820f16a47b Merge "Clean up code in BugreportProgressService" into rvc-dev am: 78ef10aa72 am: bf7239c118 am: 540b2e24ac 
Change-Id: I6e47d5d41f5ac00da6cdb898b045cd7c5152ef6a
 2020-03-23 15:31:20 +00:00
TreeHugger Robot
e39a7b6a80 Merge "Don't notify about explicit personal app suspension." into rvc-dev 2020-03-23 15:29:31 +00:00
TreeHugger Robot
24518459ba Merge "Import translations. DO NOT MERGE" into mainline-prod 2020-03-23 15:09:25 +00:00
Anton Hansson
1bc7758be2 Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682eab3 am: 177941f861 
Change-Id: I9fb6bc578dc2ad5eb937618a8e0a8905a4a50c08
 2020-03-23 15:08:51 +00:00
Ben Murdoch
63409a8227 Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework." into rvc-dev am: 801f12923d am: a19e9881f7 
Change-Id: Ibc868f57de7304d9fb7b5217d98f58bf42a05759
 2020-03-23 15:08:43 +00:00
Wei Sheng Shih
2ee512971a Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c88 am: 03e13aa7bb 
Change-Id: Ie6327cad62f639c69c1b1f4feb3b7dc225985c5e
 2020-03-23 15:08:37 +00:00
Abhijeet Kaur
540b2e24ac Merge "Clean up code in BugreportProgressService" into rvc-dev am: 78ef10aa72 am: bf7239c118 
Change-Id: I8dcb1d0bd9b52884f60fd6acb8912468e09613ce
 2020-03-23 15:08:27 +00:00
Anton Hansson
180ec39abe Add default configs for module service stubs 
To be used by individual modules with service components that
define system_server APIs.

Bug: 147768409
Test: m
Change-Id: Iff6a5a840c5dd7731e881d7db379915375d02324
 2020-03-23 15:08:04 +00:00
Anton Hansson
177941f861 Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev am: d83682eab3 
Change-Id: I6fdcfdff4cc70ead99b0d38fcca778a9c698412a
 2020-03-23 15:07:44 +00:00
Anton Hansson
d83682eab3 Merge "Move statsd TEST_MAPPINGS to statsd root" into rvc-dev 2020-03-23 15:05:06 +00:00
Ben Murdoch
a19e9881f7 Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework." into rvc-dev am: 801f12923d 
Change-Id: I3271d3fed69d56f4949e36824447d655294e288b
 2020-03-23 15:01:00 +00:00
Ben Murdoch
801f12923d Merge "Move config_useKeyguardUserSwitcher from sysui overlay to framework." into rvc-dev 2020-03-23 14:58:01 +00:00
Wei Sheng Shih
03e13aa7bb Merge "Surface should not be created for WindowContext initially." into rvc-dev am: 4346998c88 
Change-Id: If97714fc4a4e560d265b073ec03677f12c5200ce
 2020-03-23 14:50:26 +00:00
Abhijeet Kaur
bf7239c118 Merge "Clean up code in BugreportProgressService" into rvc-dev am: 78ef10aa72 
Change-Id: I1caa33459c9a12d9603a7849d863295b7e48bc16
 2020-03-23 14:49:42 +00:00
Wale Ogunwale
496a7248b4 Merge "Move some window related files to android.window package" into rvc-dev am: f09fdecd55 am: b1bf0ae1c3 am: 4054636cbe 
Change-Id: I776994e33229f658490971ad528e0fc21c701ca6
 2020-03-23 14:49:04 +00:00
Wei Sheng Shih
4346998c88 Merge "Surface should not be created for WindowContext initially." into rvc-dev 2020-03-23 14:44:38 +00:00
Wale Ogunwale
4054636cbe Merge "Move some window related files to android.window package" into rvc-dev am: f09fdecd55 am: b1bf0ae1c3 
Change-Id: I67d3018c3ce3f84acad62a856e0bc16748f9bd45
 2020-03-23 14:30:22 +00:00
Abhijeet Kaur
78ef10aa72 Merge "Clean up code in BugreportProgressService" into rvc-dev 2020-03-23 14:18:44 +00:00
Wale Ogunwale
b1bf0ae1c3 Merge "Move some window related files to android.window package" into rvc-dev am: f09fdecd55 
Change-Id: I1d7576d35920811a6330983fca28689c620184fd
 2020-03-23 14:09:37 +00:00
Wale Ogunwale
f09fdecd55 Merge "Move some window related files to android.window package" into rvc-dev 2020-03-23 13:48:30 +00:00
Pavel Grafov
64d1fc040b Don't notify about explicit personal app suspension. 
Notification about personal apps suspension should only be shown
in cases when apps are suspended because of maximum work profile
time off policy violation, not via an explicit call to suspend.

+ updated strings. Note, some strings are not used yet.

Test: manual, with TestDPC, suspended apps explicitly, checked
    that the notification is not shown.
Test: manual, with TestDPC, set maximum work profile time off,
    adjusted the clock, checked that the notification is there.`
Bug: 151918490
Bug: 149076989
Change-Id: Idd4c7ec11af416c303c9218495d55c73154c7a5f
 2020-03-23 13:35:22 +00:00
TreeHugger Robot
c1eff27648 Merge "Enable the feature flag for contextual home v2" into rvc-dev am: 5bd455ac5f am: 4c8c15f110 am: b1bd78d8e7 
Change-Id: Ib2be943fe61b0569ac64d19240df8676290d4189
 2020-03-23 12:25:19 +00:00
TreeHugger Robot
b1bd78d8e7 Merge "Enable the feature flag for contextual home v2" into rvc-dev am: 5bd455ac5f am: 4c8c15f110 
Change-Id: Ie8315f701da87334b9143ca4a21536bf1ec045b2
 2020-03-23 12:08:09 +00:00
TreeHugger Robot
4c8c15f110 Merge "Enable the feature flag for contextual home v2" into rvc-dev am: 5bd455ac5f 
Change-Id: I1244e82fab54641b8e747fdaf7d6895b6f921d51
 2020-03-23 11:44:10 +00:00
TreeHugger Robot
5bd455ac5f Merge "Enable the feature flag for contextual home v2" into rvc-dev 2020-03-23 11:27:30 +00:00
Anton Hansson
0617bb862c Merge "Build tethering against the module SDK" into rvc-dev am: 8f36aba1fb am: 6c502a1365 am: 7a90d13d4a 
Change-Id: I74f0a24e502773e890aeabe5dee2599a6ba1c587
 2020-03-23 11:21:22 +00:00
Anton Hansson
7a90d13d4a Merge "Build tethering against the module SDK" into rvc-dev am: 8f36aba1fb am: 6c502a1365 
Change-Id: Iaa20dc7c165b4ceaf037df13d47c211318470601
 2020-03-23 11:09:27 +00:00
Bill Yi
3c1943ee19 Import translations. DO NOT MERGE 
Auto-generated-cl: translation import
Change-Id: I84d5f144783417e9c6e75aada1e47d527e5421bd
 2020-03-23 03:59:08 -07:00