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
John Reck
1da8c9baa2 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours am: bfa719f448 -s ours 
am: 1fae3b370d

* commit '1fae3b370dfd9536da166ef561df630cdff02b83':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I5015ea3a7926caf4cf2cf27feff0653507063ac3
 2016-05-19 22:32:47 +00:00
Android Build Merger (Role)
926d525db9 Merge "Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev am: 75445fd6a0 am: 41f6d98d61" into nyc-mr1-dev-plus-aosp 2016-05-19 22:30:17 +00:00
Android Build Merger (Role)
5ad1a5dcd3 Merge "Merge "Update documentation about copyTo and copyFrom." into nyc-dev am: 1a523b7502 am: 34abcb758b" into nyc-mr1-dev-plus-aosp 2016-05-19 22:30:06 +00:00
Chih-Hung Hsieh
6c89616c38 Fix misc-macro-parentheses warnings in services jni. 
Bug: 28705665
Change-Id: Iaf965875b667e45e1557e447de7988f729adfd52
 2016-05-19 15:29:38 -07:00
Miao Wang
79be1401f4 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev am: 75445fd6a0 
am: 41f6d98d61

* commit '41f6d98d6181f902ffa75b932ae6ecc1976f2910':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: Ib6fb3c9ef54367038f37cff9a404e166816df7ab
 2016-05-19 22:29:38 +00:00
Miao Wang
03ca2f9ac4 Merge "Update documentation about copyTo and copyFrom." into nyc-dev am: 1a523b7502 
am: 34abcb758b

* commit '34abcb758b40addd434bd8f402f885ef8280b8c1':
  Update documentation about copyTo and copyFrom.

Change-Id: I47b73fdfe20ab616fb1945c49f2e32c2691a8f7f
 2016-05-19 22:29:33 +00:00
Miao Wang
25df361013 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev am: 75445fd6a0 
am: 35927794fc

* commit '35927794fc50683970d3cb01199de1324265ffa0':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I1f253121da46b338ac502ea7f1f9b0225a6d2965
 2016-05-19 22:29:08 +00:00
Miao Wang
bc1a2a6d85 Merge "Update documentation about copyTo and copyFrom." into nyc-dev am: 1a523b7502 
am: 7ae30e18a4

* commit '7ae30e18a4065d62b42b407344999856ab82a038':
  Update documentation about copyTo and copyFrom.

Change-Id: I439ff929a73cce4098a2ddb33c20be676fe959f9
 2016-05-19 22:29:06 +00:00
John Reck
1fae3b370d DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 am: 5527fd1323 -s ours 
am: bfa719f448  -s ours

* commit 'bfa719f448ab4d90368a3cdc556e515253528e17':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I6597a3a69b8037af401000ab0123ea6d050f58ed
 2016-05-19 22:28:23 +00:00
Chih-Hung Hsieh
cef190de85 Fix misc-macro-parentheses warnings in hwui and graphic jni. 
Bug: 28705665
Change-Id: I7d1eb38a713fe6cc7f41a3cc3f2f9d0aa0114b2c
 2016-05-19 15:25:50 -07:00
Miao Wang
41f6d98d61 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev 
am: 75445fd6a0

* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I052720b2df509ad33ab107e8aae3b38e2499e72c
 2016-05-19 22:24:36 +00:00
Miao Wang
34abcb758b Merge "Update documentation about copyTo and copyFrom." into nyc-dev 
am: 1a523b7502

* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
  Update documentation about copyTo and copyFrom.

Change-Id: I7dab75f163e4dc3826cf864fbe61546fae6a3f7a
 2016-05-19 22:24:31 +00:00
Miao Wang
35927794fc Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev 
am: 75445fd6a0

* commit '75445fd6a043a892bb7d7f18c1d62c5f72337413':
  [RenderScript] Fix ScriptIntrinsicBlur documentation.

Change-Id: I8ccd115fd6f92ef4b4ef7194a77fd01ffbda5916
 2016-05-19 22:24:27 +00:00
Miao Wang
7ae30e18a4 Merge "Update documentation about copyTo and copyFrom." into nyc-dev 
am: 1a523b7502

* commit '1a523b7502135a5cc0a94ea380263638b0ffdab1':
  Update documentation about copyTo and copyFrom.

Change-Id: I0aa87cd4bde408ba5395ae3f951d86e10ece58de
 2016-05-19 22:24:21 +00:00
John Reck
bfa719f448 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 am: 1b1fcbaab5 
am: 5527fd1323  -s ours

* commit '5527fd1323cc1d6470576386c8298f45c3895d75':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I14fe8c28299ba6bb94cd51d1bc9c637be7766cbd
 2016-05-19 22:21:46 +00:00
Chih-Hung Hsieh
2bd7a3efc4 Fix misc-macro-parentheses warnings in common_time. 
Bug: 28705665
Change-Id: Ibdab4631f0e692b8a291faecdeb4a6062f906ea5
 2016-05-19 15:21:42 -07:00
