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

8565 Commits

Author SHA1 Message Date
Jason Monk
8dd6f7af9a am ef845286: am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit 'ef845286e0f0af4155599376a628e904f9ac3bd2':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 22:04:04 +00:00
Jason Monk
ef845286e0 am e2038151: am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit 'e2038151c2a3410a67edc408a1d677b05cda41ec':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:55:37 +00:00
Jason Monk
e2038151c2 am 872d4e00: Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 
* commit '872d4e00ed1715d76dc8e97853a4e3e9542ca8d0':
  Prepare for testing the NetworkControllerImpl
 2014-11-07 21:29:45 +00:00
Jason Monk
872d4e00ed Merge "Prepare for testing the NetworkControllerImpl" into lmp-mr1-dev 2014-11-07 21:26:40 +00:00
John Spurlock
64b15265fa am aa1f9804: am d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge: 5cde5c6 
* commit 'aa1f9804b43a3590ed845c5606a9f4e9f977b317':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 21:21:16 +00:00
John Spurlock
aa1f9804b4 am d8367c24: Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev automerge: 5cde5c6 
* commit 'd8367c24f76f0464701228fafe630f8abfbc91da':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 21:14:19 +00:00
John Spurlock
d8367c24f7 Merge "QS: Long-press on usage-based tiles to hide." into lmp-mr1-dev 
automerge: 5cde5c6

* commit '5cde5c616a39b060730f9b995c19642695222975':
  QS: Long-press on usage-based tiles to hide.
 2014-11-07 20:56:35 +00:00
John Spurlock
c247b8f727 QS: Long-press on usage-based tiles to hide. 
Bug: 18284167
Change-Id: Ia03ea34af5733b801be6a14645c76754b73c6165
 2014-11-07 15:30:04 -05:00
Jason Monk
e0cdb6079e Prepare for testing the NetworkControllerImpl 
This will allow us to add some test cases to verify that under
certain phone/signal conditions we get out the icons we expect.
This will let us break less things when refactoring for MSIM.

Bug: 18222975
Change-Id: I7bd3e66e7de6b30fede72e40fb6aa37dd523336c
 2014-11-07 20:08:47 +00:00
Jason Monk
5ddcaf5cde am 003f248a: am dbda9d1c: am f9cf698f: Merge "Fix Build" into lmp-mr1-dev 
* commit '003f248a70e3635cb67453578366957c0a1e69dc':
  Fix Build
 2014-11-07 19:45:52 +00:00
Jason Monk
003f248a70 am dbda9d1c: am f9cf698f: Merge "Fix Build" into lmp-mr1-dev 
* commit 'dbda9d1c1b10dd7d695b1056a90aa1568cb0a0c5':
  Fix Build
 2014-11-07 19:41:14 +00:00
Jason Monk
dbda9d1c1b am f9cf698f: Merge "Fix Build" into lmp-mr1-dev 
* commit 'f9cf698fe00da7a0bf2ded408b86926c1f9155b2':
  Fix Build
 2014-11-07 19:35:53 +00:00
Jason Monk
2a472ffa7a am aac9f433: am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit 'aac9f433ff3db2b39dc143956e4ab9aabf76e3e9':
  Material design for screen pinning cling
 2014-11-07 19:34:12 +00:00
Jason Monk
0aee5a9b80 am 81f5fa74: am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '81f5fa7422c8c531702427f508df3c069baf8c7e':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:33:30 +00:00
Jason Monk
f9cf698fe0 Merge "Fix Build" into lmp-mr1-dev 2014-11-07 19:32:47 +00:00
Jason Monk
823c7bc5c5 Fix Build 
Change-Id: I0f4094718435b219b6e6b1d98435377a42319adb
 2014-11-07 14:25:17 -05:00
Jason Monk
aac9f433ff am 68d0089c: am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '68d0089c66b67b2df2b4c3d9f9e68bbcae637d79':
  Material design for screen pinning cling
 2014-11-07 19:12:03 +00:00
