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

221219 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
8221b05981 Import translations. DO NOT MERGE 
Change-Id: I8adfd4484cde6c32adab9b939cb7698370e2ec6f
Auto-generated-cl: translation import
 2015-11-04 06:56:32 -08:00
Diego Perez
96eb6d3e57 Merge "Remove auto-boxing during the inflate" into mnc-ub-dev am: 1c442aca0a 
am: 7cdbfaf459

* commit '7cdbfaf459ede7ede430188ed4b1a990ba762144':
  Remove auto-boxing during the inflate
 2015-11-04 14:44:20 +00:00
Diego Perez
fdf89c162f Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev am: 7dda46e740 
am: 724af9ce6f

* commit '724af9ce6fceb9ddf2ef4536d0da41a520928d5e':
  Update StaticLayout_Delegate to use new nLoadHyphenator
 2015-11-04 14:42:58 +00:00
Diego Perez
7cdbfaf459 Merge "Remove auto-boxing during the inflate" into mnc-ub-dev 
am: 1c442aca0a

* commit '1c442aca0a1b054e3aa0a40ba89c08b39099be2f':
  Remove auto-boxing during the inflate
 2015-11-04 14:35:39 +00:00
Geoff Mendal
4f9f54fe37 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 931082b728 -s ours am: b67481b336 -s ours 
am: 9a4b6b9094  -s ours

* commit '9a4b6b909487b61120fb085864533b70a9dabeb8':
  Import translations. DO NOT MERGE
 2015-11-04 14:35:29 +00:00
Diego Perez
724af9ce6f Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev 
am: 7dda46e740

* commit '7dda46e740250d753bb9d01e129e91695ab8cfe2':
  Update StaticLayout_Delegate to use new nLoadHyphenator
 2015-11-04 14:34:19 +00:00
Geoff Mendal
34bc9b0670 Import translations. DO NOT MERGE am: f44adbba69 -s ours am: 5bf5deb84c -s ours 
am: f587cfec79  -s ours

* commit 'f587cfec79cd6eaab2b83b902ab5663b6adbfb86':
  Import translations. DO NOT MERGE
 2015-11-04 14:34:12 +00:00
Geoff Mendal
9a4b6b9094 Merge "Import translations. DO NOT MERGE" into cw-e-dev am: 931082b728 -s ours 
am: b67481b336  -s ours

* commit 'b67481b336d211c6d96e2110e865b55f615fd9df':
  Import translations. DO NOT MERGE
 2015-11-04 14:27:19 +00:00
Diego Perez
1c442aca0a Merge "Remove auto-boxing during the inflate" into mnc-ub-dev 2015-11-04 14:26:15 +00:00
Diego Perez
7dda46e740 Merge "Update StaticLayout_Delegate to use new nLoadHyphenator" into mnc-ub-dev 2015-11-04 14:25:58 +00:00
Geoff Mendal
f587cfec79 Import translations. DO NOT MERGE am: f44adbba69 -s ours 
am: 5bf5deb84c  -s ours

* commit '5bf5deb84cdc61aa27ea12695ee20cc308e45184':
  Import translations. DO NOT MERGE
 2015-11-04 14:25:55 +00:00
Geoff Mendal
d54ded8d26 Merge "Import translations. DO NOT MERGE" 2015-11-04 14:14:25 +00:00
Geoff Mendal
b67481b336 Merge "Import translations. DO NOT MERGE" into cw-e-dev 
am: 931082b728  -s ours

* commit '931082b728a42e0b22b163721d7d48faf23d45a4':
  Import translations. DO NOT MERGE
 2015-11-04 14:09:51 +00:00
Geoff Mendal
5bf5deb84c Import translations. DO NOT MERGE 
am: f44adbba69  -s ours

* commit 'f44adbba69c22e4c9cd681bbb3cab70097eae118':
  Import translations. DO NOT MERGE
 2015-11-04 14:08:19 +00:00
Geoff Mendal
a6b7132efc Merge "Import translations. DO NOT MERGE" 2015-11-04 14:03:56 +00:00
Geoff Mendal
f39a079179 Import translations. DO NOT MERGE 
Change-Id: Id927a7b437f398a9e468e1fa105bce3c7bb4b356
Auto-generated-cl: translation import
 2015-11-04 05:57:12 -08:00