Chih-Hung Hsieh
e819d01e3e Fix misc-macro-parentheses warnings in aapt and androidfw. 
Bug: 28705665
Change-Id: Iac353e66718aadad384183cf300330695df25909
 2016-05-19 15:19:22 -07:00
Miao Wang
75445fd6a0 Merge "[RenderScript] Fix ScriptIntrinsicBlur documentation." into nyc-dev 2016-05-19 22:16:55 +00:00
John Reck
5527fd1323 DO NOT MERGE Cherry pick libpng usage fixes am: 7c9f2b8aa2 
am: 1b1fcbaab5

* commit '1b1fcbaab5169f824e803bcd97aa848e27dbcafb':
  DO NOT MERGE Cherry pick libpng usage fixes

Change-Id: I40b173cbfd5fbec21a2b194b573a246af534c315
 2016-05-19 22:16:42 +00:00
Miao Wang
1a523b7502 Merge "Update documentation about copyTo and copyFrom." into nyc-dev 2016-05-19 22:16:38 +00:00
Sungki Kim
bcf8c61456 Merge "Fix GATT autoConnect race condition" am: 53ccfe848f am: 5dfe673be1 
am: 51ab612ea9

* commit '51ab612ea9ad953dc78555401baf59ee4a577e2f':
  Fix GATT autoConnect race condition

Change-Id: If3f20f83b9e8cfd3031a84de1fbc787b9c8ee169
 2016-05-19 22:16:31 +00:00
Chih-Hung Hsieh
0ca16ef3b8 Fix misc-macro-parentheses warnings in audio media jni. 
Bug: 28705665
Change-Id: Iff476943a0a2c2ae68778d1f4bca5d3e9e04bd26
 2016-05-19 15:14:54 -07:00
Robert Carr
692a5feab9 Correctly clear resizing drawable when nulling background. 
When a null window background is set, we want to use the
fallback drawable for resizing.

Bug: 28801472

Change-Id: Ia616d7aa18b0d7aa2c7081a85ce7551ecfeca5b3
 2016-05-19 15:11:14 -07:00
Chih-Hung Hsieh
3c22e00fb9 Fix misc-macro-parentheses warnings in DngCreator. 
Bug: 28705665
Change-Id: Ia9b513411456b34b3e508793166ddb17e34dec13
 2016-05-19 15:10:07 -07:00
Andre Eisenbach
51ab612ea9 Merge "Fix GATT autoConnect race condition" am: 53ccfe848f 
am: 5dfe673be1

* commit '5dfe673be19ec469b1e62f4713c24f57b5ff27e2':
  Fix GATT autoConnect race condition

Change-Id: I236ba945e17ab8ba960d18a8225ff65f170180e0
 2016-05-19 22:10:07 +00:00
smain@google.com
0f150a6901 fix dashboards page. 
the src attributes were being modified by the devsite parser,
so i renamed those attributes then rename them again at runtime.
bug: 28801246

Change-Id: I34d0dff8fa7f430226dd1d12fccb2cdbeda365db
 2016-05-19 15:08:51 -07:00
Sungki Kim
5dfe673be1 Merge "Fix GATT autoConnect race condition" 
am: 53ccfe848f

* commit '53ccfe848f1b97cca12c7e5b496032e97594a8e2':
  Fix GATT autoConnect race condition

Change-Id: Ia761a72b003751146b83314facfdaf936b1f9e9b
 2016-05-19 22:05:49 +00:00
Android Build Merger (Role)
07c716614c Merge "Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d am: df5056d531" into nyc-mr1-dev-plus-aosp 2016-05-19 22:04:36 +00:00
Phil Weaver
27d52f7627 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d 
am: df5056d531

* commit 'df5056d531b71833a0b1e1784576f8c3a7954bb3':
  Fix a11y crash when window layer isn't unique.

Change-Id: I744856c410dc8137753efdbbe330bdad4c360f60
 2016-05-19 22:04:03 +00:00
Phil Weaver
ea45ad0c08 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev am: 227d33439d 
am: f2b72b3a9d

* commit 'f2b72b3a9d1576da77cfe1f7c38648c2c4e90314':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ic796c5149995c616e3d57b9ebf1f6d9f288dc07c
 2016-05-19 22:04:01 +00:00
Bert McMeen
76372f02fe docs: Update to column widths for Complications table 
Bug: 28864917
Change-Id: Ie02b5dd82789055b2a0994438065fc373ddf70b6
 2016-05-19 15:01:38 -07:00
Andre Eisenbach
53ccfe848f Merge "Fix GATT autoConnect race condition" 2016-05-19 21:59:25 +00:00
Phil Weaver
df5056d531 Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev 
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: I943fbc2e585ea6aaa234965dacacbf88104944a1
 2016-05-19 21:57:55 +00:00
