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

208498 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Steve McKay
3c8afe2011 Merge "Apply hirono@'s logic for disabling delete action" 2015-07-23 01:04:54 +00:00
Ying Wang
50fb02da53 Add phony source target in the generated dependency file of aidl. 
This fixes make error when the source .aidl file is moved around but
its path relative to LOCAL_PATH doesn't change.

Bug: 22666539
Change-Id: Idf2492145e4927779d184932a09d61e4fe8ded0f
 2015-07-22 17:49:56 -07:00
Zhentao Sun
c6cd1f9a83 Added service that listens for gestures. 
Added the GestureLauncherService that listens for camera launch gesture
and starts the camera app.
OEMs need to specify the sensor type of the camera launch gesture in
their overlays.
In the future, we can add more gesture support in this service.

Change-Id: I0769e7ca71e08bd9159aacf29bdcefd316efd2f0
 2015-07-22 17:42:41 -07:00
Steve McKay
709b61de16 Pick column count based on available space. 
Set background color of RecyclerView.

BUG: 22640007
BUG: 22672201
Change-Id: Ic9c65a2a25164698bc08b4620bfa0b067d620f1b
 2015-07-22 17:29:10 -07:00
Adrian Roos
58adc7ad48 Merge "Send BATTERY_CHANGED if maxChargingCurrent changes" into mnc-dr-dev 2015-07-22 23:22:42 +00:00
Filip Gruszczynski
31d300f914 Fix NPE when requesting outsets for detached view. 
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.

This is a cherry pick that somehow didn't get through to master.

Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
 2015-07-22 15:46:06 -07:00
Fred Chung
9478ddfa11 am db71828c: am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit 'db71828cb7bff983bd758e986b65731cb0a5b2f6':
  Doc change: add note about not exiting on onPause().
 2015-07-22 20:41:41 +00:00
Dianne Hackborn
8635041115 am b7394671: Merge "Work on issue #22303510: Additional permissions aren\'t properly..." into mnc-dev 
* commit 'b73946715cb9e3ca7a2702407e34f885e92a5d9a':
  Work on issue #22303510: Additional permissions aren't properly...
 2015-07-22 20:24:30 +00:00
Alex Klyubin
568e67a322 am ada70be8: Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 
* commit 'ada70be897fb7541129f1ab1f6faa94a80fca986':
  Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys.
 2015-07-22 20:24:21 +00:00
Wale Ogunwale
aecf9ba839 am ff21279e: Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 
* commit 'ff21279e2cbe0bdd9c41350b7a204cabf9370377':
  Fixed issue with not finding existing activity for background user
 2015-07-22 20:24:10 +00:00
Kenny Guy
2adcb40d2c am 2ba3fec6: Merge "Support waiting for adb shell am stop-user to complete." into mnc-dev 
* commit '2ba3fec6e0222754d93ed7a491354164d113ad6e':
  Support waiting for adb shell am stop-user to complete.
 2015-07-22 20:24:05 +00:00
Jason Monk
1df7e13519 am 41cfd3f8: Merge "Fix blank tiles on QS rotate" into mnc-dev 
* commit '41cfd3f8c0df036345807f87b828b4b68bdaffdf':
  Fix blank tiles on QS rotate
 2015-07-22 20:24:00 +00:00
Jason Monk
67091f46fa am a910a04b: Merge "Fix crash in NetworkControllerImpl" into mnc-dev 
* commit 'a910a04b8a079a01d684266875eb18c318012de4':
  Fix crash in NetworkControllerImpl
 2015-07-22 20:23:55 +00:00
Jim Miller
4a31ee0a74 am 091f0e5c: Make FingerprintService more tolerant of fingerprintd crashes. 
* commit '091f0e5c6c7f9e72a6e661c4849a2e232823075b':
  Make FingerprintService more tolerant of fingerprintd crashes.
 2015-07-22 20:23:41 +00:00
Svetoslav Ganov
010b53c029 am bdb7d936: Merge "Update permission icons to final versions - framework" into mnc-dev 
* commit 'bdb7d936512a39b6c06411d11a26824b82e5727f':
  Update permission icons to final versions - framework
 2015-07-22 20:23:28 +00:00
