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

181557 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
b95a8abcaf am c0e9c1d0: am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" automerge: 7d1aded 
* commit 'c0e9c1d0a405c66e7ec75eb6268f84fe1d466344':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:09:38 +00:00
Craig Mautner
c0e9c1d0a4 am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" 
automerge: 7d1aded

* commit '7d1adede2fbea8f4c0ad92214bee16395498dd07':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:04:32 +00:00
Craig Mautner
7d1adede2f am 240e8743: Merge "[ActivityManager] Set appropriate relation of task to home" 
* commit '240e8743977d1a1e7a43ff42e0d52148db10cda8':
  [ActivityManager] Set appropriate relation of task to home
 2015-02-03 18:00:46 +00:00
Craig Mautner
240e874397 Merge "[ActivityManager] Set appropriate relation of task to home" 2015-02-03 17:54:27 +00:00
Craig Mautner
5656036dd7 am cd1b1ee3: Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge: 84533ed automerge: 11c6f8b 
* commit 'cd1b1ee39fbeaf7d95089c183b549b0853206ffd':
  Remove fall through for KEYCODE_VOICE_ASSIST
 2015-02-03 17:51:31 +00:00
Tony Mantler
338026f59a Merge "Check NAVIGATION_NONAV in ActivityManagerService" 2015-02-03 17:50:17 +00:00
Craig Mautner
cd1b1ee39f Merge "Remove fall through for KEYCODE_VOICE_ASSIST" automerge: 84533ed 
automerge: 11c6f8b

* commit '11c6f8b7c3cc51a3a44bca5003ac3fb56a410c33':
  Remove fall through for KEYCODE_VOICE_ASSIST
 2015-02-03 17:46:56 +00:00
Brian Attwell
2502f1d414 Merge "Expose EXTRA_MODE" 2015-02-03 17:43:23 +00:00
Craig Mautner
11c6f8b7c3 Merge "Remove fall through for KEYCODE_VOICE_ASSIST" 
automerge: 84533ed

* commit '84533edfc081f8dfa632ee1e49947b3d42f8a27d':
  Remove fall through for KEYCODE_VOICE_ASSIST
 2015-02-03 17:41:31 +00:00
Brian Attwell
029e6819ae Expose EXTRA_MODE 
The ability to set EXTRA_MODE values on QuickContact
intents has existed for ages by setting the extraMode
parameter on showQuickContact().

Now we need a way for QuickContactActivity to read the intent.

Bug: 18777272
Change-Id: If5e4aa5757e62e942926a12a36345512d6fb66ca
 2015-02-03 09:37:30 -08:00
Craig Mautner
84533edfc0 Merge "Remove fall through for KEYCODE_VOICE_ASSIST" 2015-02-03 17:36:54 +00:00
Wale Ogunwale
f5db946ffa Merge "Support for activity to opt-in/out of resizeable/multi-window support." 2015-02-03 17:16:16 +00:00
Robert Greenwalt
95a8a1cf65 am 10d1609b: am deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE" 
automerge: 74033e9

* commit '74033e9d8fc66f6b888f0aa4b17015d6a5da032b':
  Deutsche Telekom VVM free SMS shortcodes DE
 2015-02-03 16:59:08 +00:00
Robert Greenwalt
74033e9d8f am 10d1609b: am deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE" 
* commit '10d1609be9bd842f9a3ee44d9753a55e6e19cbd8':
  Deutsche Telekom VVM free SMS shortcodes DE
 2015-02-03 16:53:49 +00:00
Robert Greenwalt
10d1609be9 am deef702e: Merge "Deutsche Telekom VVM free SMS shortcodes DE" 
* commit 'deef702e60f2f0aa9cf35a70bdf4c5e582799750':
  Deutsche Telekom VVM free SMS shortcodes DE
 2015-02-03 16:47:34 +00:00
Bryce Lee
bea05cef13 Merge "Make THEATER_MODE_ON a System API." 2015-02-03 16:44:26 +00:00
Robert Greenwalt
deef702e60 Merge "Deutsche Telekom VVM free SMS shortcodes DE" 2015-02-03 16:44:02 +00:00
Henrik Baard
aa5c5e31de Remove fall through for KEYCODE_VOICE_ASSIST 
Removing unintentional fallthrough for the case
KEYCODE_VOICE_ASSIST.

