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

153768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Reck
4655420ba8 am 35137dd1: am 5347ddea: Merge "Yet more layer tracking logging" into lmp-dev 
* commit '35137dd1bf8f0a46702b2927035401c2ab78685c':
  Yet more layer tracking logging
 2014-09-05 02:12:04 +00:00
Craig Mautner
53b07246de am 6a7356b0: am 4075b321: Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev 
* commit '6a7356b001a3e9e192a420146c63406ecc27fdf8':
  Prevent recursion in resumeTopActivityLocked
 2014-09-05 02:11:31 +00:00
Alan Viverette
ffcad05acb am fe88d0b6: am 610e985f: Merge "Don\'t switch to touch exploring state on pointer up" into lmp-dev 
* commit 'fe88d0b63ff20699f41adf35603f7bba79d12cf5':
  Don't switch to touch exploring state on pointer up
 2014-09-05 02:11:20 +00:00
John Reck
628fbd65ee am 5347ddea: Merge "Yet more layer tracking logging" into lmp-dev 
* commit '5347ddea2180e6d4e1247e588a91e0ac60426525':
  Yet more layer tracking logging
 2014-09-05 01:17:32 +00:00
Craig Mautner
c1568488d9 am 4075b321: Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev 
* commit '4075b321a0aa823600ebf269425e63a929457c3e':
  Prevent recursion in resumeTopActivityLocked
 2014-09-05 01:09:43 +00:00
Alan Viverette
1172cab056 am 610e985f: Merge "Don\'t switch to touch exploring state on pointer up" into lmp-dev 
* commit '610e985faec477bde6db324c5e91d4c5017c6614':
  Don't switch to touch exploring state on pointer up
 2014-09-05 01:09:37 +00:00
John Reck
6dad93eff6 Merge "Yet more layer tracking logging" into lmp-dev 2014-09-05 01:06:08 +00:00
Craig Mautner
46edee0994 Merge "Prevent recursion in resumeTopActivityLocked" into lmp-dev 2014-09-05 00:59:46 +00:00
Alan Viverette
15aebbbe53 Merge "Don't switch to touch exploring state on pointer up" into lmp-dev 2014-09-05 00:54:42 +00:00
Adam Powell
7701884dd0 am f34ce09c: am 2e9f1521: Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 
* commit 'f34ce09c34591d16eb1cdf82fb4cb9af6855ffce':
  Dispatch more menu events to window callbacks from ToolbarActionBar
 2014-09-05 00:41:01 +00:00
Adam Powell
e67efe66b9 am c947bffa: am 5a01e292: Merge "Material EdgeEffect refinements" into lmp-dev 
* commit 'c947bffac6d9c0778eb63a2a183fe963695d07f2':
  Material EdgeEffect refinements
 2014-09-05 00:40:56 +00:00
Yorke Lee
5264e3b9f4 am 159a547b: am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '159a547b246577ac5b02ab2284adc553ed3721b9':
  ContactsContract API changes per API review
 2014-09-05 00:40:51 +00:00
John Reck
443a714fa7 Yet more layer tracking logging 
Bug: 17208461

Change-Id: I55e7d0921eb565867e966d68b798b7b92c391b55
 2014-09-04 17:40:05 -07:00
Craig Mautner
544efa7663 Prevent recursion in resumeTopActivityLocked 
The existing recursion in resumeTopActivityLocked() finally caused
a problem by attempting to pause the same activity twice. By
preventing the recursion with this change we no longer face that
problem.

Fixes bug 17260463.

Change-Id: I0954614fc1a7dc0eeeef9335c1b973a42a7fc345
 2014-09-04 17:37:15 -07:00
Adam Powell
a2007d1a14 am 2e9f1521: Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 
* commit '2e9f15211891b474475afb7c9952b6041680a580':
  Dispatch more menu events to window callbacks from ToolbarActionBar
 2014-09-05 00:30:19 +00:00
Adam Powell
c78051ee88 am 5a01e292: Merge "Material EdgeEffect refinements" into lmp-dev 
* commit '5a01e292ff706f8b9e454dd512f1bbd48dfbea16':
  Material EdgeEffect refinements
 2014-09-05 00:30:14 +00:00
Yorke Lee
66fb2765df am 52cd366d: Merge "ContactsContract API changes per API review" into lmp-dev 
* commit '52cd366d9d094af6b8c3b4e91e54d00a88f50cb8':
  ContactsContract API changes per API review
 2014-09-05 00:30:10 +00:00
