Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
d35a89cd80 Helper method to check if current user is a demo user 
Bug: 27280140
Change-Id: I7f6ed3198a42b4f8b81b54764e0b73499a94f77c
 2016-05-27 11:13:00 -07:00
Mark Goldstein
90045710ca Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 
am: 7f1330358a

* commit '7f1330358ac8037e440f0a66f9abed0f5db0481f':
  Doc change: Fix broken link.

Change-Id: I539b08283eee0c0d00fb5c04a97fd01c02780dd4
 2016-05-27 18:09:54 +00:00
Chih-Hung Hsieh
cfae35a400 Merge "Fix misc-macro-parentheses warnings in DngCreator." 
am: d439efc361

* commit 'd439efc361535701f6d2d0b82cfa22b9d4a5898b':
  Fix misc-macro-parentheses warnings in DngCreator.

Change-Id: I5fd1127ff3efde3b44ac6d358d48665f89d54e01
 2016-05-27 18:09:49 +00:00
Mark Goldstein
1743e97f3a Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb am: f9d8f6c5f3 
am: 7f1330358a

* commit '7f1330358ac8037e440f0a66f9abed0f5db0481f':
  Doc change: Fix broken link.

Change-Id: I5234b90d962f485510c0395b116b9565c58cf7ab
 2016-05-27 18:09:42 +00:00
Jae Seo
831ddb659e Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am: f8c504db7f 
am: cac5be859f

* commit 'cac5be859ff4cbe0888fa0f3bcc8a6b43ff60bf1':

Change-Id: I738e256fe9ef0c1a35c01efb0f90a85eae272b86
 2016-05-27 18:01:47 +00:00
Jason Monk
eb93365269 Merge "QS: Handle detail scroll properly" into nyc-dev am: 4f620d423f 
am: 582ee3eb65

* commit '582ee3eb65623a25cb97f0a25ad6494c9d871475':

Change-Id: I676420dc7c696e40b8db8524b2cdbf7cba9a2ba7
 2016-05-27 18:01:41 +00:00
Chris Wren
0c99119f8f Merge "add metrics for gestural notification expansions" into nyc-dev am: cd9ea74659 
am: 14c87a5f3f

* commit '14c87a5f3f01282e1c0d4403e1484143272423d2':

Change-Id: I45dac95fb5d184b7da87c72ade4478f396a99f09
 2016-05-27 18:01:34 +00:00
Mark Goldstein
7f1330358a Merge "Doc change: Fix broken link." into mnc-io-docs am: d643ab1ddb 
am: f9d8f6c5f3

* commit 'f9d8f6c5f36b07961f2d38b43c991ed679022f7e':
  Doc change: Fix broken link.

Change-Id: Iee76c1e357f2c67362d951f567bc3498c208fb35
 2016-05-27 17:57:50 +00:00
Jae Seo
a8d75f8c1c Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev am: f8c504db7f 
am: 9e78ee80b8

* commit '9e78ee80b8d82228c878b8208340038970ccf30c':
  PIP: Improve PIP control row's focus change animation in Recents

Change-Id: I63ddb63df3e459222044c6ef50f7304f9adfa4a1
 2016-05-27 17:57:36 +00:00
Jason Monk
295619694c Merge "QS: Handle detail scroll properly" into nyc-dev am: 4f620d423f 
am: 11aa8b009f

* commit '11aa8b009f521ed73ec966aa671e946ed541be5c':
  QS: Handle detail scroll properly

Change-Id: I345bb825f15e92a1c2cf6892713b700627c81e2d
 2016-05-27 17:57:29 +00:00
Chih-hung Hsieh
d439efc361 Merge "Fix misc-macro-parentheses warnings in DngCreator." 2016-05-27 17:56:46 +00:00
Doris Liu
028029730b Copy native tree's property when mutate vector drawable 
When mutating vector drawables, we need to not only copy over
the VD tree structure, but also the properties of the VD tree,
such as alpha.

Bug: 28974071
Change-Id: I265e7e3cb92455b876cae248bcb9811230cb34f9
 2016-05-27 10:54:55 -07:00
Fyodor Kupolov
2d8583e0e4 Merge "Remove ActivityManager calls with PM.mInstallLock held" into nyc-dev am: a4dbdaf5e9 am: 5d531e4f6c 
am: f6816ad3c5

* commit 'f6816ad3c5b4062ebe8cdb810aee70e9c9a34314':
  Remove ActivityManager calls with PM.mInstallLock held

Change-Id: I98ea0d1c547c5f044bf7fc9c231e7f19b6c39c95
 2016-05-27 17:50:31 +00:00