George Mount
27fbd360a8 am 7c482463: Merge "Null checks to prevent NPEs in Fragments transactions." into mnc-dev 
* commit '7c482463cbea39cdbf2c3c8f481d82711cf0475b':
  Null checks to prevent NPEs in Fragments transactions.
 2015-07-22 20:23:02 +00:00
Jorim Jaggi
fcf9acb95a am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev 
* commit '20df62345910ad390a3bb321990987757db0831d':
  Add callback to voice interaction session for lockscreen shown
 2015-07-22 20:22:56 +00:00
Steve McKay
503648ddc3 Apply hirono@'s logic for disabling delete action 
...when selection contains non-deletable items.

BUG=22441292
Change-Id: I716e5c1f685c9f3d12b01b193753775094cde481
 2015-07-22 12:46:15 -07:00
Jorim Jaggi
ac73f1efea Partially fix that beginning of animation is skipped 
When waiting for all the windows that belong to an activity, we
skipped the main window, in case it didn't had a surface yet. This
was a problem because with SurfaceViews: They set it's visibility
extremely early in the app visibility change cycle. Then, they don't
block with the callback to SurfaceHolder.Callback2.surfaceRedrawNeeded,
so window manager thinks it has drawn the first frame already. We don't
even have a surface for the main window yet, but we start the app
transition already because we think the only interesting window for this
app token is the SurfaceView, which has supposedly already drawn.

Bug: 22207948
Change-Id: I2ddb274000fa08866e193f4fd8db3788fc55e0f1
 2015-07-22 19:21:44 +00:00
Dianne Hackborn
6f64e737f0 Merge "Fix issue #22612630: Ensure SMS/Call delivery during Doze" into mnc-dev 2015-07-22 19:04:00 +00:00
Adrian Roos
b30f841cb4 resolved conflicts for merge of c1244a29 to mnc-dr-dev 
Change-Id: I8b3e3a21e36ac5085bf1dffa90e49dabd17dd139
 2015-07-22 12:00:56 -07:00
Steve McKay
3b409d01b9 Push equals impl into SparseBooleanArray. 
Also, implement hashcode, because it is naughty to not.

Change-Id: I2042dac6840cf07027871783a7b6763578fa805d
 2015-07-22 11:53:14 -07:00
Steve McKay
0ab6b0e824 Merge "Update DirectoryFragment to use RecyclerView." 2015-07-22 18:20:33 +00:00
Fred Chung
db71828cb7 am 2c3b9fb8: am 3ccbf3ba: Merge "Doc change: add note about not exiting on onPause()." into mnc-preview-docs 
* commit '2c3b9fb86b9fb26b01fe5af2067f6513bf06acf3':
  Doc change: add note about not exiting on onPause().
 2015-07-22 17:46:21 +00:00
Geoff Mendal
88af84ec52 am 176df282: (-s ours) am 1e06d4c6: (-s ours) am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '176df28256f2657f933235d99cf3247081b02f42':
  Import translations. DO NOT MERGE
 2015-07-22 16:50:50 +00:00
Geoff Mendal
176df28256 am 1e06d4c6: (-s ours) am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '1e06d4c64b6549a73df9d308ae82d7080fd51f37':
  Import translations. DO NOT MERGE
 2015-07-22 16:38:55 +00:00
Geoff Mendal
1e06d4c64b am 5c080bd2: (-s ours) am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5c080bd2fb2d99724e1c0cec11fc1fe9d1cad597':
  Import translations. DO NOT MERGE
 2015-07-22 16:25:34 +00:00
Dianne Hackborn
b73946715c Merge "Work on issue #22303510: Additional permissions aren't properly..." into mnc-dev 2015-07-22 16:14:59 +00:00
Geoff Mendal
5c080bd2fb am c41e3191: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'c41e3191654d1b1e9df641da6aa7a8bf4f64b975':
  Import translations. DO NOT MERGE
 2015-07-22 16:09:47 +00:00
Geoff Mendal
c41e319165 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 15:56:29 +00:00
Geoff Mendal
fb91daa1c5 Import translations. DO NOT MERGE 
Change-Id: If03e28dba328619399e4f81a01283afbebd7d50d
Auto-generated-cl: translation import
 2015-07-22 10:42:52 -05:00
