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

136583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vinod Krishnan
4f65a54561 Merge "Adding more DeviceDefault for CTS tests" into klp-modular-dev 2014-05-21 17:40:06 +00:00
Vinod Krishnan
9b8e4d01f6 Adding more DeviceDefault for CTS tests 
Bug: 15091518
Change-Id: Iddabacbd023f031c9c4ec6fd4c4f60ce17b606c4
 2014-05-21 10:28:57 -07:00
Dan Sandler
2114b7003f am d0ec8438: am 7509733c: Elide extras strings from noman dumpsys output. 
* commit 'd0ec8438820d936e13664ec052c01f14d8a4e8e3':
  Elide extras strings from noman dumpsys output.
 2014-05-21 17:28:43 +00:00
Alan Viverette
8f2d99b9ee Merge "Quantum popup nine-patch with baked-in shadow" 2014-05-21 17:23:55 +00:00
Jeff Sharkey
b01cb2c0c2 am fce708d2: am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 
* commit 'fce708d285506f65eb51a3256b2a04111e4054cc':
  Check for null in LocalSocketImpl.SocketInputStream.available()
 2014-05-21 17:15:19 +00:00
Glenn Kasten
486918b415 Update android.media.AudioTrack.getTimestamp API documentation 
Change-Id: I0928c73c147ce843ae46565883da209b278fb3b4
 2014-05-21 09:36:41 -07:00
Craig Mautner
4ee3580609 Merge "Change method name per API council request" 2014-05-21 16:35:27 +00:00
Dan Sandler
d0ec843882 am 7509733c: Elide extras strings from noman dumpsys output. 
* commit '7509733c8dfb4e65dbb45ab582e09d599dfaaa28':
  Elide extras strings from noman dumpsys output.
 2014-05-21 16:26:29 +00:00
Jeff Sharkey
fce708d285 am 9ef2117f: am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 
* commit '9ef2117f0e65db60cb3f9708174bcaca4db813b2':
  Check for null in LocalSocketImpl.SocketInputStream.available()
 2014-05-21 16:13:18 +00:00
Jeff Sharkey
9ef2117f0e am bc06158a: Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 
* commit 'bc06158a78297747605981702c8e41956ea1aa2d':
  Check for null in LocalSocketImpl.SocketInputStream.available()
 2014-05-21 16:05:34 +00:00
Jeff Sharkey
bc06158a78 Merge "Check for null in LocalSocketImpl.SocketInputStream.available()" 2014-05-21 16:03:08 +00:00
Dan Sandler
7509733c8d Elide extras strings from noman dumpsys output. 
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
(cherry picked from commit 44de3cfc08428378b93172a2b03f9785a3638678)
 2014-05-21 15:57:10 +00:00
Baligh Uddin
bee9d71293 am 9472cadd: (-s ours) am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit '9472cadd2219fbe956ea6ba32853efc12abbf69f':
  Import translations. DO NOT MERGE
 2014-05-21 15:43:30 +00:00
Baligh Uddin
fb1810e34f Merge "Import translations. DO NOT MERGE" 2014-05-21 15:42:58 +00:00
George Mount
d80154fba1 Fixed inverse of listener assignment. 
Change-Id: Icaa68d54c3f4ca74009edd19ef5ab197b73eb66a
 2014-05-21 08:40:03 -07:00
Baligh Uddin
9472cadd22 am ef2b35cc: (-s ours) Merge "Import translations. DO NOT MERGE" into klp-modular-dev 
* commit 'ef2b35cc2e87058ead622bd1858d358690c201fd':
  Import translations. DO NOT MERGE
 2014-05-21 15:38:26 +00:00
Baligh Uddin
e24d8c8fc3 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:50 +00:00
Baligh Uddin
746b1f2bf4 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:50 +00:00
Baligh Uddin
c77960884d Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:50 +00:00
Baligh Uddin
94f9338800 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:50 +00:00
Baligh Uddin
811d7f2499 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:50 +00:00
Baligh Uddin
7a8b892bb6 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:17 +00:00
Baligh Uddin
dd45bb1023 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:17 +00:00
Baligh Uddin
f08dbdb9f8 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:17 +00:00
Baligh Uddin
ef2b35cc2e Merge "Import translations. DO NOT MERGE" into klp-modular-dev 2014-05-21 15:34:11 +00:00
Baligh Uddin
3cba88603e Merge "Import translations. DO NOT MERGE" 2014-05-21 15:34:06 +00:00
Baligh Uddin
aec8c47082 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:33:52 +00:00
Baligh Uddin
dbc082efe1 Merge "Import translations. DO NOT MERGE" 2014-05-21 15:33:44 +00:00
Emily Bernier
1dcfe9e780 Merge "Connect user audio restrictions to app ops." 2014-05-21 15:17:20 +00:00
Robin Lee
69b43b4964 Merge "Remove enforceManagedProfile for listing keyguard features" 2014-05-21 14:21:38 +00:00
Robin Lee
a9e460aefc Remove enforceManagedProfile for listing keyguard features 
Change-Id: Ic89f09ada046f64b089b977868b6f37bc0a6de91
 2014-05-21 15:19:40 +01:00
