Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
160,206 Commits 3 Branches 0 Tags
11fe2dfd3267c86c598dd443aaf471e8d490b4bb
Commit Graph

160206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Geoff Mendal
11fe2dfd32 Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-01 15:10:36 +00:00
Geoff Mendal
7a2b09165b Import translations. DO NOT MERGE 
Change-Id: Ic5278b3f5da079c97f9aafd947fef96ae3248778
Auto-generated-cl: translation import
 2014-12-01 07:09:47 -08:00
John Spurlock
64e034e351 am e3f8b314: Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 
* commit 'e3f8b31466f45eb4d5c9971049b71215a9f2c8a4':
  Zen: Improve zen mode panel condition selection.
 2014-12-01 15:04:02 +00:00
John Spurlock
c1e4d1554f am 1a3af711: Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 
* commit '1a3af711ab6f811a6bc4e9211cb255721fb1847d':
  Doze: Break out proxcheck stats by pulse reason.
 2014-12-01 15:03:57 +00:00
John Spurlock
fdc07dce37 am 26a695d9: Merge "Volume: Update remote volume icons." into lmp-mr1-dev 
* commit '26a695d974f7ee3b32b8d65a44a42f804af8f01c':
  Volume: Update remote volume icons.
 2014-12-01 15:03:52 +00:00
John Spurlock
e3f8b31466 Merge "Zen: Improve zen mode panel condition selection." into lmp-mr1-dev 2014-12-01 14:59:05 +00:00
John Spurlock
1a3af711ab Merge "Doze: Break out proxcheck stats by pulse reason." into lmp-mr1-dev 2014-12-01 14:58:38 +00:00
John Spurlock
26a695d974 Merge "Volume: Update remote volume icons." into lmp-mr1-dev 2014-12-01 14:58:18 +00:00
Geoff Mendal
68137588d1 am 9cde3e1d: (-s ours) Import translations. DO NOT MERGE 
* commit '9cde3e1d82f65eaf73ccf92f14b101e600ef8e18':
  Import translations. DO NOT MERGE
 2014-12-01 14:52:53 +00:00
Geoff Mendal
a990faec87 Import translations. DO NOT MERGE 
Change-Id: I372891f089f72f814e92a63ac7f78a25cee9ebbf
Auto-generated-cl: translation import
 2014-12-01 06:40:31 -08:00
Geoff Mendal
9cde3e1d82 Import translations. DO NOT MERGE 
Change-Id: I2cb5a0bf876f8553710f0ed3882f7ef56da24557
Auto-generated-cl: translation import
 2014-12-01 06:36:32 -08:00
Wally Yau
5b4e2e0274 am da392904: Set stream volume to max when userMasterVolume is set to true. 
* commit 'da39290460b30e5080769f039d6dff352b3c7808':
  Set stream volume to max when userMasterVolume is set to true.
 2014-12-01 13:13:54 +00:00
John Spurlock
3e07701636 Zen: Improve zen mode panel condition selection. 
- Decouple condition requests from expansion, now
   pre-request when zen panel unhidden.
 - Animate zen mode panel expansion.
 - Improve default selection logic, ensure something
   is selected as soon as we are in the expanded state.
 - Tweak visual spacing.
 - Map null condition to Indef properly when we start
   out in zen.
 - Avoid unnecessary condition teardown when the conditions
   are updated but unchanged from current.
 - Cap number of optional conditions to display, default=3.

Bug: 18335618

Change-Id: I007b7c3b2e75e2b42805af240684aa8581e9951a
 2014-11-30 10:41:33 -05:00
John Spurlock
eab28e6602 Doze: Break out proxcheck stats by pulse reason. 
Enumerate all possible reasons for doze pulses, and subdivide
the proxcheck stats (near/far) by reason.  Include reason in
doze log when starting a pulse.

Bug: 18373928
Change-Id: I4ebc2df082f51d47e3b2f0cb3999faeb582ef8dc
 2014-11-29 11:45:31 -05:00
Wally Yau
da39290460 Set stream volume to max when userMasterVolume is set to true. 
When useMasterVolume is set, we don't want to apply the volume
attenuation twice, once at the stream mixer and once at the master
volume control. It should only be applied once at the master volume
control.

Change-Id: Id5b1cf97571733515b5680c638f11cde8824cfc0
Fixed: b/18460548
 2014-11-28 12:40:30 -08:00
