Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
196,129 Commits 3 Branches 0 Tags
ab21d60c240fb2ef773cf4dda1ff5a4e7f4592d3
Commit Graph

48327 Commits

Author SHA1 Message Date
Andres Morales
ab21d60c24 am 9250d972: am 0fddb1a6: Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 
* commit '9250d9727b5a71267cb33b535bdd959c1c03b11a':
  Revert "[partition checking] re-enable bootimage/bootloader, add recovery"
 2015-06-01 18:51:32 +00:00
Chien-Yu Chen
e573a5e23f am a56dee8e: am 61bae6d8: Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 
* commit 'a56dee8edecddfe298d348c4006de6dea0e92374':
  Camera2: update docs for reprocess timestamp
 2015-06-01 18:51:27 +00:00
Alan Viverette
c820559a91 am af3134ae: am 9be801c8: Merge "Don\'t ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 
* commit 'af3134ae74538bf716da8ecdc0a07f29e5bdc145':
  Don't ignore explicit dividerHeight of 0 specified in XML
 2015-06-01 18:51:12 +00:00
Alan Viverette
b88314ad72 am 508b6d2d: am 242b9c4e: Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 
* commit '508b6d2d576b1bdd528362fbb069961a9a65c2fb':
  Fix row/column order when unparcelling CollectionItemInfo
 2015-06-01 18:50:46 +00:00
Stuart Scott
c96a66dd03 am 378c2cbf: am e3e314df: Network Reset should have a lockdown like Factory Reset. 
* commit '378c2cbf2ebc2e3668da7d5a285fe3ec6b9d7ee8':
  Network Reset should have a lockdown like Factory Reset.
 2015-06-01 18:50:39 +00:00
Mady Mellor
fae785fccf am 8de52276: am 3aa33b3d: Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 
* commit '8de52276a1f5faf83ea8147f0ddee74195279bba':
  Update button to BUTTON_STYLUS_PRIMARY
 2015-06-01 18:50:15 +00:00
Mady Mellor
ee8ac623ed am 8c189479: am ef24bc00: Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 
* commit '8c189479a02dfae2874a622dd79abcbcded0c809':
  Update stylus button press recognition in View to use new MotionEvent APIs
 2015-06-01 18:50:09 +00:00
Mady Mellor
36ffd6d6b6 am ed836dec: am cac7b2b1: Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 
* commit 'ed836decd81c2b8d894bf2fd658f45a761f795cd':
  Update stylus button press recognition in GestureDetector to use new APIs
 2015-06-01 18:50:04 +00:00
Filip Gruszczynski
183f8fa450 am 21605b33: am 99bcc3ee: Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 
* commit '21605b3395372b1ee1dd645bb8d9e50c7e7e9460':
  Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""
 2015-06-01 18:49:47 +00:00
Andres Morales
0fddb1a631 Merge "Revert "[partition checking] re-enable bootimage/bootloader, add recovery"" into mnc-dev 2015-06-01 17:50:58 +00:00
Chien-Yu Chen
61bae6d8de Merge "Camera2: update docs for reprocess timestamp" into mnc-dev 2015-06-01 17:50:58 +00:00
Andres Morales
c97b92e346 Revert "[partition checking] re-enable bootimage/bootloader, add recovery" 
This reverts commit 831e01a89e.

Change-Id: I48bf74631b842178964d25906b2790f18632e32a
 2015-06-01 17:50:43 +00:00
Alan Viverette
9be801c826 Merge "Don't ignore explicit dividerHeight of 0 specified in XML" into mnc-dev 2015-06-01 17:33:21 +00:00
Alan Viverette
7b2f86488c Don't ignore explicit dividerHeight of 0 specified in XML 
Also minor cleanup and adding annotations.

Bug: 21420748
Change-Id: I89edcd3ce423ad75a4028bebf0dcd828b9619c15
 2015-06-01 10:30:21 -07:00
Erik Kline
413cd5a329 am 8ef5ac13: am ab069235: Treat RTM_DELNEIGH as a transition to NUD_NONE 
* commit '8ef5ac13abf3602c195ea972a9c5ce5626d1a6dd':
  Treat RTM_DELNEIGH as a transition to NUD_NONE
 2015-06-01 17:11:37 +00:00
Barnaby James
fab12f200a am 4ead90a1: am 6fad7e7f: Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 
* commit '4ead90a1c200f144e91d176b4c1627b1bad37f45':
  Minor VoiceInteractor documentation fixes.
 2015-06-01 17:09:02 +00:00
