drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
194,257 Commits 1 Branch 0 Tags
Commit Graph

194257 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
739b76b7e8 Fix inverse subhead color 
Bug: 21650211
Change-Id: Ie1b8ecff4ff0c6b0e6e9b321c76cbb56c277e264
 2015-06-05 10:26:03 -07:00
Alan Viverette
a06b41b06e Merge "Avoid NPE when drawable fails to load" into mnc-dev 2015-06-05 17:20:41 +00:00
Alan Viverette
42cc892be1 Merge "Account for margins in ScrollView onMeasure() when filling viewport" into mnc-dev 2015-06-05 17:18:47 +00:00
Alan Viverette
0f1c95edf8 Avoid NPE when drawable fails to load 
Bug: 17760671
Change-Id: I99364e915e318b3e49fc758811784939a937de7c
 2015-06-05 10:17:21 -07:00
Filip Gruszczynski
eb974d5ac4 Merge "resolved conflicts for merge of f6a04305 to mnc-dev" into mnc-dev 2015-06-05 16:59:48 +00:00
Filip Gruszczynski
b0c673b50e resolved conflicts for merge of f6a04305 to mnc-dev 
Change-Id: I92e666bfd6d8ad051bdee7dce5712b9cb8e6a01d
 2015-06-05 09:43:06 -07:00
ztenghui
e1352de673 Merge "Setup the animation callback for AnimatedVectorDrawable" into mnc-dev 2015-06-05 16:37:10 +00:00
Clara Bayarri
3e85c1ed0c Merge "Fix Select All should not be shown when everything is already selected" into mnc-dev 2015-06-05 16:19:31 +00:00
Adam Powell
14d1f1383f Use real rounding in ImageView bounds configuration 
While a useful tactic in previous years, the (int) (float + 0.5f)
trick is inaccurate in some cases. Tradeoffs have changed; do the real
thing now.

Bug 20145160

Change-Id: I8af31bcb1945dc113fd36e094f5970ebd4ec0304
 2015-06-05 08:51:45 -07:00
Mady Mellor
0f2f9f7a51 Merge "Stylus scale - API review feedback" into mnc-dev 2015-06-05 15:50:52 +00:00
Chet Haase
e790c97787 Hide View.getBackgroundColor() prior to removal 
Issue #21572678  API Review: android.view.View.getBackgroundColor()

Change-Id: Ia4fa9e207db3af6e076581bf23747eba6e56bb69
 2015-06-05 14:41:51 +00:00
Jason Monk
44fdcf2642 Merge "Update no wifi networks string" into mnc-dev 2015-06-05 14:22:16 +00:00
Jason Monk
e12485fdc5 Update no wifi networks string 
Bug: 21530009
Change-Id: I910b2c062252c69f71e29744f6029c6e2557947d
 2015-06-05 10:15:02 -04:00
Selim Cinek
e067ff4357 Merge "Removed Log message when expanding from HUN" into mnc-dev 2015-06-05 13:29:37 +00:00
Selim Cinek
1ceee65c20 Merge "Removed the arrow from the hint animation" into mnc-dev 2015-06-05 13:28:57 +00:00
Selim Cinek
c699b87130 Merge "Fixed a bug with HUNS and dreams" into mnc-dev 2015-06-05 13:27:49 +00:00
Zoltan Szatmary-Ban
c92550e4b4 Merge "Replace renamed reference to NetworkStats in javadoc" into mnc-dev 2015-06-05 09:59:02 +00:00
Lorenzo Colitti
a34af2c0d7 Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev 2015-06-05 07:50:44 +00:00
Zhijun He
16ed7e70c8 Merge "Camera2: fix doc build" into mnc-dev 2015-06-05 03:33:59 +00:00
Zhijun He
39d1461cf1 Camera2: fix doc build 
Bug: 21645842
Change-Id: Ibd4ce455d9906da858b98f17fd7859016c1730c3
 2015-06-04 20:21:23 -07:00
Abodunrinwa Toki
4741f6a4c7 Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 2015-06-05 03:08:09 +00:00
Johnson Hsieh
997f3ccad3 Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 2015-06-05 02:58:42 +00:00
Johnson Hsieh
bcc1ff6726 Fix build: documentation error in AlarmClock.java. 
Change-Id: I3f64df1857c516d4c6a4ed56094a27f489eddef3
 2015-06-04 19:51:52 -07:00
John Reck
30ff6523a7 am 06ae68aa: am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs 
* commit '06ae68aac222e1ba06169c5125e0689a30d13b09':
  Fix framestats docs ordering
 2015-06-05 02:27:26 +00:00
David Friedman
fe216bd25b am cae82287: am 6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 
* commit 'cae82287c704c000d304fdd3447dd693e2801c14':
  Docs: Fixes several typos on Android Studio index.html page.
 2015-06-05 02:18:53 +00:00
Dirk Dougherty
4a08d6f042 am 392f5321: am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs 
* commit '392f532104aeba2d395bdf940cc08a1247bd3de5':
  Fix dependency specs for data binding.
 2015-06-05 02:18:42 +00:00
