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

181629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Wale Ogunwale
ad57529591 Merge "@hide ActivityInfo.resizeable." 2015-02-03 20:30:25 +00:00
Ruben Brunk
35fa2bc2e4 Merge "Add ProcessInfoService to activity manager." 2015-02-03 20:23:04 +00:00
Winson Chung
04de4c9de1 Merge "Ensuring that the list of stack views are mutable. (Bug 19245963)" 2015-02-03 20:06:37 +00:00
Winson Chung
93847da2c2 Ensuring that the list of stack views are mutable. (Bug 19245963) 
Change-Id: I5a298bf389d8756492cce2777f127fc214f6d6be
 2015-02-03 12:04:55 -08:00
Yin-Chia Yeh
d9fc67ce3c Camera2: framework updates for HAL3.3 keys 
1. Return new keys in legacy shim
2. Codegened doc update from the spec change
3. Remove DISABLED mode from available scene mode list to ensure
   DISABLED is listed iff scene mode is not supported

Change-Id: If3dc74ea7e0fe6135722723f211024b604094f59
 2015-02-03 11:52:04 -08:00
Craig Mautner
42da895b90 Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f automerge: 6112f63 
automerge: e8bd6d7

* commit 'e8bd6d734ccef685c4e25a0ec1735c140b9fe644':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:52:59 +00:00
Craig Mautner
e8bd6d734c Merge "[ActivityManager] Prevent application holding AMS lock" automerge: 53e8d6f 
automerge: 6112f63

* commit '6112f63369c7ba463c0384c73a4e4c0d45b63918':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:48:29 +00:00
Craig Mautner
6112f63369 Merge "[ActivityManager] Prevent application holding AMS lock" 
automerge: 53e8d6f

* commit '53e8d6f934be403b9c7733c190b6052d60dd0658':
  [ActivityManager] Prevent application holding AMS lock
 2015-02-03 18:43:46 +00:00
Craig Mautner
53e8d6f934 Merge "[ActivityManager] Prevent application holding AMS lock" 2015-02-03 18:41:14 +00:00
Adrian Roos
a9d5d3dbcb Merge "Remove UI code from LockPatternUtils" 2015-02-03 18:18:06 +00:00
Jean-Michel Trivi
3d22bf04e3 AudioAttributes javadoc update for conversion to stream types 
Change-Id: I2b687d8a002897fff90a8c99d180aa0a3511a571
 2015-02-03 10:15:08 -08:00
Clara Bayarri
54514cfa3e Merge "Floating Palettes: Create the ActionMode type and use it in Editor." 2015-02-03 18:14:00 +00:00
Adrian Roos
c2e01683b3 Remove UI code from LockPatternUtils 
Bug: 18931518
Change-Id: I951166f675731ec7a2bc51585e0a51e0cd92611d
 2015-02-03 19:12:23 +01:00
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
Wale Ogunwale
4aab1bba69 @hide ActivityInfo.resizeable. 
Bug: 19178148
Change-Id: Icc132eef7196cc2b8e50294df10595bde8d73ecd
 2015-02-03 10:06:34 -08: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
b2a958fd3c Remove path, query, and fragment from http Uri. 
For http and https schemes leave only scheme and authority in
Uri.toSafeString().

Fixes bug 19217173.

Change-Id: Ic07665f4754bb33ad48f7a55ce5efda185df7577
 2015-02-03 10:01:56 -08: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
Paul Jensen
8fe1742946 Facilitate network validation on networks with a per-network PAC. 
On networks with a per-network PAC, Network.openConnection(URL) will
fetch using NO_PROXY.  This will fail on networks where Internet
access is only permitted via the proxy.  Always failing network
validation has the potential to disable WiFi auto-join.  Instead
of performing the normal connectivity check, instead attempt to
fetch the PAC, as this is meant to succeed with NO_PROXY.

bug:19143573
Change-Id: Ia482f5c046d338c27daf42571f20851dfa36671c
 2015-02-03 11:28:55 -05:00
Clara Bayarri
d6aeff17e6 Floating Palettes: Create the ActionMode type and use it in Editor. 
This CL creates the Type attribute for ActionMode, which will serve as a flag to determine its behavior and representation.
- TYPE_PRIMARY is the default and will maintain the current behavior and representation in the ActionBar
- TYPE_FLOATING will be the new Type and will be represented as a Floating Palette

Editor switches the flag from the default to TYPE_FLOATING, but this has no consequences right now, until the functionality is implemented.

Change-Id: Icd6cab01637f6ca3ae2e999b06904e08974d0c81
 2015-02-03 11:07:15 +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