Jason Monk
81f5fa7422 am 88aad1af: am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '88aad1af7f6f3f775d10b8ea5e61225c0c89d3d1':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:07:15 +00:00
Jason Monk
68d0089c66 am 975590f2: Merge "Material design for screen pinning cling" into lmp-mr1-dev 
* commit '975590f22916e184204678758bb339c1d2b6b57f':
  Material design for screen pinning cling
 2014-11-07 19:05:50 +00:00
Jason Monk
88aad1af7f am 2f04d16f: Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 
* commit '2f04d16f16ea935895872efe4dfcff3366070e9c':
  Plumbing for screen pinning request from sysui
 2014-11-07 19:01:09 +00:00
Jason Monk
975590f229 Merge "Material design for screen pinning cling" into lmp-mr1-dev 2014-11-07 18:59:25 +00:00
Jason Monk
2f04d16f16 Merge "Plumbing for screen pinning request from sysui" into lmp-mr1-dev 2014-11-07 18:53:54 +00:00
Jason Monk
18f99d9134 Material design for screen pinning cling 
Switching from a dialog to a cling-like view to be more material.
Also moving it into SysUI as it highlights the buttons in nav bar.
This will be triggered directly from recents, but from apps it
will be triggered by the PhoneStatusBar.  In the case that apps
trigger the request, there will be a 'no thanks' button so that
users can refuse.

Bug: 16957435
Change-Id: Ie880f82c66f4b2be98283ed3fa789703c4bd7ed5
 2014-11-07 11:09:19 -05:00
Baligh Uddin
714e163663 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-11-07 15:50:07 +00:00
Baligh Uddin
61e4be1b65 Merge "Import translations. DO NOT MERGE" 2014-11-07 15:49:34 +00:00
Baligh Uddin
a9ad9ce71b Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-11-07 15:49:33 +00:00
Baligh Uddin
3f9b1a3ed7 Import translations. DO NOT MERGE 
Change-Id: I2fa15a37c0b29c068dfa413490028f09d5de5ae2
Auto-generated-cl: translation import
 2014-11-07 01:58:59 -08:00
Baligh Uddin
ca372ca7f8 Import translations. DO NOT MERGE 
Change-Id: I3019f8f80cdeb209aa4f7903b149743af1b1473e
Auto-generated-cl: translation import
 2014-11-07 01:47:40 -08:00
Baligh Uddin
31b3de0d95 Import translations. DO NOT MERGE 
Change-Id: Ic6355a1f0a89aadd602b3cfa6660f735f6d04d7b
Auto-generated-cl: translation import
 2014-11-07 01:44:33 -08:00
Jim Miller
b6b3cb9910 am 73d43681: am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit '73d4368119391c93ce59cb2d5f78174ce1f6dc92':
  Fix build
 2014-11-07 04:44:08 +00:00
Winson Chung
c5f9ec3e27 am 675a0b6b: am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '675a0b6bc9ee2f2e80f28381c0f34d98e0447ad6':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 04:17:02 +00:00
Winson Chung
f3fefc6195 am d42e7b57: am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit 'd42e7b57de7bb3323aa6c0d680378da000664a07':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 04:16:57 +00:00
Jim Miller
73d4368119 am eae9dc3b: am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'eae9dc3b7fdf21c50de864d5ab13c71446c7b2da':
  Fix build
 2014-11-07 02:27:08 +00:00
Jim Miller
eae9dc3b7f am c6f5009f: Merge "Fix build" into lmp-mr1-dev 
* commit 'c6f5009fdb6aeafbee6db2b3e381f405ff23718b':
  Fix build
 2014-11-07 02:21:20 +00:00
Jim Miller
a237a31484 Fix build 
Change-Id: I1c4054f0e613f19a39c4bc32cc90bdec3b21dca9
 2014-11-06 18:05:59 -08:00