Adam Powell
e50a26f3d8 Merge "Dispatch more menu events to window callbacks from ToolbarActionBar" into lmp-dev 2014-09-05 00:26:30 +00:00
Adam Powell
1e7b18188c Merge "Material EdgeEffect refinements" into lmp-dev 2014-09-05 00:24:58 +00:00
Yorke Lee
2c404b1e5d Merge "ContactsContract API changes per API review" into lmp-dev 2014-09-05 00:20:07 +00:00
Jungshik Jang
9eb3b9bdd2 am e2f5c86a: am d427ee65: Merge "CEC: Revamp volume control action." into lmp-dev 
* commit 'e2f5c86a01cc328add6750118ee16f0e7f52e3ec':
  CEC: Revamp volume control action.
 2014-09-05 00:07:51 +00:00
Adam Powell
710c456ddb Material EdgeEffect refinements 
Add back auto-recede for EdgeEffect, but with a longer delay. Removing
it caused compatibility issues in existing custom views that never
call onRelease. The longer delay will be a signal that something is
amiss without disrupting the UX too badly.

Recede the glow more quickly on release.

Start translucent and fade to more opaque as the glow grows and is
pulled further. Make the opacity stronger in the extreme cases so the
glow is more prominent.

Equalize glow size across the width and height.

Bug 15146438
Bug 15936708

Change-Id: I020d705906e6225b044d0f5303bafa733a679a66
 2014-09-04 17:03:43 -07:00
Ye Wen
e01a785a76 am c4c556e5: am 3442921f: Merge "MMS API cleanup (1/4)" into lmp-dev 
* commit 'c4c556e5d322be28c42b2c93cac1157cfdf84159':
  MMS API cleanup (1/4)
 2014-09-04 23:57:31 +00:00
Nick Kralevich
3dbcb235e1 am fef09eeb: am 395a78c3: Merge "AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP" into lmp-dev 
* commit 'fef09eebcc268e6f9ceb85706f2ac582de504cf0':
  AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP
 2014-09-04 23:57:26 +00:00
Andrew Lee
34c45887a9 am 3d1a0960: am 1cc96754: Merge "Tweak methods for get/set DefaultOutgoing phone account." into lmp-dev 
* commit '3d1a0960b69d415698e1113463695a1762699a1c':
  Tweak methods for get/set DefaultOutgoing phone account.
 2014-09-04 23:57:21 +00:00
Jungshik Jang
e093b29c39 am d427ee65: Merge "CEC: Revamp volume control action." into lmp-dev 
* commit 'd427ee6517486be598621d6911ede5254e3f3f91':
  CEC: Revamp volume control action.
 2014-09-04 23:57:14 +00:00
Yorke Lee
78814623e0 ContactsContract API changes per API review 
Bug: 17390425
Change-Id: Ia88fb0235a56becc3ec5a770067856311769a68c
 2014-09-04 16:51:53 -07:00
Jungshik Jang
f4df7656b9 Merge "CEC: Revamp volume control action." into lmp-dev 2014-09-04 23:47:03 +00:00
Ye Wen
876bac809c am 3442921f: Merge "MMS API cleanup (1/4)" into lmp-dev 
* commit '3442921f2cbf42147df917618854b85f0a1f7a75':
  MMS API cleanup (1/4)
 2014-09-04 23:45:40 +00:00
Nick Kralevich
2ad01012c0 am 395a78c3: Merge "AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP" into lmp-dev 
* commit '395a78c341f26eb6e7696f8d5892caff9c41df8a':
  AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP
 2014-09-04 23:45:35 +00:00
Andrew Lee
34b4962b65 am 1cc96754: Merge "Tweak methods for get/set DefaultOutgoing phone account." into lmp-dev 
* commit '1cc96754140f8298898adaf498db9c086cc08df8':
  Tweak methods for get/set DefaultOutgoing phone account.
 2014-09-04 23:45:28 +00:00
Ye Wen
70afe9ee84 Merge "MMS API cleanup (1/4)" into lmp-dev 2014-09-04 23:36:00 +00:00
Nick Kralevich
9ce72731f2 Merge "AppWidgetServiceImpl: Use enforceCallingOrSelfPermission for checking DUMP" into lmp-dev 2014-09-04 23:36:00 +00:00
Andrew Lee
8d223eb3f9 Merge "Tweak methods for get/set DefaultOutgoing phone account." into lmp-dev 2014-09-04 23:34:41 +00:00
Jungshik Jang
2e8f1b6399 CEC: Revamp volume control action. 
Here is a list of changes
1. Change volume control into event base not level base
2. Hide volume ui if volume change is triggered by CEC
3. Report volume change triggered by CEC in OSD message
4. Revamp HdmiLogger so that normal class uses static method only.
5. Apply format message to HdmiLogger's helper methods.