Yohei Yukawa
1b2bc40bc9 Merge "Style fix and dead code removal" 2014-05-21 14:19:00 +00:00
Adrian Roos
38dfba03d5 Merge "Add trust indicator to keyguard" 2014-05-21 14:04:43 +00:00
Yohei Yukawa
eac222a002 Merge "Update InputMethodSubtypeSwitchingController correctly" 2014-05-21 14:03:34 +00:00
John Spurlock
5639828a62 Merge "VolumeZen: SystemUI now hosts the volume dialog." 2014-05-21 13:59:20 +00:00
Brian Colonna
d9a5cfa6f7 Merge "Fix 14988763: FUL only shows on bouncer now" 2014-05-21 13:59:11 +00:00
John Spurlock
3346a80208 VolumeZen: SystemUI now hosts the volume dialog. 
- Allow SystemUI to set the volume controller interface using
  a new binder call to audio service.
- Remove VolumePanel's dependency on AudioService.
- Host the base VolumePanel in the SystemUI process.

Change-Id: I095d5a1a579d42b68d0f81abb4087bd0c754b876
 2014-05-21 09:58:41 -04:00
Yohei Yukawa
4013940b62 Style fix and dead code removal 
This CL does not change the existing behavior.
Smarter language switching will be coverted by subsequent CLs.

BUG: 7043015
Change-Id: I281a33191d44be448492c2b74760cb8680719124
 2014-05-21 22:56:40 +09:00
George Mount
c84947db56 Merge changes I2da66b54,I8a65428d 
* changes:
  Fix for quick "back" in Activity Transitions.
  Enter and exit transitions are inverted in calling Activity.
 2014-05-21 13:51:44 +00:00
Adrian Roos
2fe592d49b Add trust indicator to keyguard 
Changes the unlock icon to an open lock
when the keyguard will not ask for credentials.

Bug: 14295559
Change-Id: If34a5ec9e23b2d22813860faee125e6b2d700643
 2014-05-21 15:51:14 +02:00
Adrian Roos
efb5d8d317 Merge "Add dumpsys facility and a history to TrustManagerService" 2014-05-21 13:44:07 +00:00
Yohei Yukawa
c834a2590c Update InputMethodSubtypeSwitchingController correctly 
User visible behavior is supposed to be identical with and
without this CL.

Previously, there is some corner cases where
InputMethodSubtypeSwitchingController#resetCircularListLocked is
not called but the list of enabled input method is updated.

Fortunately, this corner cases are not observable for a user
because we have not updated the the rotation order dynamically.

However we should fix this before implementing smarter rotation
algorithm that changes the rotation order dynamically.

BUG: 7043015
Change-Id: I145a514dc4cde369ba50431c408c916046ab0c6e
 2014-05-21 22:42:32 +09:00
Dan Sandler
b979f23c59 Elide extras strings from noman dumpsys output. 
Bug: 14292528
Change-Id: I19cfb6b692e6901fa7f115ea675b1b03fc5ba176
 2014-05-21 13:36:41 +00:00
The Android Automerger
d23d0b8ea4 merge in master-release history after reset to 1e0d82fdb15231d881d94c51f5eb1b30abd4b045 2014-05-21 05:50:19 -07:00
Chris Wren
5daa4598e2 Merge "add ranking information to the dumpsys info" 2014-05-21 12:36:06 +00:00
Jeff Brown
e665221764 am c2871696: am 6099fd21: Merge "Fix build." into klp-modular-dev 
* commit 'c28716964c4525bf9a291404d7f14e74de23f36f':
  Fix build.
 2014-05-21 11:16:58 +00:00
Jeff Brown
4bfcae9a3f am 77669abb: am 9beccf9f: Merge "Defer display ready until brightness ramp completes." into klp-modular-dev 
* commit '77669abb8300b672700418216939b9253dc98bee':
  Defer display ready until brightness ramp completes.
 2014-05-21 11:16:52 +00:00
Narayan Kamath
d862ebb603 resolved conflicts for merge of fcc4fed3 to master 
Change-Id: Icebca982b01debd67a1470c02651ef8936f6e5b0
 2014-05-21 12:07:35 +01:00
Sander Alewijnse
9853e2a8b3 Merge "Update comment of ACTION_PROFILE_PROVISIONING_COMPLETE." 2014-05-21 10:34:00 +00:00
Robin Lee
c8e4b8107a Merge "DPM: Disallow some DeviceAdmin policies for ProfileOwners" 2014-05-21 09:41:19 +00:00