Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
212,174 Commits 3 Branches 0 Tags
cd811f0cf012e1e75cae00a487bfd4e1b08deeef
Commit Graph

56888 Commits

Author SHA1 Message Date
Alan Viverette
d920ac6e6f Merge "Use correct param for heightMode in RelativeLayout horizontal measure" 2015-08-18 13:28:44 +00:00
John Reck
2fce18d99d Merge "Revert "Add ninePatch support to Canvas.h"" 2015-08-17 22:39:57 +00:00
Jorim Jaggi
69ca9960ac am faca9cbb: am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit 'faca9cbbffb84683fa0f11ba14ae907ea872e6ce':
  Fix documentation issue
 2015-08-17 22:27:34 +00:00
John Reck
773bbe0357 Revert "Add ninePatch support to Canvas.h" 
This reverts commit edca320a2b.

Change-Id: I30ee93cfc1cac391ce152f03e9e13a1ad24dc91b
 2015-08-17 15:24:09 -07:00
Jorim Jaggi
faca9cbbff am 8787d8ef: am 73ef4642: am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '8787d8ef01205e8b16cc7fa98b9b95af326fcffc':
  Fix documentation issue
 2015-08-17 22:20:21 +00:00
Jorim Jaggi
73ef464291 am 581fd0fb: am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '581fd0fb2ecbd6d9ee049bb08f395ec04709eb74':
  Fix documentation issue
 2015-08-17 22:05:30 +00:00
Jorim Jaggi
581fd0fb2e am 757e2c7f: Merge "Fix documentation issue" into mnc-dev 
* commit '757e2c7f3e6ee93c69ecdd9de18fc03eff72d00e':
  Fix documentation issue
 2015-08-17 21:58:51 +00:00
Yohei Yukawa
9dffc27b60 Merge "Clear SuggestionsPopupWindow.mSpansLengths after it is used." 2015-08-17 21:44:24 +00:00
Seigo Nonaka
c8e6c7996f Merge "Remove duplicate separator definition." 2015-08-17 21:33:30 +00:00
Alan Viverette
46fb1249bc Merge "Separate TabWidget selection from keyboard focus" 2015-08-17 20:44:17 +00:00
Jorim Jaggi
9b70f44b2a Fix documentation issue 
Bug: 23038621
Change-Id: I230e09564b619868a4d22b2945c97180796ff4b1
 2015-08-17 18:45:22 +00:00
Alan Viverette
760a2d845a Re-enable TAB traversal in ListView 
This makes navigation asymmetrical, but that's preferable to navigation
straight-up not working at all.

Bug: 14392811
Change-Id: Ifbb41adabdc9e015c8ed7195cbfb92ec0d8458a0
 2015-08-17 14:31:42 -04:00
Alan Viverette
1352a36bee Separate TabWidget selection from keyboard focus 
Also removes a bunch of weird accessibility hacks that shouldn't have
been there in the first place.

Bug: 19382871
Change-Id: I8cbdfb6e2dab98cc88028dff5bc23376c98a077a
 2015-08-17 14:23:10 -04:00
Ruben Brunk
cbb6c16fe6 am 6f4f94ae: am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit '6f4f94ae60129be8052ae3b1c4fd9b83a4729073':
  Add experimental camera session prepare API.
 2015-08-17 18:01:20 +00:00
Ruben Brunk
6f4f94ae60 am 305680d6: am 3723af53: am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit '305680d6a08f6b44d71d7c83aebc557cfcbd3f85':
  Add experimental camera session prepare API.
 2015-08-17 17:51:42 +00:00
Ruben Brunk
3723af531a am c57f309a: Merge "Add experimental camera session prepare API." into mnc-dr-dev 
* commit 'c57f309a1b5be6fe9156405feb48637c036880a4':
  Add experimental camera session prepare API.
 2015-08-17 17:37:16 +00:00
Ruben Brunk
c57f309a1b Merge "Add experimental camera session prepare API." into mnc-dr-dev 2015-08-17 17:28:12 +00:00
Derek Sollenberger
deead00082 Merge "Add ninePatch support to Canvas.h" 2015-08-17 17:20:55 +00:00
Chris Wren
b247ba1ff5 am c1acc1df: am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit 'c1acc1dfcea07cd9d78090c2aa90e93f91104729':
  instrument fingerprint service
 2015-08-17 17:16:15 +00:00