The code works today since KEYCODE_VOICE_ASSIST is the
last case in the switch statement, however it is bad
practice. If somone adds another case statement the
code will break.

Change-Id: Iee6234807bbe176bd94e2584de288105d6c6a7cb
 2015-02-03 09:25:28 +01:00
Svetoslav
7e760ee59d Fix broken activation of the selected view in accessibility mode. automerge: ded133c automerge: b6b526e 
automerge: f8acd7a

* commit 'f8acd7a961f3a36712519d0f925f86f3da8d0b7c':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:31:28 +00:00
Svetoslav
f8acd7a961 Fix broken activation of the selected view in accessibility mode. automerge: ded133c 
automerge: b6b526e

* commit 'b6b526eaafdcc39e9d55a82f61f1e03c4a3487c3':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:27:33 +00:00
Svetoslav
b6b526eaaf Fix broken activation of the selected view in accessibility mode. 
automerge: ded133c

* commit 'ded133c446fa9d0d23e6bde19a66fb2ce3980491':
  Fix broken activation of the selected view in accessibility mode.
 2015-02-03 07:20:34 +00:00
Yang Ni
afc870e484 Merge "Pass in code cache directory when creating a script group." automerge: 9559ce7 automerge: 29fe5ef 
automerge: 712e38e

* commit '712e38eaba012904a515dc84d1edda4dab563dcc':
  Pass in code cache directory when creating a script group.
 2015-02-03 06:33:27 +00:00
Yang Ni
712e38eaba Merge "Pass in code cache directory when creating a script group." automerge: 9559ce7 
automerge: 29fe5ef

* commit '29fe5ef179a4a7de15360650353c6196f9350b07':
  Pass in code cache directory when creating a script group.
 2015-02-03 06:27:39 +00:00
Yang Ni
29fe5ef179 Merge "Pass in code cache directory when creating a script group." 
automerge: 9559ce7

* commit '9559ce7c1bd4451a470d6e1542659e726b0dce3d':
  Pass in code cache directory when creating a script group.
 2015-02-03 06:22:55 +00:00
Yang Ni
9559ce7c1b Merge "Pass in code cache directory when creating a script group." 2015-02-03 06:20:20 +00:00
Alan Viverette
ea54c0f97c Merge "Make popup transition animation play nicely with dismiss/show pair" 2015-02-03 00:12:32 +00:00
Andrew Lee
ffbace6fae Merge "Null-protect attempt to get EmergencyButton." 2015-02-03 00:11:19 +00:00
Andrew Lee
f98f7b969b Null-protect attempt to get EmergencyButton. 
Not all device layouts, such as for tablets, will have an Emergency
Button, so check for null before attempting to set a callback.

Bug: 18977746
Change-Id: I0e909e71c51f6923edda4707bb25053a5f2de398
 2015-02-02 16:08:41 -08:00
Wale Ogunwale
9d3de4cfb4 Support for activity to opt-in/out of resizeable/multi-window support. 
Bug: 19178148
Change-Id: I5819a71cdc48e0af4add11a6d4a503ec5cbe5d63
 2015-02-02 16:06:55 -08:00
Chris Craik
9dfd7bd520 Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path" 2015-02-03 00:00:58 +00:00
Sanket Padawe
d8f32ea2df Merge "Updated string in Wifi dialog to generate appropriate message." 2015-02-02 23:36:42 +00:00
RoboErik
dc4a950e98 Merge "Fix crash in dumpsys media_session" 2015-02-02 23:26:50 +00:00
RoboErik
7b3da2d415 Fix crash in dumpsys media_session 
Changes the dump to use the correct keys instead of just counting
when doing a dump of users.

Change-Id: Ibb2033f1cc9209fff03e5cf4928acacca29fc11b
 2015-02-02 15:23:59 -08:00
Svetoslav
ded133c446 Fix broken activation of the selected view in accessibility mode. 
We were using an approximation to determine where to send a pair of down
and up events to click on the view that has accessibility focus. We were
doing reverse computation to figuring out which portion of the view is
not covered by interactive views and get a point in this region. However,
determining whether a view is interactive is not feasible in general since
for example may override onTouchEvent. This results in views not being
activated or which is worse wrong views being activated.

