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

153119 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Baligh Uddin
f425b67838 Import translations. DO NOT MERGE 
Change-Id: I816554657548e769500ab2a392bb48d9bc7d83f8
Auto-generated-cl: translation import
 2014-08-26 10:53:52 -07:00
John Reck
9eea9b8009 am 8404617e: (-s ours) am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev 
* commit '8404617ed22ef52cc2403b154578a6ebc4cf50a4':
  DO NOT MERGE Copy shaders
 2014-08-26 15:21:15 +00:00
John Reck
7dd9776fa8 am d73a1aa3: am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev 
* commit 'd73a1aa3b97d9cd9792dec4a58ab6150b76afb31':
  DO NOT MERGE Copy shaders
 2014-08-26 15:13:50 +00:00
Youngsang Cho
9068981ae1 am e5c88c85: am ff0f038a: am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit 'e5c88c859eaf735cdfb2c1ffedae62db12219fc0':
  Reset a session callback variable when tune is failed
 2014-08-26 15:06:11 +00:00
John Reck
b1d0ef5356 am fec7508b: Merge "DO NOT MERGE Copy shaders" into lmp-dev 
* commit 'fec7508b79566bdbd194a1a33a742f510a02f1a9':
  DO NOT MERGE Copy shaders
 2014-08-26 15:00:49 +00:00
Jorim Jaggi
004c1b62a2 am 0305dde7: am cb6f8ac1: am 5ef697cb: Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 
* commit '0305dde700786e165d3ec37fe5fb32c9c5e04058':
  Fix invalid keyguard state after pressing back in bouncer
 2014-08-26 14:56:08 +00:00
Nicolas Prevot
df6ed41c26 am 3bb61710: am 4df5251c: am a309e38c: Merge "Preventing apps from granting uris to any other user." into lmp-dev 
* commit '3bb6171074f4a570a77727f6a8f0ae22b1626792':
  Preventing apps from granting uris to any other user.
 2014-08-26 14:56:04 +00:00
Youngsang Cho
2ab2c3935c am ff0f038a: am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit 'ff0f038a78233994a2966a174b643f4238985f3d':
  Reset a session callback variable when tune is failed
 2014-08-26 14:55:56 +00:00
John Reck
1698297daf Merge "DO NOT MERGE Copy shaders" into lmp-dev 2014-08-26 14:53:34 +00:00
Jorim Jaggi
e680fcaab2 am cb6f8ac1: am 5ef697cb: Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 
* commit 'cb6f8ac181fd75ff4e78326034a316f56efbc853':
  Fix invalid keyguard state after pressing back in bouncer
 2014-08-26 14:46:25 +00:00
Youngsang Cho
a9f514016b am 5a2d4677: Merge "Reset a session callback variable when tune is failed" into lmp-dev 
* commit '5a2d4677a739947b03a1e4261bec2456d9820330':
  Reset a session callback variable when tune is failed
 2014-08-26 14:46:21 +00:00
Nicolas Prevot
c52c0346d5 am 4df5251c: am a309e38c: Merge "Preventing apps from granting uris to any other user." into lmp-dev 
* commit '4df5251c567788569ec0da5df33def918bcab48f':
  Preventing apps from granting uris to any other user.
 2014-08-26 14:46:19 +00:00
Youngsang Cho
c931cc0850 Merge "Reset a session callback variable when tune is failed" into lmp-dev 2014-08-26 14:40:03 +00:00
Youngsang Cho
7cf6705455 Reset a session callback variable when tune is failed 
Change-Id: I7c0188d916047f8331c74ce7a29b0a5228583979
 2014-08-26 23:12:59 +09:00
Jorim Jaggi
ef7f2b46bd am 5ef697cb: Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 
* commit '5ef697cb1e3400cc2d426326a728482b33fe83ff':
  Fix invalid keyguard state after pressing back in bouncer
 2014-08-26 14:05:18 +00:00
Jorim Jaggi
359404c786 Merge "Fix invalid keyguard state after pressing back in bouncer" into lmp-dev 2014-08-26 13:57:25 +00:00
Nicolas Prevot
c11879a6d5 am a309e38c: Merge "Preventing apps from granting uris to any other user." into lmp-dev 
* commit 'a309e38c34176a2b292e761a45fc14b914b7d9ff':
  Preventing apps from granting uris to any other user.
 2014-08-26 13:51:01 +00:00