Julia Reynolds
43f1befac2 Delete unused code. 
Change-Id: I49660236b4d40010885b2ee3f8d03b5b258a035e
 2015-11-04 08:42:13 -05:00
Geoff Mendal
23f2301b01 Import translations. DO NOT MERGE 
Change-Id: I8b90890aff385da901c6a66ac485ddb2560f1cbc
Auto-generated-cl: translation import
 2015-11-04 05:40:02 -08:00
Geoff Mendal
931082b728 Merge "Import translations. DO NOT MERGE" into cw-e-dev 2015-11-04 13:38:21 +00:00
Geoff Mendal
fdefd0496e Import translations. DO NOT MERGE 
Change-Id: I06b7fdd459fbb74d91376bc93ae8d035145d2234
Auto-generated-cl: translation import
 2015-11-04 05:23:43 -08:00
Geoff Mendal
3b2a1141cb Import translations. DO NOT MERGE 
Change-Id: I7c47fb535cfa65f435efe21fd59118039b6359f5
Auto-generated-cl: translation import
 2015-11-04 07:20:46 -06:00
Geoff Mendal
f44adbba69 Import translations. DO NOT MERGE 
Change-Id: I52024255e1324f3757497603d692def1fec6e75f
Auto-generated-cl: translation import
 2015-11-04 05:09:10 -08:00
Clara Bayarri
965da39942 Create a File Based Encryption check API 
Change-Id: Ibf41f98818ea801b9f690200c340be80c3b9bf31
 2015-11-04 12:27:39 +00:00
Diego Perez
631c2ffd6f Update StaticLayout_Delegate to use new nLoadHyphenator 
Small fix to update call parameters

Change-Id: I4322aa212493ec2970ae17ec1918b9b7e2f8e93a
 2015-11-04 11:35:34 +00:00
Riley Andrews
0394a0c399 Convert ashmem bitmap thresholds to constants. 
Bug 25256717

Change-Id: I23e2795ef8798d83bf60dcbd6ff2e7093fcaa9b0
Signed-off-by: Riley Andrews <riandrews@google.com>
 2015-11-03 23:52:17 -08:00
Tomasz Mikolajewski
b344b894ca Add support for opening files in specified MIME type to DocumentsProvider. 
Change-Id: I5453d6d699069ec59521917c024f173d2ae67565
Bug: 18113606
 2015-11-04 16:24:00 +09:00
Daichi Hirono
3034538ca8 Merge "Extends MtpDatabase so that it can handle child documents." 2015-11-04 05:45:24 +00:00
Daichi Hirono
a8a3722e7a Extends MtpDatabase so that it can handle child documents. 
The CL extracts common routines for root documents and child documents,
adds new methods for child documents, and let the common routines from
the new methods.

BUG=25162822

Change-Id: Ie6f0092e584ae12c89d43593701debeb76f6f3cb
 2015-11-04 12:58:20 +09:00
Chong Zhang
000885e7c6 Merge "Save window when an app died while it's visible" 2015-11-04 02:35:33 +00:00
Chong Zhang
112eb8c1f7 Save window when an app died while it's visible 
- If an app died visible, keep the dead window and leave it on screen.

- Apply 50% dim over the dead window to indicate it's no longer active.

- Monitor touch inputs on the dead window and restart the app on tap.

bug: 24913379
Change-Id: I911da4e6135f2bffaf3b1bbe6f911ff689a278ff
 2015-11-03 17:49:25 -08:00
Adrian Roos
c737c93741 Merge "Ok Droid, enable inline reply" 2015-11-04 01:45:26 +00:00
Adrian Roos
9531c9b499 Ok Droid, enable inline reply 
Bug: 22452379
Change-Id: I74a875495abe010a2f00d1ac598ad95eaa87479d
 2015-11-03 17:44:29 -08:00
Felipe Leme
b1444578d4 Clarified usage of onDetach() and onCreate() when setRetainInstance() is set to true. 
BUG: 25455734

Change-Id: I667629b76dcc39b0d2415cd368629720a77ed337
 2015-11-03 17:42:45 -08:00
Mitchell Wills
c856be1653 Merge "Don't cache ScanResults in WifiTracker if there is no SSID" 2015-11-04 00:58:16 +00:00
Rob Carr
4c522bdee2 Merge "Deliver exceptions to sources of PALs." 2015-11-04 00:51:26 +00:00
Daniel Koulomzin
f157b36640 ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours am: 6e0a83bcd9 am: d90c2da23c 
am: 6393887063  -s ours

