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

57935 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Yohei Yukawa
bf0cf9d135 Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev 
am: d0fae0d

* commit 'd0fae0d61d22608b4bfb0845e13ed9c07c5c5376':
  Improve captalization in InputMethodSubtype#getDisplayName().

Change-Id: Ifcbc689552b616482d236e88a512242d54704c20
 2016-04-13 06:57:05 +00:00
Yohei Yukawa
d0fae0d61d Merge "Improve captalization in InputMethodSubtype#getDisplayName()." into nyc-dev 2016-04-13 06:51:34 +00:00
Pierre Imai
e235da5d5c Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 
am: 11a888f

* commit '11a888faafc0e8181c782b9b945332d57b00e38e':
  Fix a memory leak in ConnectivityManager.

Change-Id: I46160bd5070779641607d65ec5d234d65f039d6b
 2016-04-13 06:41:18 +00:00
Pierre Imai
11a888faaf Merge "Fix a memory leak in ConnectivityManager." into nyc-dev 2016-04-13 06:37:33 +00:00
Yohei Yukawa
e489baf96d Improve captalization in InputMethodSubtype#getDisplayName(). 
The goal of this CL is to enable
InputMethodSubtype#getLocaleDisplayName() to return more natural locale
display name in terms of capitalization rules.

The key idea here is to use LocaleDisplayNames#localeDisplayName() with
an appropriate DisplayContext.CAPITALIZATION_FOR_* parameter rather than
relying on Locale#getDisplayName().

Bug: 22845728
Change-Id: If105082ce703db7a86738455db7e9fb37f3c6fe8
 2016-04-13 05:30:23 +00:00
Seigo Nonaka
01f868aa25 Merge "Delete CR LF at the same time with one backspace key." into nyc-dev 
am: 363a288

* commit '363a2884c99714547e684b42c59d9ff5de49851f':
  Delete CR LF at the same time with one backspace key.

Change-Id: I7e8471f7899a253a53f918ef75bf5a7e3a3bdc67
 2016-04-13 05:19:51 +00:00
Seigo Nonaka
363a2884c9 Merge "Delete CR LF at the same time with one backspace key." into nyc-dev 2016-04-13 05:14:25 +00:00
Jorim Jaggi
e203cdefa1 Merge "TRON refinements for multi-window" into nyc-dev 
am: a74888d

* commit 'a74888ddf6657b41aed28dff0b0b1d47a80f107f':
  TRON refinements for multi-window

Change-Id: I8a1a6d26bc94eca1afde2a1de920b4a39cd5e7f9
 2016-04-13 04:26:04 +00:00
TreeHugger Robot
a74888ddf6 Merge "TRON refinements for multi-window" into nyc-dev 2016-04-13 04:18:31 +00:00
Suprabh Shukla
7b13098b62 Merge "Added api to delete cache files for a given user" into nyc-dev 
am: 0a6a6db

* commit '0a6a6dbe9107a3e31d74293f853b46ae0e5b9e7b':
  Added api to delete cache files for a given user

Change-Id: If8bc5327e76680d3d30127b1129e7c4c36928421
 2016-04-13 03:17:24 +00:00
TreeHugger Robot
0a6a6dbe91 Merge "Added api to delete cache files for a given user" into nyc-dev 2016-04-13 03:13:49 +00:00
Jorim Jaggi
29379ec859 TRON refinements for multi-window 
Bug: 26013430
Change-Id: I89b139b4ca3e7b6a06d8b5b351d67ffac240f73f
 2016-04-12 19:43:52 -07:00
Jorim Jaggi
fae3f9c5e5 Merge "Add shadow for minimized dock" into nyc-dev 
am: a5df489

* commit 'a5df489c9c56b1ac5b0f1acef07454ea438b5367':
  Add shadow for minimized dock

Change-Id: Iab5e97a8a5cb521aadf519359816ff2c48de7e71
 2016-04-13 02:33:39 +00:00
Jorim Jaggi
a5df489c9c Merge "Add shadow for minimized dock" into nyc-dev 2016-04-13 02:24:57 +00:00
Jorim Jaggi
2917dc4918 Add shadow for minimized dock 
Bug: 27972642
Change-Id: Ic4c8145f61694ff2bb0e237da1142093c6a4d965
 2016-04-12 19:17:24 -07:00