Makoto Onuki
04b9aab945 ShortcutManager: Implement get-drawable APIs 
Bug 28594168

Change-Id: I750e800b59dca56877ba78baac808aff93acd19d
 2016-05-27 10:49:17 -07:00
Amith Yamasani
a3bc135bb4 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev 
am: aabbfc5565

* commit 'aabbfc5565a6fee8b1fbdaa26f050ee6617b3370':
  Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""

Change-Id: Iaf1a47b3c5091771902b0a3630d83067d3b75440
 2016-05-27 17:46:48 +00:00
Jaewan Kim
9e78ee80b8 Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev 
am: f8c504db7f

* commit 'f8c504db7f2e0e35c5fa19cad46681dc17db7488':
  PIP: Improve PIP control row's focus change animation in Recents

Change-Id: I55e62b5a1ba5290b4167c895707cf360b97b042a
 2016-05-27 17:46:48 +00:00
Chris Wren
318f923e4f resolve merge conflicts of cd9ea74 to nyc-mr1-dev 
am: 7ee8418076

* commit '7ee841807641c1784a15a0122afd5b068261f21f':
  add metrics for gestural notification expansions

Change-Id: I763151a2987e6d318f5407c6c7b4e8733e5084c5
 2016-05-27 17:46:38 +00:00
Mark Goldstein
f9d8f6c5f3 Merge "Doc change: Fix broken link." into mnc-io-docs 
am: d643ab1ddb

* commit 'd643ab1ddb737aeb6636c61839cb64bdc7348c04':
  Doc change: Fix broken link.

Change-Id: Ia1a9fdd18486ecf34d4a577f0e7f9d9570f748a3
 2016-05-27 17:46:38 +00:00
Jason Monk
11aa8b009f Merge "QS: Handle detail scroll properly" into nyc-dev 
am: 4f620d423f

* commit '4f620d423f82dd43ed79178e0091132dd49ca2a9':
  QS: Handle detail scroll properly

Change-Id: I6c3023fc9a6053b5918a22fff9f9af577df48c43
 2016-05-27 17:46:38 +00:00
smain@google.com
582252d996 add redirect for Espresso Test Recorder doc that will soon be on TAC site. am: 8f60544180 am: e1bd7e15c5 am: 5d3ca78d3f am: b35e6f9ad7 
am: 38466617c1

* commit '38466617c14f9af8f86224d2be96587509e157f0':
  add redirect for Espresso Test Recorder doc that will soon be on TAC site.

Change-Id: I2fb7ecb556d77e5de94f4971650eefbd46cef258
 2016-05-27 17:45:41 +00:00
Paul Jensen
b569d8bbf9 Merge "Don\'t pass URL path and username/password to PAC scripts" into klp-dev am: af0b4466ff am: 8940d2b0ff am: bb27626141 am: 6c35cf2434 am: 42a5983364 am: 75095e6f02 am: 7c625e1938 am: 54a62d5feb am: a5a2c88fb3 am: 7ff57eaff9 am: 94c8855da6 am: 50615e498e am: fdc53e96d3 
am: 257c5b2e9c

* commit '257c5b2e9ce5969e22c88d84213f394953740c64':
  Don't pass URL path and username/password to PAC scripts

Change-Id: If9f1006bd7d4ab2acc3ce3e75a0746f6ca44b01a
 2016-05-27 17:42:22 +00:00
Christopher Tate
f43c82ba15 DO NOT MERGE : backport of backup transport whitelist am: 647cb6a6d8 -s ours am: 077534b101 am: 4c559cdade am: 24ceca96af -s ours am: 88c9eae886 am: 1fa817c057 am: 040cf14047 am: 0905c8f398 -s ours am: d39c0a8d77 am: 50aa0324c9 
am: 4f34e793b3  -s ours

* commit '4f34e793b3359b9b880f539680a43a7d937a1983':
  DO NOT MERGE : backport of backup transport whitelist

Change-Id: I823126bff0c3bd5e8bd38988634d5d68fdcb57b4
 2016-05-27 17:37:42 +00:00
Mark Goldstein
d643ab1ddb Merge "Doc change: Fix broken link." into mnc-io-docs 2016-05-27 17:37:37 +00:00
Mady Mellor
c7d65b4e9c Adds alpha to dimmed backgrounds 
If you're on the lock screen and a child background needs
to be shown (e.g. custom background and user expanding) the
background should fade in from 0 alpha otherwise looks odd
visually.

Bug: 27591195
Change-Id: I1f46831fd8b46eca5b54e7bd964af35752c4fa2f
 2016-05-27 10:36:55 -07:00