Winson Chung
675a0b6bc9 am 513aa792: am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '513aa79290dd17400c4cce82d1d801c05ff3776f':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:45:11 +00:00
Winson Chung
d42e7b57de am c0542a96: am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit 'c0542a96db6e2c59c00d9bfa030383eb82c1f41a':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 01:45:06 +00:00
Winson Chung
513aa79290 am 3ed9f2f9: Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 
* commit '3ed9f2f903a8e6c38ca9f2ce3819ac063281a020':
  Adding bounce animation for affiliated tasks. (Bug 16656169)
 2014-11-07 01:33:28 +00:00
Winson Chung
c0542a96db am 7bd54c11: Merge "Fixing Recents crash when resetting focus of TaskView already returned to the pool." into lmp-mr1-dev 
* commit '7bd54c11223669e4b00a0d6cace0025f8116da5e':
  Fixing Recents crash when resetting focus of TaskView already returned to the pool.
 2014-11-07 01:33:23 +00:00
Winson Chung
3ed9f2f903 Merge "Adding bounce animation for affiliated tasks. (Bug 16656169)" into lmp-mr1-dev 2014-11-07 01:30:20 +00:00
Winson Chung
7ae4b7e196 Fixing Recents crash when resetting focus of TaskView already returned to the pool. 
Change-Id: Iee789e4e726d5f035ec518f4fec444afecc2bbf2
 2014-11-06 17:07:52 -08:00
Winson Chung
044d52934e Adding bounce animation for affiliated tasks. (Bug 16656169) 
Change-Id: I39e4a57c4e6b707d15513dacde2d40c23bb05058
 2014-11-06 14:02:35 -08:00
Jason Monk
63c8b5bc58 am 81cdc2ae: am 49f4493b: am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev 
* commit '81cdc2ae35030af9166666fc4ce147ce6a57e215':
  Show recents button while pinned and locked
 2014-11-06 21:08:49 +00:00
Winson Chung
7b2616a9d3 am fea9a6fc: am 0fc133e0: am 5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 
* commit 'fea9a6fc627e9efc7b07ab28b70b914a98df28b2':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-06 21:08:21 +00:00
Winson Chung
6edd65a43d am b6c2d100: am 438eaf00: am e0325fe9: Merge "Don\'t reload the layout every time we enter Recents. (Bug 18160176)" into lmp-mr1-dev 
* commit 'b6c2d1008dcfe8efc377166118a8809938a59ee5':
  Don't reload the layout every time we enter Recents. (Bug 18160176)
 2014-11-06 21:08:16 +00:00
Jason Monk
5565cb42f2 Plumbing for screen pinning request from sysui 
Removes lock-to-app request dialog from the AM.

Added a showScreenPinningRequest to IStatusBar to handle the
flow from app requesting lock task to showing the dialog.

This CL also allows startLockTaskOnCurrent (system|signature) to
start lock task directly.  (Note: this is the less locked version
that always allows exit through back + recents)

Bug: 16957435
Change-Id: I284918dd5989de6cb2767c2a717529eb5e9c6db4
 2014-11-06 15:53:43 -05:00
Jason Monk
81cdc2ae35 am 49f4493b: am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev 
* commit '49f4493bb3df52caa24a6a354cd5f8ce3bb2541f':
  Show recents button while pinned and locked
 2014-11-06 20:21:59 +00:00
Jason Monk
49f4493bb3 am 265160e0: Merge "Show recents button while pinned and locked" into lmp-mr1-dev 
* commit '265160e03a9e3447a4874e5820108730dcd05194':
  Show recents button while pinned and locked
 2014-11-06 20:17:11 +00:00
Jason Monk
265160e03a Merge "Show recents button while pinned and locked" into lmp-mr1-dev 2014-11-06 20:13:07 +00:00
Winson Chung
fea9a6fc62 am 0fc133e0: am 5191861c: Merge "Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)" into lmp-mr1-dev 
* commit '0fc133e07eb9ade5dc91eb3f93623c8839ef1e39':
  Increasing the min swipe thresholds for the nav bar gestures. (Bug 17109581)
 2014-11-06 19:31:59 +00:00