Paul Jensen
2c1f03ade0 Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 
am: 3e6a6fc

* commit '3e6a6fc60ea78994298ff38cfe7230faf24fe6b7':
  If Internet probe is redirected, pass redirect destination to NetworkAgent.

Change-Id: I4a88bca105b1fceb7dc823b8a26991235944d405
 2016-04-13 01:41:05 +00:00
Paul Jensen
3e6a6fc60e Merge "If Internet probe is redirected, pass redirect destination to NetworkAgent." into nyc-dev 2016-04-13 01:33:37 +00:00
Suprabh Shukla
78c9eb8947 Added api to delete cache files for a given user 
Added an api to delete application cache files for a specific user. This
allows settings to clear cache files for work profile apps as well.

Bug: b/25338468
Change-Id: I52d4944a7a03b6d63ad44dd6bb868aec62815eab
 2016-04-12 18:23:56 -07:00
Adrian Roos
36feadc46c Merge "Fix broken actions with MessagingStyle" into nyc-dev 
am: 4ecc0ce

* commit '4ecc0ce387195c44f5737d5b155c0dd1ea00add7':
  Fix broken actions with MessagingStyle

Change-Id: I9cdff69b8931564190217bc0bfe4396954c4efa5
 2016-04-13 01:02:18 +00:00
TreeHugger Robot
4ecc0ce387 Merge "Fix broken actions with MessagingStyle" into nyc-dev 2016-04-13 00:54:32 +00:00
Philip P. Moltmann
d516393865 Merge "Set label for links to resolver activities." into nyc-dev 
am: d1b8d6d

* commit 'd1b8d6d342d049e00d9a304c291c6c024aa3c0a0':
  Set label for links to resolver activities.

Change-Id: Iaf7e59bdca4a25b347661bed7b927b8100dcac96
 2016-04-13 00:17:54 +00:00
Eino-Ville Talvala
d848ebb7a5 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 
am: 777c4e7

* commit '777c4e764462ec43e29e0366bd1203f9be9e5ded':
  Camera/Surface: Update OutputConfiguration API

Change-Id: I68cbc5100ecb766f9018cbbc751ca456727c6909
 2016-04-13 00:12:48 +00:00
TreeHugger Robot
d1b8d6d342 Merge "Set label for links to resolver activities." into nyc-dev 2016-04-13 00:12:39 +00:00
Eino-Ville Talvala
777c4e7644 Merge "Camera/Surface: Update OutputConfiguration API" into nyc-dev 2016-04-13 00:08:09 +00:00
Jeff Sharkey
f58879ac19 Merge "Fix broken javadoc." into nyc-dev 
am: cadfc77

* commit 'cadfc77d0355ef57308ef1bf8bf43560d2b2e245':
  Fix broken javadoc.

Change-Id: I2ccd28ea9b50f8e7573e18565e665b2b82c1a410
 2016-04-12 23:42:24 +00:00
Michael Wright
53b854ad7d Crash early when requesting a keyboard shortcut helper... 
with a null IResultReceiver.

We're seeing Dialer crashes in this code path but they happen in the
main Handler loop so we can't see where the request with the null
request is coming from. Crashing earlier will hopefully give us a
stack trace that we can use to diagnose the issue.

Bug: 27963013
Change-Id: I60e4ef2ef328fa69790bbcaa4f196c02f7443296
 2016-04-12 19:39:03 -04:00
Jeff Sharkey
cadfc77d03 Merge "Fix broken javadoc." into nyc-dev 2016-04-12 23:37:38 +00:00
Makoto Onuki
9d25ead98b Merge "ShortcutManager: Address API review feedback." into nyc-dev 
am: 1d616f0

* commit '1d616f0d880d0a4109e811221f3c3ff2e016013b':
  ShortcutManager: Address API review feedback.

Change-Id: I83cf33d390ba695117b88b397667e378902f439e
 2016-04-12 22:52:26 +00:00
Philip P. Moltmann
f8173ca8ac Set label for links to resolver activities. 
Also: Add specific labels for capture-image-intent.