TreeHugger Robot
aabbfc5565 Merge "Revert "Revert "Remove ActivityManager calls with PM.mInstallLock held""" into nyc-mr1-dev 2016-05-27 17:36:43 +00:00
Jeremy Joslin
1ec8cd9542 Fix issue #28930592: Scoring service binding is not reestablished. 
Force stopping the bound scoring service would not automatically
reestablished the binding.

Replaced the custom BroadcastReceiver with a more standard
PackageMonitor implementation that handles the same actions in
addition to force stop.

Also added a few more debug log statements as they were helpful
during my development.

BUG: 28930592
Change-Id: Ic36ea77deb5e2117edc201e97d71be63bdd4230d
 2016-05-27 10:34:29 -07:00
Makoto Onuki
8de7c953a1 Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev 
am: 05e0a9f3cf

* commit '05e0a9f3cf632e237654c13f6d223eb22ea3be89':
  ShortcutManager: Support manifest shortcuts

Change-Id: Ib0a2620e92249452130a681208424fbddfa1935b
 2016-05-27 17:34:04 +00:00
Chris Wren
7ee8418076 resolve merge conflicts of cd9ea74 to nyc-mr1-dev 
Change-Id: I37bc8256b8b91274f418cbefe2797f068cd98dd4
 2016-05-27 13:34:02 -04:00
Jaewan Kim
cac5be859f Merge "PIP: Improve PIP control row\'s focus change animation in Recents" into nyc-dev 
am: f8c504db7f

* commit 'f8c504db7f2e0e35c5fa19cad46681dc17db7488':
  PIP: Improve PIP control row's focus change animation in Recents

Change-Id: Ic1633d3a1f03fbb000a70743b13a8b4483c3279a
 2016-05-27 17:33:48 +00:00
Julia Reynolds
071f2cf9ca Merge "Merge "Importance slider updates." into nyc-dev am: 2bf73e94c3 am: 901bdeadef" into nyc-mr1-dev-plus-aosp 
am: f9db0e0cf3

* commit 'f9db0e0cf3e27e90dff8036da9627d0210a53fb2':

Change-Id: I6b5a8a29a2ba6cbd3c821e6de6d0f7c675785bac
 2016-05-27 17:31:17 +00:00
Tenghui Zhu
09cd5ea578 Merge "Merge "Update the light center when the root view\'s layout changed" into nyc-dev am: e78ba24c17 am: 56d4dae9ec" into nyc-mr1-dev-plus-aosp 
am: d09ad72e82

* commit 'd09ad72e82c9ca66eea4e2409589813e20d9a8bf':
  Update the light center when the root view's layout changed

Change-Id: Ifb58bf9a0a0e3b11d9c59d2c04218d63c294f0ae
 2016-05-27 17:24:49 +00:00
Jae Seo
f8c504db7f Merge "PIP: Improve PIP control row's focus change animation in Recents" into nyc-dev 2016-05-27 17:23:58 +00:00
Makoto Onuki
05e0a9f3cf Merge "ShortcutManager: Support manifest shortcuts" into nyc-mr1-dev 2016-05-27 17:21:53 +00:00
Jeff Sharkey
95deb03380 Merge "Merge "Cache IMountService for isUserKeyUnlocked() calls." into nyc-dev am: 36cbf5ca37 am: 6843da1aa8" into nyc-mr1-dev-plus-aosp 
am: 2cffcf29ce

* commit '2cffcf29ce961c603543959d1ead423cb260d296':

Change-Id: I22cb6b1d5f1727433d2d10a3e34cb1df1d63fa02
 2016-05-27 17:19:55 +00:00
Phil Burk
42facec856 Merge "Merge "AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY" into nyc-dev am: d34d06606d am: 29e8879307" into nyc-mr1-dev-plus-aosp 
am: 380221f94f

* commit '380221f94f528a8acd684626c5130b5a51a92044':
  AudioAttributes docs: warn about small buffer size with FLAG_LOW_LATENCY

Change-Id: I03cb23c0c7820ec481e26a34b49940a738405d26
 2016-05-27 17:14:11 +00:00
Jason Monk
7b5f4ac7ca Merge "Merge "QS: Make hotspot go unavailable in airplane mode" into nyc-dev am: 72f19ff6f0 am: b59383a375" into nyc-mr1-dev-plus-aosp 
am: 2122328c75

* commit '2122328c7577a6fe519fbc48943aae4303e03540':

Change-Id: Id942146a41e33fb549cbcaca3eb8253433357644
 2016-05-27 17:09:38 +00:00