Geoff Mendal
fd1aee70a3 Merge "Import translations. DO NOT MERGE" 2015-07-22 15:33:01 +00:00
Geoff Mendal
bc59fe20e6 Import translations. DO NOT MERGE 
Change-Id: I4b1315b61e760a3c34cdc91984f01f0199ff63a4
Auto-generated-cl: translation import
 2015-07-22 10:31:21 -05:00
Alex Klyubin
ada70be897 Merge "Add KM_MIN_MAC_LENGTH tag to HMAC and AES-GCM keys." into mnc-dev 2015-07-22 15:24:27 +00:00
Geoff Mendal
553d3d6f23 am 6722aed8: (-s ours) am 1ac9628c: (-s ours) am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '6722aed82941a9af573d67550dec0db50dffa1d3':
  Import translations. DO NOT MERGE
 2015-07-22 14:45:15 +00:00
Geoff Mendal
5413706963 am 8a17c863: (-s ours) am 5cae0cde: (-s ours) am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '8a17c86343e215056090cdd7caff977bcd205dc3':
  Import translations. DO NOT MERGE
 2015-07-22 14:45:08 +00:00
Geoff Mendal
c14b17822d am 1ddf059e: (-s ours) am 069bf3c2: (-s ours) am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '1ddf059e6d5a601e12d75e1cf2913ef24cac2bb8':
  Import translations. DO NOT MERGE
 2015-07-22 14:45:01 +00:00
Geoff Mendal
6722aed829 am 1ac9628c: (-s ours) am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '1ac9628c97a04dacfaaf4ebe5dbcfd6599b0405f':
  Import translations. DO NOT MERGE
 2015-07-22 14:31:50 +00:00
Geoff Mendal
8a17c86343 am 5cae0cde: (-s ours) am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '5cae0cded77f412d738bfdc2e58036c8e9422135':
  Import translations. DO NOT MERGE
 2015-07-22 14:31:45 +00:00
Geoff Mendal
1ddf059e6d am 069bf3c2: (-s ours) am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '069bf3c2a41a0c97b31602309965f28293b59200':
  Import translations. DO NOT MERGE
 2015-07-22 14:31:40 +00:00
Wale Ogunwale
ff21279e2c Merge "Fixed issue with not finding existing activity for background user" into mnc-dev 2015-07-22 14:21:31 +00:00
Geoff Mendal
1ac9628c97 am 8d5ed661: (-s ours) am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '8d5ed661f060e3d915f3f1f593f2f87ebd1285cc':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:11 +00:00
Geoff Mendal
5cae0cded7 am a88427c3: (-s ours) am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'a88427c34729368766593fc2a8864b5383e907cc':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:05 +00:00
Geoff Mendal
069bf3c2a4 am 234bd0f4: (-s ours) am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit '234bd0f46c9d75240906fa021b8c4975a34c9c10':
  Import translations. DO NOT MERGE
 2015-07-22 14:19:00 +00:00
Geoff Mendal
8d5ed661f0 am 920e8be6: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit '920e8be69db7cd24a9c5566b95686a6b714447e9':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:58 +00:00
Geoff Mendal
a88427c347 am e573ee63: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 
* commit 'e573ee63b7a89b121ad36af883c2731d118f4794':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:54 +00:00
Geoff Mendal
234bd0f46c am b568f3fd: (-s ours) Import translations. DO NOT MERGE 
* commit 'b568f3fdc935c9a185b7cf8f462567a6be97b900':
  Import translations. DO NOT MERGE
 2015-07-22 14:03:50 +00:00
Geoff Mendal
920e8be69d Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:58:09 +00:00
Geoff Mendal
e292d5b86e Import translations. DO NOT MERGE 
Change-Id: If222f66dff503d3b3f0349d76fd082a6780414d7
Auto-generated-cl: translation import
 2015-07-22 06:53:49 -07:00
Geoff Mendal
e573ee63b7 Merge "Import translations. DO NOT MERGE" into mnc-dr-dev 2015-07-22 13:51:43 +00:00