Fixes: 20134921
Change-Id: I3678def1089512a8340f19110645a03379c26cee
 2016-04-12 15:44:00 -07:00
Makoto Onuki
1d616f0d88 Merge "ShortcutManager: Address API review feedback." into nyc-dev 2016-04-12 22:34:17 +00:00
Chad Brubaker
f62489edd9 Merge "Add implemention for isSameTrustConfiguration" into nyc-dev 
am: d92e5c3

* commit 'd92e5c314e1a3ffa0bc6daf43e4e9cec2521d217':
  Add implemention for isSameTrustConfiguration

Change-Id: Ic6552d34ce666cea087f40564d944c1249dcc687
 2016-04-12 22:22:50 +00:00
Alan Viverette
8042045fdf Merge "Include current selection mode in TimePicker event text" into nyc-dev 
am: 20f2b38

* commit '20f2b38ea4633446e9da23a86a29b40a59067af6':
  Include current selection mode in TimePicker event text

Change-Id: Ie06ee0564b207e4f83b8409d9d2174752fa3246f
 2016-04-12 22:22:47 +00:00
Sunny Goyal
59c30a01af Merge "Changing LauncherApps to resolve activity by component name" into nyc-dev 
am: 1fe7dfa

* commit '1fe7dfa66aaf37045c62094438ab3db2ee5403c5':
  Changing LauncherApps to resolve activity by component name

Change-Id: I517285d5ca79af026080cc80e938e2134d98f14e
 2016-04-12 22:22:34 +00:00
Felipe Leme
db95b32d7d Merge "Make getStorageVolume(File file) public." into nyc-dev 
am: 93c442e

* commit '93c442e44f3aa6bd7a27ef74770aeeb2dfb4880d':
  Make getStorageVolume(File file) public.

Change-Id: Ib27ed0eb8538f997d01b1ef0541e5c6e5f181566
 2016-04-12 22:22:22 +00:00
Adrian Roos
28d6762456 Merge "Notification MessagingStyle: Add handset views" into nyc-dev 
am: 4db2f1f

* commit '4db2f1f6020a82012bcd3141a22bd59e0baed1d5':
  Notification MessagingStyle: Add handset views

Change-Id: Ib1971c6c1d8aa07ef586073bf2316f2b3b18bfab
 2016-04-12 22:22:15 +00:00
Shreyas Basarge
8a71af509a Merge "Documentation for flex field" into nyc-dev 
am: 997743d

* commit '997743d29e46ed034a0769e765a5ce83cd3f903a':
  Documentation for flex field

Change-Id: I6ef9763ec0c6e333ddae002e6dcf4a66d862464e
 2016-04-12 22:21:00 +00:00
Adam Powell
c3e096953d Merge "Dispatch View#onVisibilityAggregated to views becoming invisible" into nyc-dev 
am: c4bf6e4

* commit 'c4bf6e43d14ffe8d719227ddcc66e9b66dba005a':
  Dispatch View#onVisibilityAggregated to views becoming invisible

Change-Id: I2f97021a5bdc545b3c4cf516d93e5e4763eaec7d
 2016-04-12 22:20:50 +00:00
Adam Lesinski
e44263c1fe Merge "BatteryStats: Don\'t log BluetoothScanTimer when it doesn\'t exist" into nyc-dev 
am: daeee0b

* commit 'daeee0b5d70e2f97e7a8eebce181e092121b1809':
  BatteryStats: Don't log BluetoothScanTimer when it doesn't exist

Change-Id: I2497ab5496461933d37f75d5492bab151c240c7f
 2016-04-12 22:20:40 +00:00
Chad Brubaker
2ac28363f3 Merge "Document when usesCleartextTraffic is ignored." into nyc-dev 
am: e341ddf

* commit 'e341ddfa05e61d7ef937d6b3fd21a2bf4fa903fd':
  Document when usesCleartextTraffic is ignored.

Change-Id: I0e7534a0d58800704129a2f9a008347c471418df
 2016-04-12 22:19:47 +00:00
Adrian Roos
48d746ab32 Fix broken actions with MessagingStyle 
Bug: 27250207
Change-Id: I073bb0ef055423a6c152af0e98fe846b15511d11
 2016-04-12 15:00:31 -07:00