Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
195,548 Commits 3 Branches 0 Tags
1ad2c080d0389209885f3cdb9e38fc63e959f9b1
Commit Graph

195548 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lorenzo Colitti
1ad2c080d0 am a34af2c0: Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev 
* commit 'a34af2c0d7bbce6469b0c6ab578f6e2c9cd38cfb':
  Remove "returning Blocked NetworkInfo" logspam.
 2015-06-05 08:02:24 +00:00
Lorenzo Colitti
a34af2c0d7 Merge "Remove "returning Blocked NetworkInfo" logspam." into mnc-dev 2015-06-05 07:50:44 +00:00
Zhijun He
adc012cf82 am 16ed7e70: Merge "Camera2: fix doc build" into mnc-dev 
* commit '16ed7e70c869e12eae4721d6b4380c05c3423c78':
  Camera2: fix doc build
 2015-06-05 03:44:42 +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
4bbc9f4d52 am 4741f6a4: Merge "TextView: Make sure the contentRect is within visibile bounds." into mnc-dev 
* commit '4741f6a4c7c7d705d6b7907798a3bb89b2501e9b':
  TextView: Make sure the contentRect is within visibile bounds.
 2015-06-05 03:18:11 +00: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
8118817634 am 997f3cca: Merge "Fix build: documentation error in AlarmClock.java." into mnc-dev 
* commit '997f3ccad33394fabe62a6a388e701e07a52e408':
  Fix build: documentation error in AlarmClock.java.
 2015-06-05 03:07:33 +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
a6ae6e2d16 am 30ff6523: am 06ae68aa: am 902ec1c7: Merge "Fix framestats docs ordering" into mnc-preview-docs 
* commit '30ff6523a791dc66b9c93f1cb7822071c20da454':
  Fix framestats docs ordering
 2015-06-05 02:36:29 +00:00
David Friedman
386df35c35 am fe216bd2: am cae82287: am 6bffab80: Merge "Docs: Fixes several typos on Android Studio index.html page." into mnc-preview-docs 
* commit 'fe216bd25b09c29530326b36f6edfbace489da44':
  Docs: Fixes several typos on Android Studio index.html page.
 2015-06-05 02:30:54 +00:00
Dirk Dougherty
86a490a262 am 4a08d6f0: am 392f5321: am 5c117ae1: Merge "Fix dependency specs for data binding." into mnc-preview-docs 
* commit '4a08d6f04248ef3ad7b15077d09fee25f928f085':
  Fix dependency specs for data binding.
 2015-06-05 02:30:48 +00:00
Filip Gruszczynski
0f5d0d54d4 am 43c4cd1c: am 93634166: am d88e4d50: Merge "ActivityView: set surface on a background thread." into cw-d-mr1-dev 
* commit '43c4cd1c82eab55decd88816a505ed102b79fb81':
  ActivityView: set surface on a background thread.
 2015-06-05 02:30:44 +00:00
Chris Craik
1ca5cd21b6 am 44dc1667: am 78ab4c38: am 6042f351: Merge "Rework systrace analysis documentation" into mnc-preview-docs 
* commit '44dc1667eb186eed6374b3119c1c2c6ac14b7e43':
  Rework systrace analysis documentation
 2015-06-05 02:30:39 +00:00
Joe Fernandez
59de628b86 am eb837e8c: am ab1fb237: am 79106d1c: docs: Remove ADT-1 RMA form link 
* commit 'eb837e8cf84e2068f649aa959eba42f6bf39ba02':
  docs: Remove ADT-1 RMA form link
 2015-06-05 02:30:34 +00: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
fee163c5db am de5cdeba: Merge "Fix Toolbar is not refreshed after Select All" into mnc-dev 
* commit 'de5cdebac7b50871c3ece6ccd0b2a4d7a4b384bc':
  Fix Toolbar is not refreshed after Select All
 2015-06-05 02:17:18 +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
Adam Lesinski
2e4f116a89 am 6b717c66: Merge "AAPT2: Add manifest merging" into mnc-dev 
* commit '6b717c66a70663ea9d8b972289a8d4d74d90bc5a':
  AAPT2: Add manifest merging
 2015-06-05 01:49:51 +00:00
Adam Lesinski
6b717c66a7 Merge "AAPT2: Add manifest merging" into mnc-dev 2015-06-05 01:35:15 +00:00
Zhijun He
427a0216b4 am 0ccc940a: Merge "Camera2: implement high speed video APIs" into mnc-dev 
* commit '0ccc940a0db0f6a779ed2cbc0f24a395046536e0':
  Camera2: implement high speed video APIs
 2015-06-05 01:21:01 +00:00
Zhijun He
0ccc940a0d Merge "Camera2: implement high speed video APIs" into mnc-dev 2015-06-05 01:07:52 +00:00
Doris Liu
6e94135180 am 5de55868: Merge "Make ListView\'s EdgeEffect respect the clipToPadding flag" into mnc-dev 
* commit '5de55868a9795a487af80e48540be84b6bdc7b97':
  Make ListView's EdgeEffect respect the clipToPadding flag
 2015-06-05 01:04:57 +00:00
Ben Kwa
7eb2d726e8 am 8dbb4328: Merge "Fix drawer selection to match Material spec." into mnc-dev 
* commit '8dbb43289ccc6bf85399eb3737be0dd5f01de923':
  Fix drawer selection to match Material spec.
 2015-06-05 01:04:52 +00:00
Svet Ganov
acce6dda97 am e0748316: Merge "Update the pdfium library - framework" into mnc-dev 
* commit 'e0748316053fe0210cf08be002d00a04e6068fb8':
  Update the pdfium library - framework
 2015-06-05 01:04:47 +00: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
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
f407aa3027 am c1f28bc9: Merge "Separate the SelectionActionMode into Insertion and Selection." into mnc-dev 
* commit 'c1f28bc97d2f88f839269ce701c7fe68c4f1615a':
  Separate the SelectionActionMode into Insertion and Selection.
 2015-06-05 00:48:54 +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
c9ae5377b9 am 9e7ac352: Merge "TIF: Add sanitization code for the current position" into mnc-dev 
* commit '9e7ac352ebc023527e2f6745d35d39e05c2bad60':
  TIF: Add sanitization code for the current position
 2015-06-05 00:36:25 +00:00
Wale Ogunwale
bb2a990bda am 733f1474: Merge "Always have a handler for PendingIntents sent in the system process" into mnc-dev 
* commit '733f147401f180b14acb13137cf99e65da1d72cc':
  Always have a handler for PendingIntents sent in the system process
 2015-06-05 00:36:20 +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
946e869807 am 73d2f160: Merge "Move NotoSansSymbols higher than CJK in the fallback chain." into mnc-dev 
* commit '73d2f160ecdd0e00b805fd956abc88996758e516':
  Move NotoSansSymbols higher than CJK in the fallback chain.
 2015-06-04 23:54:15 +00:00
Johnson Hsieh
37750c2811 am 6c72febd: Merge "Updates AlarmClock intent API." into mnc-dev 
* commit '6c72febd3526cc460b62926302fbcde1d38d42e5':
  Updates AlarmClock intent API.
 2015-06-04 23:48:24 +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
Johnson Hsieh
6c72febd35 Merge "Updates AlarmClock intent API." into mnc-dev 2015-06-04 23:34:50 +00:00