Phil Weaver
f2b72b3a9d Merge "Fix a11y crash when window layer isn\'t unique." into nyc-dev 
am: 227d33439d

* commit '227d33439da72495b39508ebc7e4f3719bb5175f':
  Fix a11y crash when window layer isn't unique.

Change-Id: Ie5bfa1fcee7ec463190ef73311f20f3a6f087e82
 2016-05-19 21:57:12 +00:00
Android Build Merger (Role)
3735009868 Merge "Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev am: 1669d42808 am: 1b3e08b4d1" into nyc-mr1-dev-plus-aosp 2016-05-19 21:51:29 +00:00
Robert Carr
0aee56c25a Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev am: 1669d42808 
am: 1b3e08b4d1

* commit '1b3e08b4d125c8f609f1ae31f988f7618c53bdbe':
  Never set resized while not drag resizing for pinned stack.

Change-Id: Ied5c9a00c9ccf9422ecba2447209d52435694cb7
 2016-05-19 21:51:01 +00:00
Robert Carr
be37945d8e Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev am: 1669d42808 
am: 7b5f5c3188

* commit '7b5f5c3188b07c4ef1cb7bb5ab29bb7b17c7e80d':
  Never set resized while not drag resizing for pinned stack.

Change-Id: I4d6c4b6a8515621e9bb64aa5f8dacc5951572601
 2016-05-19 21:50:59 +00:00
Phil Weaver
227d33439d Merge "Fix a11y crash when window layer isn't unique." into nyc-dev 2016-05-19 21:50:29 +00:00
Robert Carr
7b5f5c3188 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev 
am: 1669d42808

* commit '1669d42808251eebddfe5e176eb8d322b84df636':
  Never set resized while not drag resizing for pinned stack.

Change-Id: Ifa2e3879a01f7ba906185b00d4b27ed3843dd315
 2016-05-19 21:46:07 +00:00
Robert Carr
1b3e08b4d1 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev 
am: 1669d42808

* commit '1669d42808251eebddfe5e176eb8d322b84df636':
  Never set resized while not drag resizing for pinned stack.

Change-Id: I5da72476c63c5f368e7ff8c1269308d206761ffd
 2016-05-19 21:45:58 +00:00
TreeHugger Robot
1669d42808 Merge "Never set resized while not drag resizing for pinned stack." into nyc-dev 2016-05-19 21:42:21 +00:00
Selim Cinek
b5d6687c56 Fixed a bug where the scrim could flash black when snoozing huns 
Because of an underflow the alpha could actually become 0xff instead
off 0 which would be visible as a black scrim. This was because of
our local updating of animators.

Change-Id: I4201a4bbfbc7cbf32819f4814c165d0e11adaadb
Fixes: 28840532
 2016-05-19 14:38:10 -07:00
sreevanis
5433ee9330 Added android:tools specification on navigation and actions page. 
Bug:28787600
Change-Id: I0ce71a6d6e95f5803f72ea8a747e1a0c877b3fc6
 2016-05-19 14:37:46 -07:00
TreeHugger Robot
60d3e8f66f Merge "sysui: refactor for extensibility." 2016-05-19 21:25:27 +00:00
Jae Seo
bd6c16908d MediaBrowserService: Add more explanation on getBrowserRootHints() 
Bug: 28840985
Change-Id: If4dbcaaa23093b2e6d5ab6158db67b1248464fb8
 2016-05-19 14:17:27 -07:00
Hemal Patel
a1ed45d7c8 Docs: Fixed a wrong file name 
Bug: 26897599
Change-Id: I4a0bb6149e6a88bb9eda90b8bcc44909633f8399
 2016-05-19 14:13:29 -07:00
Sergio Giro
cfc00030cc resolve merge conflicts of 882c7d2 to master 
Change-Id: I1235236c405e46fc984c7dda743fc6815ba7aab9
 2016-05-19 22:11:37 +01:00
Damien Bargiacchi
03be7972ee Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev 
am: 96783005d7

* commit '96783005d7d2447d18ad17e430a90d213252c9a3':
  Start the Wear Time System Service with SystemServer

Change-Id: Ief7dcfd771a4a97ac23ed0617301043f92738b95
 2016-05-19 21:02:43 +00:00
Damien Bargiacchi
60bacac2dd Merge "Check clock accuracy before attempting to display clock" into nyc-mr1-dev 
am: 9cb24e5582

* commit '9cb24e5582f7ec711400d2889baded061842b29b':
  Check clock accuracy before attempting to display clock

Change-Id: Icd74121f21e9ff2fbad210553b2661f71cd177dd
 2016-05-19 21:01:30 +00:00
Damien Bargiacchi
96783005d7 Merge "Start the Wear Time System Service with SystemServer" into nyc-mr1-dev 2016-05-19 20:56:52 +00:00