Chris Wren
c1acc1dfce am 5b37c0d8: am 22994783: am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '5b37c0d88c079f49602ff0bef5338e547658ef96':
  instrument fingerprint service
 2015-08-17 17:09:52 +00:00
Chris Wren
2299478362 am 877c2257: Merge "instrument fingerprint service" into mnc-dr-dev 
* commit '877c22579e18736ee77d106ee2419ae99203bc9b':
  instrument fingerprint service
 2015-08-17 16:52:29 +00:00
Alan Viverette
abd89024ac Merge "Manage accessibility focus during PhoneWindow save and restore" 2015-08-17 16:51:44 +00:00
Chris Wren
877c22579e Merge "instrument fingerprint service" into mnc-dr-dev 2015-08-17 16:47:55 +00:00
Seigo Nonaka
ce2c7849a0 Remove duplicate separator definition. 
INPUT_METHOD_SEPARATOR and INPUT_METHOD_SUBTYPE_SEPARATOR are defined in
both InputMethodUtils and InputMethodSettings with same value.
This CL removes definitions in InputMethodSettings and use SEPARATOR
instead of SEPARATER.

INPUT_METHOD_SEPARATOR and INPUT_METHOD_SUBTYPE_SEPARATOR in
InputMethodUtils are originally introduced to IMMS by
If0104151b3526da6ecc669adde3119a239ecafeb and they are moved to
InputMethodUtils by I01f5fafbbcfe3e3f5313829162ec011eaf2ad991.

INPUT_METHOD_SEPARATER and INPUT_METHOD_SUBTYPE_SEPARATER in
InputMethodSettings are originally introducced to IMMS as a part of
IMMS.InputMethodSettings by Icd0f13de396ce286ff6563e8c2775d53bcdacbf3
and InputMethodSettings is moved to InputMethodSettings by
I0bc9954f163a3ec38d08b9ba842a8a31176eb6a6

Bug: 22285167
Change-Id: I3601c10902b44bb639581e3b816a3fc0a4851957
 2015-08-17 16:47:21 +00:00
Esteban Talavera
019a499c70 am 12e42ba2: am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '12e42ba225cf6c38eaf752f55a22ce6296d2343c':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 16:26:39 +00:00
Esteban Talavera
12e42ba225 am 31638de3: am 07b36bd3: am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '31638de30564d5b5fdc4177227cdab6df681ecfc':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:14:04 +00:00
Esteban Talavera
07b36bd3bf am aed1c9fb: am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit 'aed1c9fbc5c4f77bfc8c44fb7bd87bbdb6dc0174':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 15:00:04 +00:00
Esteban Talavera
aed1c9fbc5 am 5d467ac5: Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 
* commit '5d467ac54ab0390d6b911628d56294bb4277d2f1':
  Remove uids with empty history from NetworkStats uid enumeration
 2015-08-17 14:53:53 +00:00
Esteban Talavera
5d467ac54a Merge "Remove uids with empty history from NetworkStats uid enumeration" into mnc-dev 2015-08-17 14:47:49 +00:00
Dan Sandler
f120f52337 Replace missing Color API. 
Removed in change Ic4cb43e7. I could switch back to the HSV
methods or just do the lazy thing and copy the code in like
in change Iae3d85c0. (Obviously I chose the latter.)

Change-Id: I154626c326ee0bbf389df75f4a8050136b56c2d5
 2015-08-16 05:45:32 +00:00
Seigo Nonaka
127c297b40 Merge "Use android.os.Debug.getCallers instead of self implementation." 2015-08-16 03:24:02 +00:00
Eino-Ville Talvala
db86989dfc am 3a94b2d2: am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '3a94b2d22e8346a884b2521f7e7682f2953d1515':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 03:03:29 +00:00
Dianne Hackborn
83eb8493b2 am 0ce3a291: am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '0ce3a291fb4fdbfd041e605c0cb71dff4f681e8a':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 03:02:55 +00:00
Dan Sandler
8d365fe440 am d1b160f3: am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit 'd1b160f362e4d2bd961d8091b438f8eeb7d61a2f':
  "I tried to think of the most harmless thing."
 2015-08-16 03:02:19 +00:00