Android Build Merger (Role)
1e56074899 Merge "Merge "Announce upcoming tile state on click." into nyc-dev am: 293c967667 am: 4d55281b08" into nyc-mr1-dev-plus-aosp 2016-05-27 17:07:45 +00:00
Julia Reynolds
6e955befa4 Merge "Announce upcoming tile state on click." into nyc-dev am: 293c967667 
am: 4d55281b08

* commit '4d55281b08011f8f75fea65710c8edfef17a5bed':
  Announce upcoming tile state on click.

Change-Id: Ie968e8df6e3f6d422c7286b0a686d0e4a292c143
 2016-05-27 17:07:10 +00:00
Julia Reynolds
4181eeddff Merge "Announce upcoming tile state on click." into nyc-dev am: 293c967667 
am: 0a5b17a1dc

* commit '0a5b17a1dc70986009bdb3820a532a3394d9330e':
  Announce upcoming tile state on click.

Change-Id: I1c195dfa715e9c1c615a23cc6f793a6db56bd4b9
 2016-05-27 17:05:23 +00:00
Manoja Wijewardene
6a85378e00 Merge "Merge "Elaborate on requirement to support PreRebootSecurityLogs" into nyc-dev am: 1ad12e0678 am: d667ff5930" into nyc-mr1-dev-plus-aosp 
am: d9c7414bf1

* commit 'd9c7414bf116adbdd6e658d1cf484f02718b63c3':
  Elaborate on requirement to support PreRebootSecurityLogs

Change-Id: Ia7ac05724ced97692a9c6788f494525bedf2961f
 2016-05-27 17:04:50 +00:00
Jason Monk
582ee3eb65 Merge "QS: Handle detail scroll properly" into nyc-dev 
am: 4f620d423f

* commit '4f620d423f82dd43ed79178e0091132dd49ca2a9':
  QS: Handle detail scroll properly

Change-Id: I4614a2999aba2f5bc836f7fab21912fb75be1f65
 2016-05-27 17:02:49 +00:00
Julia Reynolds
4d55281b08 Merge "Announce upcoming tile state on click." into nyc-dev 
am: 293c967667

* commit '293c96766727517b5a94008a43d308a6d990faea':
  Announce upcoming tile state on click.

Change-Id: Ied45168428e0b1945ce6613ff0be40666c1f97dc
 2016-05-27 16:59:32 +00:00
Chris Wren
14c87a5f3f Merge "add metrics for gestural notification expansions" into nyc-dev 
am: cd9ea74659

* commit 'cd9ea74659be1f831eb160dd14648de046c75073':
  add metrics for gestural notification expansions

Change-Id: I7594a6cbe91fe4a0c51193d24cc6e72f58d4fb02
 2016-05-27 16:57:49 +00:00
Robin Lee
dfa5bc90f8 Merge "Merge "Check if we\'re connected before marking a UID blocked" into nyc-dev am: 33154deb70 am: 174385a208" into nyc-mr1-dev-plus-aosp 
am: b3f3f26046

* commit 'b3f3f26046103461067101e5bfb8416a4285a776':

Change-Id: I76ffb65c583312c63937f9e7d77432cadafff355
 2016-05-27 16:57:47 +00:00
Julia Reynolds
0a5b17a1dc Merge "Announce upcoming tile state on click." into nyc-dev 
am: 293c967667

* commit '293c96766727517b5a94008a43d308a6d990faea':
  Announce upcoming tile state on click.

Change-Id: I41a5cb30a677bc80dd50a8ae2dc7560019fd16ce
 2016-05-27 16:57:40 +00:00
Zoltan Szatmary-Ban
8a5536d53e Only reset global restriction owner on DO->PO for the right user 
Bug:28972648
Change-Id: I4ef727205bbd8ec319672480bac7b519b33d2a58
 2016-05-27 17:56:44 +01:00
Bill Yi
f9e39512a9 Merge "Merge "Import translations. DO NOT MERGE" into nyc-dev am: 9aed8c2fa0 -s ours am: 02befc3229 -s ours" into nyc-mr1-dev-plus-aosp 
am: 5cc2c12f29  -s ours

* commit '5cc2c12f29e0d186da4449b8ef0c7569d01af1b7':
  Import translations. DO NOT MERGE

Change-Id: I7b7fbe10fc11334a14b3044c34ee82af67515046
 2016-05-27 16:52:47 +00:00
Jason Monk
4f620d423f Merge "QS: Handle detail scroll properly" into nyc-dev 2016-05-27 16:51:48 +00:00
TreeHugger Robot
cd9ea74659 Merge "add metrics for gestural notification expansions" into nyc-dev 2016-05-27 16:49:58 +00:00
Julia Reynolds
293c967667 Merge "Announce upcoming tile state on click." into nyc-dev 2016-05-27 16:48:25 +00:00