* commit '6393887063aabecd1eaefc95db09087bc142658d':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-04 00:36:11 +00:00
Adam Lesinski
5bcb8bb31a Use wakeup reason when FingerPrint sensor wakes up the device 
PowerManager can log into BatteryStats the reason for the device being
woken up. This change has the Fingerprint controller report the reason
instead of a default non-descriptive 'wakeUp' reason.

Change-Id: I12d80682dad888add139cca586d4b948e9d546e5
 2015-11-03 16:31:25 -08:00
Adam Lesinski
08322c2152 Merge "AAPT2: Add round qualifer support" 2015-11-04 00:17:30 +00:00
Adam Lesinski
aaeabee97b Merge "AAPT2: Verify positional Java String format arguments in strings" 2015-11-04 00:17:08 +00:00
Adam Lesinski
6425497f41 AAPT2: Add round qualifer support 
Change-Id: Id5a1331198e01be7ca4d87b8833900e51f82ece5
 2015-11-03 16:16:17 -08:00
Daniel Koulomzin
6393887063 ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours am: 6e0a83bcd9 
am: d90c2da23c

* commit 'd90c2da23c8ad22819d400d4803ed63c7f856d63':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-04 00:11:13 +00:00
Daniel Koulomzin
d90c2da23c ActivityView gets its own thread pool. DO NOT MERGE am: 7e19e286cc -s ours 
am: 6e0a83bcd9

* commit '6e0a83bcd97574451e83d58ac646af9daf3216be':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-04 00:02:32 +00:00
Daniel Koulomzin
6e0a83bcd9 ActivityView gets its own thread pool. DO NOT MERGE 
am: 7e19e286cc  -s ours

* commit '7e19e286cc990daaafe934ed82ddfa00762907d6':
  ActivityView gets its own thread pool. DO NOT MERGE
 2015-11-03 23:51:39 +00:00
Bill Yi
80f9d74054 Merge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD am: 2e8c3c11b7 
am: 7624931a37

* commit '7624931a3788a50f82512072f36e77bf0af5e28f':
 2015-11-03 23:46:38 +00:00
Wale Ogunwale
b7243ae41d Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854 am: d89b76a58d 
am: 8401a8d0c5

* commit '8401a8d0c5bad075a7d46a68a30cd9af4c0d4413':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 23:39:11 +00:00
Glenn Kasten
99b95fdc55 Merge "BluetoothMidiDevice: change write type to support JamStik" am: 6079b990f1 am: 613c63c742 
am: a10d826b1b

* commit 'a10d826b1bfcd3b919193e85476df0336d03c622':
  BluetoothMidiDevice: change write type to support JamStik
 2015-11-03 23:37:48 +00:00
Glenn Kasten
47bb36cf25 Merge "BLE-MIDI: change binding for BluetoothMidiService" am: 5831944a6e am: bd32753700 
am: ff4e4425b7

* commit 'ff4e4425b7e032feba1afc81ddeec7ad17e8a7ea':
  BLE-MIDI: change binding for BluetoothMidiService
 2015-11-03 23:36:27 +00:00
Ian Pedowitz
18896e0893 Merge "Limit persistent ashmem backed fds to a minimum of 128kB." into mnc-dr-dev am: 966d6040c6 am: 95fc53b029 am: d6f3e38738 
am: 87455c7397

* commit '87455c7397605fba4bf3ad04af8df3c599a7a6ba':
  Limit persistent ashmem backed fds to a minimum of 128kB.
 2015-11-03 23:34:54 +00:00
Bill Yi
7624931a37 Merge commit \'bce5116b8d10c91436445cd0a0830bb51702bfd4\' into HEAD 
am: 2e8c3c11b7

* commit '2e8c3c11b7f482f01b1ff76a6217eaf129253809':
 2015-11-03 23:33:07 +00:00
Wale Ogunwale
8401a8d0c5 Merge "[ActivityManager] Fix NullPointerException in startNextMatchingActivity." am: 7810aed854 
am: d89b76a58d

* commit 'd89b76a58dcffa7dbc5974d14c7914f44233bef3':
  [ActivityManager] Fix NullPointerException in startNextMatchingActivity.
 2015-11-03 23:29:47 +00:00