This change swithes to a new approach to activate views in accessibility
mode which is guaranteed to always work except the very rare case of a
view that overrides dispatchTouchEvent (which developers shouldn't be
doing). The new approach is to flag the down and up events pair sent
by the touch explorer as targeting the accessibility focused view. Such
events are dispatched such that views predecessors of the accessibility
focus do not handle them guaranteeing that these events reach the accessibiliy
focused view. Once the accessibiliy focused view gets such an event it clears
the flag and the event is dispatched following the normal event dispatch
semantics.

The new approach is semantically equivalent to requesting the view to perform
a click accessiblitiy action but is more generic as it is not affected by
views not implementing click action support correctly.

bug:18986806
bug:18889611

Change-Id: Id4b7b886c9fd34f7eb11e606636d8e3bab122869
 2015-02-02 23:17:17 +00:00
Glenn Kasten
547c9e5212 Merge "Clarify that flush does not necessarily free up buffer space" 2015-02-02 22:32:37 +00:00
Tony Mantler
843ce5b2a2 Check NAVIGATION_NONAV in ActivityManagerService 
b/18733457

Change-Id: I12b4d1da3564129a445882025575d759fc80d6d2
 2015-02-02 14:27:44 -08:00
Glenn Kasten
7a121563d5 Clarify that flush does not necessarily free up buffer space 
Change-Id: I6f77efb6a8da5e11c0cc68f0bb3ce47a0c1cb3da
 2015-02-02 14:16:23 -08:00
Chris Craik
6c15ffa196 Refactoring of Program ownership/lifecycle, and WIP Glop rendering path 
Change-Id: I2549032790bddbc048b0bccc224ed8f386b4517c
 2015-02-02 14:08:57 -08:00
Brian Attwell
3398442905 Merge "Expose QUERY_PARAMETER_VCARD_NO_PHOTO" 2015-02-02 21:34:34 +00:00
Brian Attwell
f9fb60a592 Expose QUERY_PARAMETER_VCARD_NO_PHOTO 
QUERY_PARAMETER_VCARD_NO_PHOTO is used to avoid
attaching photos on vcards that get sent over NFC.
Large VCards can't be easily sent over NFC.

I'm deferring writing CTS tests till later.

Bug: 18777272
Change-Id: I6e3a7bf836978023225c709446b9113de05f6cef
 2015-02-02 13:33:53 -08:00
Joe Fernandez
394d087185 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-02 20:38:56 +00:00
Scott Kennedy
144ea46ce1 Merge "Add some @Nullable annotations to SharedPreferences" 2015-02-02 20:38:10 +00:00
Joe Fernandez
6689e73782 am e9557d7d: am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 automerge: d99924d 
* commit 'e9557d7d2728d1c77e4d173e8f6d954eeeb69357':
  docs: February 2015 Dashboard updates
 2015-02-02 20:37:46 +00:00
Andrew Lee
72b46d429c Reset keyguard/bouncer on "return to call". 
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.

Bug: 18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
 2015-02-02 12:30:59 -08:00
Joe Fernandez
e9557d7d27 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
automerge: d99924d

* commit 'd99924d556b95bc05bbff9408519e301983193fb':
  docs: February 2015 Dashboard updates
 2015-02-02 20:29:31 +00:00
Jorim Jaggi
c37fa833ad Merge "Merge commit '83eaf6cc' into HEAD" 2015-02-02 19:53:56 +00:00
Jorim Jaggi
10c85c76a9 Merge commit '83eaf6cc' into HEAD 
Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e
 2015-02-02 20:45:32 +01:00
destradaa
4b1b8e4c44 Revert API breaking change in System API. 
Change introduced in ag/616521

Change-Id: Ia95982b051496e123b4a179746aea15c6a0b8a65
 2015-02-02 11:42:20 -08:00
Joe Fernandez
d99924d556 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
* commit '175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
  docs: February 2015 Dashboard updates
 2015-02-02 19:35:00 +00:00
Jorim Jaggi
83eaf6cc8c am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
automerge: 2ffb340

* commit '2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
  Send accessibility event when bouncer is shown
 2015-02-02 19:30:34 +00:00