Nicolas Prevot
fb9cf2309d Merge "Preventing apps from granting uris to any other user." into lmp-dev 2014-08-26 13:42:27 +00:00
Jorim Jaggi
6f5c97e89b am 2b0e388b: am 21a8b98a: am c474c52c: Merge "Always allow translucent bars for keyguard" into lmp-dev 
* commit '2b0e388b739ce68310d1f1b988ed151aec9600f5':
  Always allow translucent bars for keyguard
 2014-08-26 13:41:22 +00:00
Jorim Jaggi
cb88c7be4a am 21a8b98a: am c474c52c: Merge "Always allow translucent bars for keyguard" into lmp-dev 
* commit '21a8b98a07485e99417f9e36d213dd0812a7e5de':
  Always allow translucent bars for keyguard
 2014-08-26 13:30:58 +00:00
Chulwoo Lee
ff7073e582 am a5b65fff: am 8ddae2f5: am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit 'a5b65fffe5433b2df884ffd767d2696e06445fbb':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:26:07 +00:00
Jorim Jaggi
6bad244c4e Fix invalid keyguard state after pressing back in bouncer 
Bug: 16886960
Change-Id: Ib071b302f9cb2f1fec32285e05a5b8585e53e41e
 2014-08-26 15:24:01 +02:00
Jorim Jaggi
6110361f42 am c474c52c: Merge "Always allow translucent bars for keyguard" into lmp-dev 
* commit 'c474c52c3dba39af9fa54235a469c80a2421f2d0':
  Always allow translucent bars for keyguard
 2014-08-26 13:21:57 +00:00
Chulwoo Lee
66e10574cb am 8ddae2f5: am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit '8ddae2f50d910f26a6ff87d2de636a42d848653f':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:19:43 +00:00
Nicolas Prevot
83bb610fad Preventing apps from granting uris to any other user. 
And adding some javadoc.

BUG: 16996334

Change-Id: I02b03e513050e2704c28da8e17c2c977d858627b
 2014-08-26 14:16:00 +01:00
Jorim Jaggi
64d04347a8 Merge "Always allow translucent bars for keyguard" into lmp-dev 2014-08-26 13:11:11 +00:00
Chulwoo Lee
ce84442166 am 42bbfe62: Recreate overlay view after the TIS crashes 
* commit '42bbfe62400386ec5a3b638a8fc17cc5fe473786':
  Recreate overlay view after the TIS crashes
 2014-08-26 13:09:03 +00:00
Chulwoo Lee
ffad70bb7e Recreate overlay view after the TIS crashes 
The overlay view should be recreated when the session is recreated
after the TIS crash.

Change-Id: I7605aac0feed644ae29d65127f68630c3658343f
 2014-08-26 21:30:26 +09:00
Jorim Jaggi
4ef1babf78 am 4c9ddc23: am fc379ec1: am ccb22d47: Merge "Fix swipe up affordance bugs" into lmp-dev 
* commit '4c9ddc235c42389f17ad2577d4a86e7086968a57':
  Fix swipe up affordance bugs
 2014-08-26 11:39:29 +00:00
Jorim Jaggi
2c5bf235e3 am eb8b8589: am 9ffaf8a3: am cd051d74: Merge "Make date consistent with spec when alarm is set" into lmp-dev 
* commit 'eb8b85894a38b1b16904d37558dc3cad4b546036':
  Make date consistent with spec when alarm is set
 2014-08-26 11:39:22 +00:00
Ruben Brunk
04db09c310 am b5b3beea: am 4d4e16a0: am 34b23108: Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev 
* commit 'b5b3beea27c4c447f5bd6f3c32eb03a532d52f3d':
  camera2: Fix number of DNG NoiseProfile coeffs.
 2014-08-26 11:39:18 +00:00
Ihab Awad
a0fc532bc8 am 37e2bca3: am acf8a2ad: am 4afe15e0: Merge "Support Conferences in Remote Connections" into lmp-dev 
* commit '37e2bca3135f09c3ae7fec18da8282974afb5e6c':
  Support Conferences in Remote Connections
 2014-08-26 11:39:13 +00:00
Jungshik Jang
9d5217b05b am 30750a86: am a707633d: am 25d6a1e6: Fix several bugs in HdmiControlService. 
* commit '30750a8653b5849423500ab142084b0e7e72b8af':
  Fix several bugs in HdmiControlService.
 2014-08-26 11:39:09 +00:00
Jorim Jaggi
aacc974d91 am fc379ec1: am ccb22d47: Merge "Fix swipe up affordance bugs" into lmp-dev 
* commit 'fc379ec14b8673bd35e32e5c9ac8228d592867de':
  Fix swipe up affordance bugs
 2014-08-26 11:29:24 +00:00