Yohei Yukawa
64f5d4f031 am d9597642: am 512234f1: Merge "Close input session when the view is detached from the window." into mnc-dev 
* commit 'd9597642ebbe4601568ad73ff20281c237e606fa':
  Close input session when the view is detached from the window.
 2015-06-01 17:07:48 +00:00
Jeff Brown
19d50b8f79 am 82f7affa: am cb81d183: Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 
* commit '82f7affa196d9efbca7f47fdb6ce96b498172829':
  Tell PhoneWindowManager when we start/finish interactive changes.
 2015-06-01 17:07:34 +00:00
Doris Liu
82b455892c am dab83061: am 1501da4b: Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev 
* commit 'dab830615ebb6c4dc31fc52b05143a950142f7fe':
  Fix calls to Rect.intersect() in package android.view
 2015-06-01 17:07:29 +00:00
Alan Viverette
e2fa70eaea am 8dbdd860: am db291132: Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev 
* commit '8dbdd860e57618a5738b5c39758fc5feb75ef58f':
  Replace PNG-based seekbar thumb animation with AVD
 2015-06-01 17:02:24 +00:00
Alan Viverette
242b9c4eee Merge "Fix row/column order when unparcelling CollectionItemInfo" into mnc-dev 2015-06-01 16:39:10 +00:00
Stuart Scott
e3e314df4d Network Reset should have a lockdown like Factory Reset. 
bug:20332322
Change-Id: I7c61a011d11e89513757f112abf320bb2a785edb
(cherry picked from commit 94b038bbb2)
 2015-06-01 16:31:00 +00:00
Mady Mellor
3aa33b3da0 Merge "Update button to BUTTON_STYLUS_PRIMARY" into mnc-dev 2015-06-01 16:17:37 +00:00
Mady Mellor
ef24bc0039 Merge "Update stylus button press recognition in View to use new MotionEvent APIs" into mnc-dev 2015-06-01 16:16:20 +00:00
Mady Mellor
cac7b2b175 Merge "Update stylus button press recognition in GestureDetector to use new APIs" into mnc-dev 2015-06-01 16:16:00 +00:00
Alan Viverette
faeac960cc Fix row/column order when unparcelling CollectionItemInfo 
Bug: 21527853
Change-Id: I02a75b9395a4d573f5fd49abcbd282b35e2c8f3c
 2015-06-01 09:03:27 -07:00
Filip Gruszczynski
99bcc3eee2 Merge "Revert "Revert "resolved conflicts for merge of 47249f2a to mnc-dev""" into mnc-dev 2015-06-01 15:42:42 +00:00
Yohei Yukawa
1d95daf37d am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev 
* commit '4ad0161a45a872981199285a0c72d2e79de44ba5':
  Revert "Rely on IMM#focusOut() to close input session."
 2015-06-01 15:28:01 +00:00
Doris Liu
0040c7d2ba am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev 
* commit 'c271314154efc468022b9464a8d18eadf07a7183':
  Update doc to include how clipToPadding affects EdgeEffect
 2015-06-01 15:27:54 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
 2015-06-01 15:26:00 +00:00
John Spurlock
f7043e284a am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '015a95ff35e5e9de959c10d082fbe2e10c58885c':
  Zen: Use account name instead of calendar id in event conditions.
 2015-06-01 15:24:42 +00:00
Raph Levien
1091defa85 am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev 
* commit '023973ecc66c62f2b83d9154097bb370966ed96d':
  Use getRunAdvance to position cursor
 2015-06-01 15:23:16 +00:00
Yohei Yukawa
47d691baf7 am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 
* commit '92086e06ad3167ebfadbc746d32e86c335878a8f':
  Rely on IMM#focusOut() to close input session.
 2015-06-01 15:22:58 +00:00
Andres Morales
0b8ddb4792 am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 
* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery
 2015-06-01 15:22:42 +00:00
Neil Fuller
1d66281e4b am 59b24040: am e761938c: Merge "Fix javadocs based on recent case consistency change" 
* commit '59b240404f19f3450e710e07a90d4e8d35fabcaf':
  Fix javadocs based on recent case consistency change
 2015-06-01 12:26:01 +00:00
Neil Fuller
3b7f9615b7 Merge "Fix javadocs based on recent case consistency change" into mnc-dev 2015-06-01 12:04:44 +00:00
Neil Fuller
a5e389ddd2 Fix javadocs based on recent case consistency change 
Commit a40d2447b6f516116135ee7f126579771ba98a2c made the
case consistently "as for the beginning of a sentence".
This updates the docs to reflect that. Previously the
result depended on the string returned (e.g. "Tomorrow"
was capitalized in English) and the casing varied
within and between locales.