Elliott Hughes
7ff0b46995 am 07b4a291: am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '07b4a291319ec48a272451789ab0fbbf8d55a050':
  Mention ProGuard in the JNI documentation.
 2014-11-27 19:02:59 +00:00
Elliott Hughes
07b4a29131 am 3e2848d2: am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '3e2848d249cafbf1cc79b600eab9bce055adcf8e':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:57:00 +00:00
Elliott Hughes
3e2848d249 am 8fc88562: am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '8fc8856268218fbd286eeb0b2f34eec23cb74f8c':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:49:58 +00:00
Elliott Hughes
8fc8856268 am 85e21bd5: Mention ProGuard in the JNI documentation. 
* commit '85e21bd534d38f8de12e8229865a863f32c30e7a':
  Mention ProGuard in the JNI documentation.
 2014-11-27 18:41:15 +00:00
Elliott Hughes
85e21bd534 Mention ProGuard in the JNI documentation. 
(cherry picked from commit 8e1bbfe0f1)

Change-Id: I22731dfb94dcc1271b987ed52914e665704dd378
 2014-11-27 10:28:11 -08:00
Adrian Roos
17e0a7e7ac am 09eeab7c: Merge "Fix projection permission dialog layering" into lmp-mr1-dev 
* commit '09eeab7cbffae64add657f1a1e7ab6c7f20b6d9b':
  Fix projection permission dialog layering
 2014-11-27 13:06:00 +00:00
Adrian Roos
09eeab7cbf Merge "Fix projection permission dialog layering" into lmp-mr1-dev 2014-11-27 13:01:01 +00:00
Geoff Mendal
de3f61f466 am 7028dec6: (-s ours) am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit '7028dec6ca10cdc63966dad01e59cdbabd6a0a1d':
  Import translations. DO NOT MERGE
 2014-11-27 10:18:58 +00:00
Scott Main
cd79f9f0f4 am 4a45a441: am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '4a45a44152c965363a4689befdcbd57177e48831':
  docs:advmgr-updates
 2014-11-27 10:18:52 +00:00
smain@google.com
b8de593ec2 am 576e248f: am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '576e248f3ca32576ed3c37dadf6a4f90dc6b4f59':
  define height for context images to avoid content jumps on load
 2014-11-27 10:18:47 +00:00
Narayan Kamath
ff45e7df8a am 1d184ace: resolved conflicts for merge of 7377998d to lmp-mr1-dev 
* commit '1d184acefa7105592134edebf7de4d77843d5791':
  Be increasingly aggressive about fstrim if it isn't being run
 2014-11-27 10:09:46 +00:00
Geoff Mendal
7028dec6ca am 022f4277: (-s ours) Import translations. DO NOT MERGE 
* commit '022f4277c468176d43d4ed1cc12898e33ed1a502':
  Import translations. DO NOT MERGE
 2014-11-27 10:09:40 +00:00
Scott Main
4a45a44152 am 2995bd80: am 5a27b4b8: am fc793074: Merge "docs:advmgr-updates" into lmp-docs 
* commit '2995bd8033ecbf4e1a5b3392ec27008d2d184b8a':
  docs:advmgr-updates
 2014-11-27 10:08:51 +00:00
smain@google.com
576e248f3c am 277fb8fd: am d3c17270: am 3a4b011c: define height for context images to avoid content jumps on load 
* commit '277fb8fdaeb546119bc31269425edc72b75e87dd':
  define height for context images to avoid content jumps on load
 2014-11-27 10:08:45 +00:00
Narayan Kamath
1d184acefa resolved conflicts for merge of 7377998d to lmp-mr1-dev 
Change-Id: I21870e241de7d992e97d7b91e0058f85b5a25fbe
 2014-11-27 09:57:35 +00:00
Amit Mahajan
b957d11a53 am 4ebd1e42: Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 
* commit '4ebd1e42a78dcb0ee219548b89f3733320bbc029':
  Change to use DATA_ROAMING setting correctly with subId.
 2014-11-27 03:11:57 +00:00
Amit Mahajan
4ebd1e42a7 Merge "Change to use DATA_ROAMING setting correctly with subId." into lmp-mr1-dev 2014-11-27 03:05:48 +00:00
Eino-Ville Talvala
ec26692d1f am 9b35b801: Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 
* commit '9b35b801fb90e31c1dff5535715e505f3a1e26fb':
  CameraManager: Separate service listener into a singleton
 2014-11-27 00:27:36 +00:00