Filip Gruszczynski
43c4cd1c82 am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '93634166c8c78bdeccf045c62a0f601dceed74e3':
  ActivityView: set surface on a background thread.
 2015-06-05 02:18:35 +00:00
Chris Craik
44dc1667eb am 78ab4c38: am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs 
* commit '78ab4c3867af40b512d2e0c046abd5c8b040d05f':
  Rework systrace analysis documentation
 2015-06-05 02:18:29 +00:00
Joe Fernandez
eb837e8cf8 am ab1fb237: am 79106d1c: docs: Remove ADT-1 RMA form link 
* commit 'ab1fb23712c66286285ffdce2d1488c41565650f':
  docs: Remove ADT-1 RMA form link
 2015-06-05 02:18:23 +00:00
Clara Bayarri
de5cdebac7 Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 2015-06-05 02:05:46 +00:00
Clara Bayarri
01243ac57e Fix Toolbar is not refreshed after Select All 
Bug: 21361248
Change-Id: Iab913bd610c208e5881d3d0eb5574efdf9eb5d92
 2015-06-05 03:03:31 +01:00
Lorenzo Colitti
48a423f045 Remove "returning Blocked NetworkInfo" logspam. 
Bug: 20006730
Change-Id: I2061127e3c7283c0a4899940d3fc224ca114f754
 2015-06-05 10:58:17 +09:00
Clara Bayarri
3b69fd81df Fix Select All should not be shown when everything is already selected 
Condition Select All on whether the full text is already selected,
and add/remove this item when needed on ActionMode invalidation.

Bug: 21608943
Change-Id: Iad5f8a77a03b98024f7dcf355b2f7f0d1338b94a
 2015-06-05 02:53:30 +01:00
Adam Lesinski
6b717c66a7 Merge "AAPT2: Add manifest merging" into mnc-dev 2015-06-05 01:35:15 +00:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Mady Mellor
d9ff4df850 Stylus scale - API review feedback 
Fixed typo and javadoc error.

Bug: 21572278
Change-Id: Ia710971f1f4a97df7ed8e898d972f617465900b9
 2015-06-04 18:03:49 -07:00
Adam Lesinski
8c831ca87b AAPT2: Add manifest merging 
Now that AAPT2 is library-aware, it needs to take care of
all library related work, including merging manifests.
The logic was taken from the current Java ManifestMerger.

Change-Id: Id93f713f27ae8617922bf89e325e45be9f863c06
 2015-06-04 18:00:33 -07:00
Amith Yamasani
369d656533 Fix permission check in DPM.getPermissionGrantState 
It was querying for permission of user 0 instead of the calling user.
Switched to passing in the explicity userId.
Also set the flags before granting/revoking permission from DPM.

Bug: 21430988
Change-Id: Id0d2dc65e20108cefa3eeb4363f866d49c791cc4
 2015-06-04 17:58:11 -07:00
Doris Liu
5de55868a9 Merge "Make ListView's EdgeEffect respect the clipToPadding flag" into mnc-dev 2015-06-05 00:57:32 +00:00
Ben Kwa
8dbb43289c Merge "Fix drawer selection to match Material spec." into mnc-dev 2015-06-05 00:51:54 +00:00
Doris Liu
f36c061909 Make ListView's EdgeEffect respect the clipToPadding flag 
This CL sets the position of EdgeEffect based on whether
clipToPadding is enabled. When enabled, the EdgeEffect will be
bounded to the padding. Otherwise, it will be drawn at the view's
bounds.

Bug: 21595866
Change-Id: I3968e5b8d3a75ce2d7607e2037bc372024694d5b
 2015-06-04 17:50:47 -07:00
Svet Ganov
e074831605 Merge "Update the pdfium library - framework" into mnc-dev 2015-06-05 00:49:43 +00:00
Clara Bayarri
c1f28bc97d Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 2015-06-05 00:40:43 +00:00
Dongwon Kang
9e7ac352eb Merge "TIF: Add sanitization code for the current position" into mnc-dev 2015-06-05 00:27:02 +00:00
Dongwon Kang
bb3e2674b5 TIF: Add sanitization code for the current position 
+ More documentation on the currnet position

Bug: 21573422
Change-Id: I51d184d03a61270d3ea36b36f880f1f052a99cd1
 2015-06-04 17:25:59 -07:00
Wale Ogunwale
733f147401 Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 2015-06-05 00:23:28 +00:00
Roozbeh Pournader
73d2f160ec Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 2015-06-04 23:45:27 +00:00
Abodunrinwa Toki
601523ad00 TextView: Make sure the contentRect is within visibile bounds. 
Bug: 21620604
Change-Id: Idd0d891e423316b2ebacf883fd3cbfff9ef69743
 2015-06-05 00:42:06 +01:00
Ruben Brunk
5b1308f02d Add UI for camera + flashlight battery reporting. 
Bug: 11694505
Change-Id: Ieefa78a1d641851f4141fe666dae7b9fde394f09
 2015-06-04 16:41:11 -07:00
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00