Bug: 20247811
(cherry-picked from commit 0e1c0e11e4)

Change-Id: I7b48958725b32b13bee00347585472f8073e7761
 2015-06-01 13:02:18 +01:00
Neil Fuller
e761938c39 Merge "Fix javadocs based on recent case consistency change" 2015-06-01 12:01:44 +00:00
Erik Kline
ab06923576 Treat RTM_DELNEIGH as a transition to NUD_NONE 
RTM_DELNEIGHs can happen naturally during garbage collection of STALE
entries, as well as when an interface is going down.  All other
transitions of interest at this time pass through FAILED.

Bug: 18581716
Bug: 21531726
Change-Id: Ib2a731dd6ad6ece478df6950d4cc7752588328a4
 2015-06-01 12:46:24 +09:00
Barnaby James
6fad7e7f42 Merge "Minor VoiceInteractor documentation fixes." into mnc-dev 2015-05-30 21:57:48 +00:00
Yohei Yukawa
512234f196 Merge "Close input session when the view is detached from the window." into mnc-dev 2015-05-30 00:52:30 +00:00
Yohei Yukawa
b13f015ab5 Close input session when the view is detached from the window. 
This is the 3rd trial to fix Bug 20820914.

In followig CLs, we have tried to address a input session
leak when the focused view is detached from the focused
window by relying on IMM#focusOut() but failed because of
regressions like Bug 21508503.
- Ib4bd70ce0305a6bde6a929bcc6ad20a2b8402a97
- I219394178e4172bc47864297f1418e677dba25e5
- Id6afc8fc64512225578c62557b96c7dc2e969adf
- Ib1b037594ebbb4ad4cf2d59e21c7a8ca9d8dc930
- I2228ae0c48ad3d9e0b55875f0dcb5ef8c55b0c5f

What we have learned from Bug 21508503 was that re-enabling
IMM#focusOut() probably requires much more work than we
thought.  Also relying on IMM#focusOut() might be overkill
because the situation in Bug 20820914 is really special where
the focused view is detached from the focused window hence
we should be able to be fix the issue more conservatively
by closing input session when and only when the focused
view is detached from the focused view, rather than
re-enabling IMM#focusOut() globally.

Bug: 20820914
Change-Id: Iaf3fe2c065b5bf91e49a729ba46262114bb6da88
 2015-05-29 17:44:51 -07:00
Jeff Brown
cb81d18367 Merge "Tell PhoneWindowManager when we start/finish interactive changes." into mnc-dev 2015-05-30 00:33:07 +00:00
Doris Liu
1501da4bae Merge "Fix calls to Rect.intersect() in package android.view" into mnc-dev 2015-05-30 00:31:47 +00:00
Jeff Brown
416c49c404 Tell PhoneWindowManager when we start/finish interactive changes. 
Added some new callbacks that can be used to more precisely trigger
certain behaviors that need to happen around the time the device
is put to sleep and locked.

Fixed an issue where the going to sleep signal might be sent too
early on devices that don't support ambient mode due to the extra
wakefulness change between DOZING and ASLEEP.  We are now track
the early / late interactive change work separately from the rest.

Bug: 21375811
Change-Id: I95387195e216ae92a6e45485bd1bd362e41aa45a
 2015-05-29 17:28:40 -07:00
Chien-Yu Chen
6216e4e06f Camera2: update docs for reprocess timestamp 
Bug: 21112186
Change-Id: Ie49c00c96f7e69b672df5afa34e06e3dcd49490f
 2015-05-29 17:21:11 -07:00
Alan Viverette
db2911321b Merge "Replace PNG-based seekbar thumb animation with AVD" into mnc-dev 2015-05-29 22:51:04 +00:00
Alan Viverette
87e1938be8 Replace PNG-based seekbar thumb animation with AVD 
Adds optical inset support for VectorDrawable and GradientDrawable.

Bug: 19944181
Change-Id: I9df04d9fe17ad858413e7f93694bf37ee2c43c85
 2015-05-29 15:12:14 -07:00
Chad Brubaker
533d164ed0 am 0189c6ef: am dd783301: Merge "Add optional additional entropy to finish" 
* commit '0189c6efed4f36db0661d827d998a49bc34ece12':
  Add optional additional entropy to finish
 2015-05-29 21:44:34 +00:00
Yohei Yukawa
650a91356b Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev 2015-05-29 20:41:25 +00:00