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

193746 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ruben Brunk
4ac084d4ff Make CameraService proxy retry behavior more lenient. 
Bug: 21527760
Change-Id: I70abea66f1d1fafffcfdd8e30b0cff244f814e59
 2015-06-02 12:46:13 -07:00
The Android Automerger
7220c18809 merge in mnc-release history after reset to mnc-dev 2015-06-02 01:02:11 -07:00
Andre Eisenbach
708f57f4dc Un-hide connectGatt() variant with selective transport 
Change-Id: I1d3c512160de2bd68550faf243bb151d5cf7f3c9
 2015-06-02 02:28:54 +00:00
Ruben Brunk
11df5b66ef Merge "Track camera and flashlight usage in battery stats." into mnc-dev 2015-06-02 01:48:27 +00:00
Quddus Chong
082138cd1c am 348d0a68: am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922 
* commit '348d0a68ad317877061f23da512144b0e4c2dc7c':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922
 2015-06-02 01:25:21 +00:00
Sanket Padawe
405e895c98 Merge "Fix issue related selecting of "Contact sharing" in BT Settings." into mnc-dev 2015-06-02 01:20:26 +00:00
Clara Bayarri
a0b77dd5e2 Merge "Fix TextView ActionMode overflow finishes the ActionMode" into mnc-dev 2015-06-02 01:15:50 +00:00
Clara Bayarri
d63a177670 Merge "Make Text Selection Action Mode secondary items IF_ROOM" into mnc-dev 2015-06-02 01:15:03 +00:00
Quddus Chong
348d0a68ad am 7af35669: docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922 
* commit '7af3566912b0e014cfd1704acdeb31a0a7cca0d3':
  docs: Added Javadocs for Testing Support Library v0.3 and updated the corresponding setup instructions. bug: 21442922
 2015-06-02 01:07:57 +00:00
Adam Powell
fa3f17f117 Merge "Don't take the compatibility path for non-primary ActionModes" into mnc-dev 2015-06-02 01:00:06 +00:00
Svetoslav
4982e7b4dc Merge "Don't add real children for a view with a node provider" into mnc-dev 2015-06-02 00:22:39 +00:00
Svetoslav
762621ced7 Don't add real children for a view with a node provider 
Change-Id: I1dd43fa5ff93e8eb76e2c7587fb13cd1ef097678
 2015-06-01 17:21:59 -07:00
Quddus Chong
7af3566912 docs: Added Javadocs for Testing Support Library v0.3 and updated 
the corresponding setup instructions.
bug: 21442922

Change-Id: I7374e8102fc95377e83db738ab7ff20510e04faa
 2015-06-01 17:18:39 -07:00
Jorim Jaggi
03a7c4c6d4 Fix shared drawable state 
Not calling mutate here had a side-effect making the icon in the
status bar untintable in SysUI.

Bug: 21566007
Change-Id: Ifb78c81ba7f04d496f14031ef635a6e964e6280e
 2015-06-01 23:59:00 +00:00
Ruben Brunk
6d2c363fd5 Track camera and flashlight usage in battery stats. 
Bug: 15986092

Change-Id: Idf03981271721c44fd43327d5d90cf6f3fecfacb
 2015-06-01 16:54:23 -07:00
Svetoslav
acbe426bbc Merge "Add accidentally deleted strings." into mnc-dev 2015-06-01 23:53:55 +00:00
Selim Gurun
8a6d511dad Merge "Remove ViewAssistStructure and use the frameworks data structure" into mnc-dev 2015-06-01 23:53:11 +00:00
Alan Viverette
b0f94ae5d2 Merge "Always send VIEW_CLICKED event from AdapterView.performItemClick()" into mnc-dev 2015-06-01 23:52:36 +00:00
Svetoslav
5f79d8282d Add accidentally deleted strings. 
Change-Id: I16d7c151b46c076bfdccb1ff0b2bcb0934eedf93
 2015-06-01 16:51:11 -07:00
Eino-Ville Talvala
717a2d09fa Merge "Camera2: Remove isLoggable" into mnc-dev 2015-06-01 23:47:32 +00:00
Alan Viverette
376c32f268 Always send VIEW_CLICKED event from AdapterView.performItemClick() 
This makes it consistent with View.performClick().

Bug: 19574976
Change-Id: I00b222d56aa6fac03c2e6ead0604ee2ff3a6969d
 2015-06-01 16:41:42 -07:00
Selim Gurun
50b26a5c27 Remove ViewAssistStructure and use the frameworks data structure 
As part of the API rename from ViewAssistStructure to ViewStructure,
we added a temporary workaround to prevent build breakage. Remove
the temporary workaround since the current unbundled webview package
implements the updated  onProvideVirtualStructure API.

Change-Id: I13a5b8dee3e856eb585de53a0750bd52c7a909a7
 2015-06-01 23:41:12 +00:00
Jeff Brown
0505f7f2b5 Merge "Terminate loop properly when cursor window is full." into mnc-dev 2015-06-01 23:34:25 +00:00
Jeff Brown
bb8c841e90 Terminate loop properly when cursor window is full. 
The existing code exits the column-filling loop immediately but
may continue to try to fill rows.  Ordinarily this should fail
too but it's possible for the process to continue and then
blow up a little later.  Fixed this problem by exiting the row-
filling loop promptly.

Bug: 21406130
Change-Id: Ifab59188d5d1b40f3c1f5c97604dd48da71bf37b
 2015-06-01 16:33:24 -07:00
