Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
243,401 Commits 3 Branches 0 Tags
d3473ffd95bb90a99efcffddd28cc06ed44abff6
Commit Graph

243401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Doris Liu
d3473ffd95 Merge "rm log spam" into nyc-dev 
am: 70eff90

* commit '70eff906ad6d944fab92608e2ad11deb3fbb396e':
  rm log spam

Change-Id: I6c2a4865ba4146ffdec555346c35b5f77fa147bd
 2016-04-13 17:28:33 +00:00
Doris Liu
da6c6ebebc Merge "Fix translationY not being set correctly for VD during animation" into nyc-dev 
am: 3513035

* commit '351303531f440b661215cb35394331d11568ac68':
  Fix translationY not being set correctly for VD during animation

Change-Id: I340fb647e4475607658f64eb9a6233aeccff8d37
 2016-04-13 17:28:31 +00:00
Alan Viverette
147baca4aa Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev 
am: a63d2db

* commit 'a63d2db09978387b2bfdd849034dc73d43647ded':
  Fall back to setting the level of the entire progress drawable

Change-Id: I4f1c109fc925e9d576fca9d7db4de6a43c3eedee
 2016-04-13 17:28:28 +00:00
Doris Liu
70eff906ad Merge "rm log spam" into nyc-dev 2016-04-13 17:22:57 +00:00
Doris Liu
351303531f Merge "Fix translationY not being set correctly for VD during animation" into nyc-dev 2016-04-13 17:22:19 +00:00
Alan Viverette
a63d2db099 Merge "Fall back to setting the level of the entire progress drawable" into nyc-dev 2016-04-13 17:19:05 +00:00
Wale Ogunwale
361124ef08 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev 
am: 3fb1c81

* commit '3fb1c81394f98b025b488774916b7580f9e31dab':
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.

Change-Id: If788ed4af5292b76576c7abd728633f20cc6eb93
 2016-04-13 17:07:38 +00:00
Wale Ogunwale
3fb1c81394 Merge changes Ieefeb843,Ic2a94b09 into nyc-dev 
* changes:
  Update surface insets on window elevation changes.
  Fixed bug with cropping out drop shadow for pinned stack.
 2016-04-13 16:59:36 +00:00
David Brazdil
801c28e2a4 Merge "Remove UsageStats post-OTA package update filter" into nyc-dev 
am: e502345

* commit 'e502345d7104a719b11f11973955b70e2778422d':
  Remove UsageStats post-OTA package update filter

Change-Id: I8e0b8732191a542ac4e95acdd3b76275cff574e2
 2016-04-13 16:54:18 +00:00
David Brazdil
e502345d71 Merge "Remove UsageStats post-OTA package update filter" into nyc-dev 2016-04-13 16:43:15 +00:00
Treehugger Robot
a27376d836 Merge "Fix: the label "customize" is not updated after changing language" am: b4c4e20 
am: d5be2a2

* commit 'd5be2a2055b8e0f4067f00e8756fdf22c084e94d':
  Fix: the label "customize" is not updated after changing language

Change-Id: I7bc30cf66b76b062468b443fd1ef965386c5761e
 2016-04-13 16:36:11 +00:00
Treehugger Robot
5948df89f4 Merge "Dismiss keyguard when user button is tapped" am: e3d556f 
am: 8ad4bf3  -s ours

* commit '8ad4bf36107c55197f9d9f6eec4ca0f2b9dade48':
  Dismiss keyguard when user button is tapped

Change-Id: Ia29befddda482f2dfb6fff391f4f687b8c912a00
 2016-04-13 16:36:09 +00:00
Philip P. Moltmann
a0653208ca Merge "Add a log if the printing activity died unexpectly." into nyc-dev 
am: e74b657

* commit 'e74b657e5ef58880b7436c1e409726a29459b822':
  Add a log if the printing activity died unexpectly.

Change-Id: Ief7a90977234fe13de39d7c3a14d56504dd9f1e2
 2016-04-13 16:29:22 +00:00
Philip P. Moltmann
e74b657e5e Merge "Add a log if the printing activity died unexpectly." into nyc-dev 2016-04-13 16:20:34 +00:00
Rebecca Silberstein
ce3d4b9c96 Merge "Add error logging for softap commands" into nyc-dev 
am: bf705b4

* commit 'bf705b4aae2d77d7c0d23e23e9ded34788994645':
  Add error logging for softap commands

Change-Id: I8a2946f8c160114ab37be15f55838065e9dee961
 2016-04-13 16:15:22 +00:00