Bug: 17367215

Change-Id: I9f3cd41f7c66f76919059b463df956ed5176b054
 2014-09-05 08:30:19 +09:00
Raph Levien
bc196429d6 am 188d9adb: am 43012fec: Merge "Up/down arrow moves to beginning/end of buffer" into lmp-dev 
* commit '188d9adb89082eb00a764a51484238bd2a94f89b':
  Up/down arrow moves to beginning/end of buffer
 2014-09-04 23:30:16 +00:00
Dianne Hackborn
7d26fa32cc am 8dd4914b: am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit '8dd4914ba3ece4e408571cfcc19da4d801cecbfa':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:30:11 +00:00
Adam Powell
04c0d46078 Dispatch more menu events to window callbacks from ToolbarActionBar 
Wire through the callbacks that result in onPrepareOptionsMenu being
called properly when an activity overflow menu is opened.

Bug 17326424

Change-Id: Ifc5b67af0d215f210bb00326f82f60ba55a36d52
 2014-09-04 16:25:26 -07:00
Raph Levien
218cc2e2b9 am 43012fec: Merge "Up/down arrow moves to beginning/end of buffer" into lmp-dev 
* commit '43012fecc4871a2994bf9fb8d0a23710368e4327':
  Up/down arrow moves to beginning/end of buffer
 2014-09-04 23:17:24 +00:00
Dianne Hackborn
38147c9218 am c5e138f7: Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 
* commit 'c5e138f774ca46cf2f2fb58a040c2f91685d00cf':
  Fix issue #17375172...   sshhhhhh!!!
 2014-09-04 23:17:20 +00:00
Andreas Gampe
79de4de3a4 Merge "resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp" into lmp-dev-plus-aosp 2014-09-04 23:17:12 +00:00
Andreas Gampe
dc84c6ca86 resolved conflicts for merge of 82ad9ec3 to lmp-dev-plus-aosp 
Change-Id: I7ae05c4f1b072906932a9ed47bdbad881b8e0d37
 2014-09-04 16:15:52 -07:00
Tom O'Neill
f0614ae955 am 15674b91: am b1a1f355: Merge "Keep LMP from breaking KitKat API" into lmp-dev 
* commit '15674b917ef505de8bb64c765a21fbe679f79f6b':
  Keep LMP from breaking KitKat API
 2014-09-04 23:12:45 +00:00
Raph Levien
26573425da Merge "Up/down arrow moves to beginning/end of buffer" into lmp-dev 2014-09-04 23:08:58 +00:00
Dianne Hackborn
edfc6af590 Merge "Fix issue #17375172... sshhhhhh!!!" into lmp-dev 2014-09-04 23:08:24 +00:00
Tom O'Neill
0f8fcff91f am b1a1f355: Merge "Keep LMP from breaking KitKat API" into lmp-dev 
* commit 'b1a1f35522ac14076d79942ccb673ef2d2b4061a':
  Keep LMP from breaking KitKat API
 2014-09-04 23:04:31 +00:00
Jeff Sharkey
fd9e0e8d25 am 51c82f1b: am 04324ae4: Merge changes I10ab0b4a,Id32dcbd5 into lmp-dev 
* commit '51c82f1be958e80e2f32c13312f28663fc0d49d5':
  Catch incompatible API regressions.
  Add blame to API lint, some exemptions.
 2014-09-04 23:04:31 +00:00
Jeff Sharkey
6de676ca84 am daf82380: am 8fcdda89: Merge "Hold package cleaning until system is ready." into lmp-dev 
* commit 'daf823800795d25629372cd5068d9340a97ed841':
  Hold package cleaning until system is ready.
 2014-09-04 23:04:26 +00:00
Amith Yamasani
0b6ce453a2 am 4a94107f: am 3971e42e: Merge "Fix crash if package setting is not populated yet" into lmp-dev 
* commit '4a94107f50d77cc634bb7e931a25ce9ab6b263df':
  Fix crash if package setting is not populated yet
 2014-09-04 23:04:21 +00:00
Tom O'Neill
649db7f0a5 Merge "Keep LMP from breaking KitKat API" into lmp-dev 2014-09-04 22:56:58 +00:00