Jorim Jaggi
8e91bd251b am 9ffaf8a3: am cd051d74: Merge "Make date consistent with spec when alarm is set" into lmp-dev 
* commit '9ffaf8a3b58add286ed6032d8aec6df8e7e5d161':
  Make date consistent with spec when alarm is set
 2014-08-26 11:29:19 +00:00
Ruben Brunk
36340182c0 am 4d4e16a0: am 34b23108: Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev 
* commit '4d4e16a094d674d5a6f62ef8ec3b5671cc24f002':
  camera2: Fix number of DNG NoiseProfile coeffs.
 2014-08-26 11:29:13 +00:00
Ihab Awad
6fb03cdef5 am acf8a2ad: am 4afe15e0: Merge "Support Conferences in Remote Connections" into lmp-dev 
* commit 'acf8a2ad2dc998009ad656dbba2d5a9e6de6bf59':
  Support Conferences in Remote Connections
 2014-08-26 11:29:07 +00:00
Jungshik Jang
eecb0a1a0a am a707633d: am 25d6a1e6: Fix several bugs in HdmiControlService. 
* commit 'a707633db594b85604a2bddb0cfac333232ce0ad':
  Fix several bugs in HdmiControlService.
 2014-08-26 11:29:02 +00:00
Jorim Jaggi
820c9cb216 am ccb22d47: Merge "Fix swipe up affordance bugs" into lmp-dev 
* commit 'ccb22d47a9854ec1603ebeab93b6d098f197e207':
  Fix swipe up affordance bugs
 2014-08-26 11:18:21 +00:00
Jorim Jaggi
5a5d353953 am cd051d74: Merge "Make date consistent with spec when alarm is set" into lmp-dev 
* commit 'cd051d744b13f01e4dfe5b4c9e57d76b1a65fffa':
  Make date consistent with spec when alarm is set
 2014-08-26 11:18:17 +00:00
Ruben Brunk
aefb1e1541 am 34b23108: Merge "camera2: Fix number of DNG NoiseProfile coeffs." into lmp-dev 
* commit '34b231087ad742c8906a16f28920e8f26e0553c2':
  camera2: Fix number of DNG NoiseProfile coeffs.
 2014-08-26 11:18:13 +00:00
Ihab Awad
9ef937d486 am 4afe15e0: Merge "Support Conferences in Remote Connections" into lmp-dev 
* commit '4afe15e0bd1c395374397f84e24e95c77f8c339c':
  Support Conferences in Remote Connections
 2014-08-26 11:18:08 +00:00
Jungshik Jang
e8e6528443 am 25d6a1e6: Fix several bugs in HdmiControlService. 
* commit '25d6a1e60fc31a52eb6e5069378374ba24aa6596':
  Fix several bugs in HdmiControlService.
 2014-08-26 11:18:03 +00:00
Jorim Jaggi
5369d7a931 Merge "Fix swipe up affordance bugs" into lmp-dev 2014-08-26 10:38:41 +00:00
Jorim Jaggi
31e0ae0cad Merge "Make date consistent with spec when alarm is set" into lmp-dev 2014-08-26 10:35:41 +00:00
Adrian Roos
7fa97495c1 am d0d44295: am 6d351c25: am 7348f744: Update soundscape for L 
* commit 'd0d4429550f7c292b86a2f287dd3e43a55c30ddd':
  Update soundscape for L
 2014-08-26 10:10:18 +00:00
Dan Sandler
532d710d27 am e725ff74: am d25fdb22: am 9255b9f4: Allow listeners to fetch current notifications by key. 
* commit 'e725ff74f3bfdddfda85a6f7fbf2345b8bdfed5e':
  Allow listeners to fetch current notifications by key.
 2014-08-26 10:10:11 +00:00
Chulwoo Lee
f06bc89505 am 35a04acd: am 8e602688: am 748bbc04: Merge "Fix checking trackId" into lmp-dev 
* commit '35a04acd2bc580469540af09a8824123cd51e528':
  Fix checking trackId
 2014-08-26 10:10:06 +00:00
Adam Powell
06c21fdea2 am ae87f787: am f0b3161f: am 44c81774: Merge "Add state save/restore for Toolbar" into lmp-dev 
* commit 'ae87f7872a61fe6d14f583ac0caaa9ee7fadbabb':
  Add state save/restore for Toolbar
 2014-08-26 10:10:01 +00:00
Robert Greenwalt
9b58a7f020 am 8475d034: am 79338c75: am e252f526: Merge "Update VPN whitelist/blacklist api docs." into lmp-dev 
* commit '8475d034c5deda0b3d1a22bbd0074e4caaeb34ff':
  Update VPN whitelist/blacklist api docs.
 2014-08-26 10:09:57 +00:00