Adrian Roos
c45d6c30a5 Merge "Translucent bars in landscape" into mnc-dev 2015-06-01 23:25:35 +00:00
Deepanshu Gupta
346222f90a Merge "LayoutLib: Skip classes from java package." into mnc-dev 2015-06-01 23:20:12 +00:00
Deepanshu Gupta
7ef93d1573 Merge "Skip warnings for some unresolved references." into mnc-dev 2015-06-01 23:20:04 +00:00
Quddus Chong
133b107d28 am 65b7485d: am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273 
* commit '65b7485d64661394b61df3df7eeccd063932886e':
  docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273
 2015-06-01 23:11:47 +00:00
Winson Chung
c85cd734bd Merge "Don't focus view for invalid task index." into mnc-dev 2015-06-01 23:07:37 +00:00
Winson Chung
daa4a78682 Don't focus view for invalid task index. 
Bug: 21322861
Change-Id: I7b8397d18b488bd8f459e578b64d6e82e4f1437d
 2015-06-01 16:02:58 -07:00
Sanket Padawe
78c23767ec Fix issue related selecting of "Contact sharing" in BT Settings. 
Bug: 20041014
Change-Id: I84b59fdfd82c4bf25965bcb10a15fbff2dfbe721
 2015-06-01 15:55:30 -07:00
Adrian Roos
8a8ffd4e9b Translucent bars in landscape 
Bug: 18739556
Change-Id: Ib9602a9d1f09e6bd6c1306927990676120dff012
 2015-06-01 15:42:26 -07:00
Adam Powell
dc49d5f8ae Merge "Fix one-action choosers with EXTRA_INITIAL_INTENTS" into mnc-dev 2015-06-01 22:37:38 +00:00
Tyler Gunn
29780eecd0 Merge "Cleanup Video API javadoc." into mnc-dev 2015-06-01 22:35:29 +00:00
Tyler Gunn
0feb9c9cf9 Merge "IMS: Conference fixes" into mnc-dev 2015-06-01 22:34:02 +00:00
Dianne Hackborn
9ed0c4109d Merge "Update VoiceInteractionService from API review." into mnc-dev 2015-06-01 22:28:45 +00:00
Alan Viverette
e1c68765cf Merge "ActionBar menu text should look like Button" into mnc-dev 2015-06-01 22:08:28 +00:00
Raph Levien
fb2cdc4ca1 Merge "Revert "Revert "Use getRunAdvance to position cursor""" into mnc-dev 2015-06-01 21:56:36 +00:00
Alan Viverette
e0e5c1cf19 Merge "Clean up AbsListView constructor" into mnc-dev 2015-06-01 21:56:36 +00:00
Robert Shih
eb8a51f359 Merge "MediaPlayer: trigger onError instead of exception on stale native notifications" into mnc-dev 2015-06-01 21:56:35 +00:00
Tyler Gunn
d46595a673 IMS: Conference fixes 
- Set phoneaccount to Conference
- Handle conference call in DIALING state

Change-Id: I549bf664724473f0d5d4450cbc8d96f7b534f43a
Bug: 21376607
 2015-06-01 14:53:55 -07:00
Deepanshu Gupta
86caef1892 LayoutLib: Skip classes from java package. 
Classes in "java" package can't be defined at runtime anyway. No use
including them in LayoutLib.

Change-Id: I7e7c46f0d74e32c893b23093828569b4fa5e3a73
 2015-06-01 14:43:28 -07:00
Deepanshu Gupta
b3e872be9e Skip warnings for some unresolved references. 
Some applications rename the newer RTL attributes to the older
attributes in order to target RTL locales, but not need to include two
attributes everywhere it's needed. For example, iosched renames
paddingStart to paddingLeft (among other attributes) for API 17 and
above. This leads to hundreds of warnings about missing attributes.
This change suppresses such warnings.

Also, skip adding unresolved attributes to the typed array. This is more
in line with the actual implementation on device, and prevents
unexpected warnings/errors/crashes later.

Change-Id: Iee616fa6295aa9731ede0cf9dcd6dd2bd1fe8f20
 2015-06-01 14:41:38 -07:00
Raph Levien
edb27f14ec Revert "Revert "Use getRunAdvance to position cursor"" 
This reverts commit 5730c974800a0ffed59a041d9e249a5c42e417db.
 2015-06-01 14:34:47 -07:00
Quddus Chong
65b7485d64 am 2b95561d: docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273 
* commit '2b95561db50426779947ad5ab680994c24d79396':
  docs: Fixed typo for confirm credentials section in the API Overview. bug: 21444273
 2015-06-01 21:31:23 +00:00
Abodunrinwa Toki
bdd500ecd4 Merge "Fix FloatingToolbar look and animation for RTL." into mnc-dev 2015-06-01 21:31:20 +00:00
Eino-Ville Talvala
14438d122c Merge "Camera2: Add tangential distortion coefficients" into mnc-dev 2015-06-01 21:26:12 +00:00
Quddus Chong
2b95561db5 docs: Fixed typo for confirm credentials section in the API Overview. 
bug: 21444273

Change-Id: I01700e95227e5f7c09a5d6428877087d7ff0121a
 2015-06-01 14:16:44 -07:00
Andrew Flynn
9d28852f61 Merge "Remove separate light/dark animated vector drawables" into mnc-dev 2015-06-01 21:11:54 +00:00
Chris Craik
8c1e287bf8 Merge "Fix RenderScript copy tracing sections" into mnc-dev 2015-06-01 20:58:10 +00:00