Eino-Ville Talvala
3a94b2d22e am 028c2e4e: am 33689420: am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '028c2e4e264d1d2235e4d0f95d178fdf77510e7e':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:55:33 +00:00
Dianne Hackborn
0ce3a291fb am 914eda00: am 574f9b42: am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '914eda0070cde26325db3d2a2e9bbf0a9e612107':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:55:05 +00:00
Dan Sandler
d1b160f362 am 87c1e1b8: am 415c6cb2: am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '87c1e1b8a1f6927d2c31375e83fd353110edd326':
  "I tried to think of the most harmless thing."
 2015-08-16 02:54:36 +00:00
Eino-Ville Talvala
33689420d1 am eec25a4f: am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit 'eec25a4ffecc0c9a726aa284d29d0b7a1e58a888':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 02:37:19 +00:00
Dianne Hackborn
574f9b42da am ac11522e: am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit 'ac11522e540422d3afc691af5510da14ab7a3d40':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 02:36:58 +00:00
Dan Sandler
415c6cb235 am 8c8387d2: resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
* commit '8c8387d235b780c4a78a54d8240fe1f5a17c6af5':
  "I tried to think of the most harmless thing."
 2015-08-16 02:36:17 +00:00
Eino-Ville Talvala
eec25a4ffe am 1017f986: Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 
* commit '1017f9862fb2cdfbff0abe12ef7d20b657a38e36':
  Camera2: Add camera type to getNumberOfCameras.
 2015-08-16 01:34:42 +00:00
Dianne Hackborn
ac11522e54 am 06f552cf: Merge "Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo..." into mnc-dev 
* commit '06f552cf9a89cd129beda8318a4832bd56d00796':
  Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo...
 2015-08-16 01:34:04 +00:00
Dan Sandler
8c8387d235 resolved conflicts (again!) for merge of 8ad3e817 to mnc-dr-dev 
Change-Id: I5b47fdbb8a9712c104f12c25b80063048849cebd
 2015-08-15 18:33:29 -04:00
Seigo Nonaka
e27dc2b09d Use android.os.Debug.getCallers instead of self implementation. 
This changes debug message format but does not change any other behavior.

Maintaining InputMethodUtils.getStackTrace() doesn't make much sense
because we already have a similar method in android.os.Debug.

since there is already utility function in Android. The length 10 is
sufficient for identifying caller modules.

getStackTrace() is introduced by
Ib23849d352db33f0747aa9d5a178f00ac726c13b just for debugging purpose as a
part of Bug 6931482.

Bug: 22285167
Change-Id: If3a6c0d2f51dc3774eef14b4f496b5b59ddcf5a6
 2015-08-14 22:51:22 -07:00
Eino-Ville Talvala
1017f9862f Merge "Camera2: Add camera type to getNumberOfCameras." into mnc-dev 2015-08-15 00:46:15 +00:00
Seigo Nonaka
dda53bf065 Merge "Move parseInputMethodsAndSubtypesString to InputMethodUtils." 2015-08-15 00:38:27 +00:00
Ruben Brunk
7ed1aaa369 Add experimental camera session prepare API. 
Bug: 18949148
Change-Id: I35fde35436ae5bebab3c912243e621285307c211
 2015-08-14 16:47:51 -07:00
Eino-Ville Talvala
5717612ba9 Camera2: Add camera type to getNumberOfCameras. 
Do not list strange cameras in old API; ensure new API gets all
cameras.

Bug: 23194168
Change-Id: Ia1fdffac245525674c913fefb1ec06e9094fe8d3
 2015-08-14 14:52:57 -07:00
Adam Lesinski
e789fc02ae am c852a3e3: am eb694bb6: am 546909c9: am 479c482c: am 504600bb: Merge "Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs" into mnc-dev 
* commit 'c852a3e39c1bbb112e2705edc6714b6b687cb55d':
  Fix UserHandle.getAppIdFromSharedAppGid to allow system UIDs
 2015-08-14 21:28:51 +00:00
Dianne Hackborn
ae49872100 Add debugging for issue #23190084: [APPComm][Dev Test] {Unable to share photo... 
...from Camera360 to Hangouts }

In the short URI toString, include a small summary of the ClipData (instead
of just saying it has a clip data).  This makes it a lot easier to understand
what is happening when you look at the log of activity starts.

Also separate out the activity manager dump of URI permission grants from
its dump of providers, so it is easy to just look at that state.

Change-Id: I68093d9f279944e1aa9a29347075f237f4f55ed3
 2015-08-14 14:08:43 -07:00