Rebecca Silberstein
bf705b4aae Merge "Add error logging for softap commands" into nyc-dev 2016-04-13 16:07:51 +00:00
Philip P. Moltmann
d0e1239e81 Add a log if the printing activity died unexpectly. 
Bug: 27861927
Change-Id: I431ba996e113043c224039a62a76ae23e9c7494a
 2016-04-13 08:57:49 -07:00
Jason Monk
6e8111c5df Merge "Remove color and appearance" into nyc-dev 
am: c2e8857

* commit 'c2e8857a284433ea83006349bcba204bdd1897cc':
  Remove color and appearance

Change-Id: I7650274e1c3b4167a699e5697aeabeba1ccc898c
 2016-04-13 15:47:13 +00:00
Jason Monk
c2e8857a28 Merge "Remove color and appearance" into nyc-dev 2016-04-13 15:43:15 +00:00
David Brazdil
4ef1982af8 Remove UsageStats post-OTA package update filter 
Filtering packages for boot-time post-OTA update with
UsageStatsManager idleness API is too aggressive and leaves out even
apps used heavily in the foreground. Remove for now.

Bug: 27902702
Bug: 28161327

Change-Id: I7912f9ad5d8c6206c19068a76383e370d24818db
 2016-04-13 16:41:39 +01:00
Alan Viverette
3f80bc0608 Merge "Clean up Drawable annotations" into nyc-dev 
am: 2089575

* commit '2089575686331550138af542dff331e56283cb64':
  Clean up Drawable annotations

Change-Id: I45577ed98eddc6a5b0235e2f1e7e8f1486f97f25
 2016-04-13 15:29:35 +00:00
Alan Viverette
2089575686 Merge "Clean up Drawable annotations" into nyc-dev 2016-04-13 15:22:04 +00:00
Gustav Sennton
4f41b242cc Merge "Don\'t run the WebView preparation if using the same non-replaced package" into nyc-dev 
am: 5352dda

* commit '5352dda479452c248f87521d6c69c9dd8399ebb7':
  Don't run the WebView preparation if using the same non-replaced package

Change-Id: I7f018b862bb8426481fe34dd25fbb401a4bf96fd
 2016-04-13 15:05:23 +00:00
Jason Monk
52c66d74d1 Remove color and appearance 
Also fix crash.

Change-Id: I16abec61d63e2d503b07047c08664c2e96689c50
Fixes: 28163234
 2016-04-13 11:01:19 -04:00
Nick Kralevich
db67ea8bc7 Merge "change directory name" into nyc-dev 
am: 9e5922c

* commit '9e5922cf73d32077587bf74c7a086b0d3274da16':
  change directory name

Change-Id: I96bf97af4198b8b512e774dae3305c7258edfcff
 2016-04-13 14:59:52 +00:00
Gustav Sennton
5352dda479 Merge "Don't run the WebView preparation if using the same non-replaced package" into nyc-dev 2016-04-13 14:54:54 +00:00
Nick Kralevich
9e5922cf73 Merge "change directory name" into nyc-dev 2016-04-13 14:51:15 +00:00
Nick Kralevich
e91dba06f9 change directory name 
external/sepolicy was renamed system/sepolicy

Change-Id: Id27cd8c22d966958e481c9ed0171f637b3ffe2c0
 2016-04-13 07:49:28 -07:00
Yongjiang Wu
d5be2a2055 Merge "Fix: the label "customize" is not updated after changing language" 
am: b4c4e20

* commit 'b4c4e20960094ff401ca9656bdbe86e17891e2a9':
  Fix: the label "customize" is not updated after changing language

Change-Id: I51870941759f5c8ebac9f91191eae004c4ad729b
 2016-04-13 14:34:40 +00:00
Treehugger Robot
b4c4e20960 Merge "Fix: the label "customize" is not updated after changing language" 2016-04-13 14:25:05 +00:00
Alan Viverette
b8cbb806fc Clean up Drawable annotations 
No functional changes.

Bug: 23621364
Change-Id: Ia5ac34eb8464ee40afd7052f34b42bb6153260bf
 2016-04-13 10:14:06 -04:00
Michael Wright
f58d81e640 Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev 
am: 52546e4

* commit '52546e46353f455d6a5bd070da6095868d7fc8bd':
  Crash early when requesting a keyboard shortcut helper...

Change-Id: Ia1be80e54af4c04af0c33ef2d03f7fc4e8dfee84
 2016-04-13 14:02:50 +00:00
Michael Wright
52546e4635 Merge "Crash early when requesting a keyboard shortcut helper..." into nyc-dev 2016-04-13 13:58:16 +00:00
Rubin Xu
8c5b37fd5a Merge "Remove temporary workaround of restoring periodic syncs." into nyc-dev 
am: eadbe1d