Eino-Ville Talvala
9b35b801fb Merge "CameraManager: Separate service listener into a singleton" into lmp-mr1-dev 2014-11-27 00:23:42 +00:00
Eric Laurent
981951e4f9 am 563e61f5: Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 
* commit '563e61f5d06aca653894cecc2977bac70b08227c':
  AudioRecord JNI: pass attributes to native AudioRecord.
 2014-11-26 23:56:43 +00:00
Eric Laurent
563e61f5d0 Merge "AudioRecord JNI: pass attributes to native AudioRecord." into lmp-mr1-dev 2014-11-26 23:52:08 +00:00
Jeff Davidson
c452bac6fc am 3caf0f8e: Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 
* commit '3caf0f8e440fcc9947b8b153464ccdbc62640c97':
  Add string for "Connected via Wi-Fi assistant".
 2014-11-26 23:46:44 +00:00
Jeff Davidson
3caf0f8e44 Merge "Add string for "Connected via Wi-Fi assistant"." into lmp-mr1-dev 2014-11-26 23:42:54 +00:00
Jeff Davidson
6903a1a40f Add string for "Connected via Wi-Fi assistant". 
Bug: 18525241
Change-Id: I9900d9216ad1b2d5c4bee584b8f5185b4e552b7d
 2014-11-26 15:38:45 -08:00
Eino-Ville Talvala
4c9c7a5883 CameraManager: Separate service listener into a singleton 
Currently, every CameraManager instance adds itself as a camera service
listener, which has the unfortunate side effect of keeping them all alive
indefinitely.

This is doubly unfortunate since every CameraManager keeps the Context it
was constructed with, and therefore may be leaking whole Activities along
with the CameraManager itself.

Break out a global per-process CameraManager which handles service
connection keepalive and availability listeners, so that local camera
manager instances can go out of scope as expected.

Bug: 18077200

Change-Id: I1be5fb8d3492131e98bb4a84121400d4abb2b9e1
 2014-11-26 13:58:15 -08:00
Jinsuk Kim
c69c8dc159 am bc3226e2: Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 
* commit 'bc3226e21dfe881bf1ccae62e10b660d97b2b232':
  Do not perform forceVolumeControlStream in master volume mode
 2014-11-26 21:33:23 +00:00
Jinsuk Kim
bc3226e21d Merge "Do not perform forceVolumeControlStream in master volume mode" into lmp-mr1-dev 2014-11-26 21:27:19 +00:00
Chris Craik
6eac26a499 am ca84c8b1: Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 
* commit 'ca84c8b1b0e364e01ce392f0dbca5132830a148d':
  Revert "Force-use the pbuffer surface for destroy"
 2014-11-26 20:57:35 +00:00
Chris Craik
ca84c8b1b0 Merge "Revert "Force-use the pbuffer surface for destroy"" into lmp-mr1-dev 2014-11-26 20:50:10 +00:00
Lajos Molnar
9bde6e419e am a181da10: Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 
* commit 'a181da10ac5a7fc750d046e7789ba2244ee563b9':
  Fix broken @see javadoc in android.media.* classes
 2014-11-26 19:41:42 +00:00
vandwalle
b6c9cbc576 am 47772ac8: Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 
* commit '47772ac8e969fae53f8a3cef9066843fe20cae70':
  make startScan with worksource specific to location scans
 2014-11-26 19:41:36 +00:00
Jeff Sharkey
cd5d46ff81 am 293f0f38: Merge "package_info GID shouldn\'t have write." into lmp-mr1-dev 
* commit '293f0f380b514658f63474b714053fda0e92569f':
  package_info GID shouldn't have write.
 2014-11-26 19:41:31 +00:00
Lajos Molnar
a181da10ac Merge "Fix broken @see javadoc in android.media.* classes" into lmp-mr1-dev 2014-11-26 19:14:26 +00:00
vandwalle
47772ac8e9 Merge "make startScan with worksource specific to location scans" into lmp-mr1-dev 2014-11-26 19:05:02 +00:00
Chris Craik
9f81485a76 Revert "Force-use the pbuffer surface for destroy" 
bug:18528859

This reverts commit b945f2313a.

Change-Id: I6915624d356cb8570471eb3a5b8921f59b58db6d
 2014-11-26 18:59:58 +00:00