* commit 'eadbe1db7574ea037e3b0a644031bca114421155':
  Remove temporary workaround of restoring periodic syncs.

Change-Id: I8e8aa0a775ba83189f92f9eacc61f86f002ea770
 2016-04-13 13:49:27 +00:00
Kaori Katou
8ad4bf3610 Merge "Dismiss keyguard when user button is tapped" 
am: e3d556f

* commit 'e3d556f7853268f309cd151d2bf550f9222cc81c':
  Dismiss keyguard when user button is tapped

Change-Id: I4fac2ae58c7ab0212894f2affcc364cc8f59d4ef
 2016-04-13 13:42:46 +00:00
Rubin Xu
eadbe1db75 Merge "Remove temporary workaround of restoring periodic syncs." into nyc-dev 2016-04-13 13:41:22 +00:00
Michal Karpinski
96d49b1ac6 Merge "API polish in DPM for organization color and name methods" into nyc-dev 
am: 1271cef

* commit '1271cef419bdb7577f64b1dfa05d5678df706ef5':
  API polish in DPM for organization color and name methods

Change-Id: I6073662932fc256fc4860a19c4d45b1f9fcf9ced
 2016-04-13 13:36:44 +00:00
Treehugger Robot
e3d556f785 Merge "Dismiss keyguard when user button is tapped" 2016-04-13 13:32:38 +00:00
Michal Karpinski
1271cef419 Merge "API polish in DPM for organization color and name methods" into nyc-dev 2016-04-13 13:28:08 +00:00
Calin Juravle
823b1173f1 resolve merge conflicts of 5ec9766 to nyc-dev-plus-aosp 
Change-Id: I503978b0ebabee4401ae955d92d0c073b8ff9b14
 2016-04-13 14:19:13 +01:00
Jerome Gaillard
e4e690b655 Merge "Change method name in VectorDrawable_Delegate" into nyc-dev 
am: ff9e0de

* commit 'ff9e0dede85d12576227013feeb3a1e7fd5a4774':
  Change method name in VectorDrawable_Delegate

Change-Id: I9b706ab3297c69f58a948282250ae1ed40cd3c0b
 2016-04-13 12:21:28 +00:00
Jerome Gaillard
ff9e0dede8 Merge "Change method name in VectorDrawable_Delegate" into nyc-dev 2016-04-13 12:13:34 +00:00
Calin Juravle
5ec9766406 Merge "Handle dalvik.vm.jitprithreadweight property" 
am: 00ba615

* commit '00ba61551e54a46b0bca9feb3d35f18021021c9a':
  Handle dalvik.vm.jitprithreadweight property

Change-Id: I492bdae2ad367ec9204608f430b3b47dbc2e7ea9
 2016-04-13 11:54:23 +00:00
Calin Juravle
00ba61551e Merge "Handle dalvik.vm.jitprithreadweight property" 2016-04-13 11:44:56 +00:00
Nicolas Prevot
d1261c578e Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev 
am: eeef75b

* commit 'eeef75b6266dee8127bb0bcd1c241059602ca791':
  Suspend work status bar icon should be removed when work profile is deleted.

Change-Id: I6bc8d58071b4728e2142febc51120f0d68d88988
 2016-04-13 11:07:43 +00:00
Nicolas Prévot
eeef75b626 Merge "Suspend work status bar icon should be removed when work profile is deleted." into nyc-dev 2016-04-13 11:00:02 +00:00
Jerome Gaillard
8c0ab16494 Change method name in VectorDrawable_Delegate 
Following change in VectorDrawable from commit cdedc9a80d.

Change-Id: I5d17b2e77c9600fe3da981c77a3e39dcd4df1d1f
 2016-04-13 11:48:28 +01:00
Victor Chang
b2d707953a Merge "Update display text in cert notification" into nyc-dev 
am: caf566a

* commit 'caf566a5372b05230885b787997b98ff4508eadd':
  Update display text in cert notification

Change-Id: I8c7459972fbdd2224f8eb68d01c7c63061b2256e
 2016-04-13 10:22:27 +00:00
Victor Chang
caf566a537 Merge "Update display text in cert notification" into nyc-dev 2016-04-13 10:15:29 +00:00
Nicolas Prevot
6c7b874557 Suspend work status bar icon should be removed when work profile is deleted. 
BUG:26787011
Change-Id: Ifb3de2a670b1d5ac74200b8d344bb576f683ed61
 2016-04-13 10:28:58 +01:00