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

9341 Commits

Author SHA1 Message Date
Jason Monk
41908a2faa am ba87ba5e: am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev automerge: 6d72d46 
* commit 'ba87ba5e4cc929f34921ff9fa875c38eca2bc1d0':
  Ellipsize QS detail items when needed
 2015-02-05 23:07:41 +00:00
Jason Monk
ba87ba5e4c am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
automerge: 6d72d46

* commit '6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52':
  Ellipsize QS detail items when needed
 2015-02-05 23:02:57 +00:00
Jason Monk
6d72d46b4b am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
  Ellipsize QS detail items when needed
 2015-02-05 19:39:18 +00:00
Jason Monk
867874b06a Ellipsize QS detail items when needed 
Bug: 19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2
 2015-02-05 11:54:58 -05:00
Chris Wren
37a6ad9755 Merge "Add dumpsys info for heads up view." 2015-02-04 21:09:40 +00:00
Chris Wren
428c6b6580 Add dumpsys info for heads up view. 
Bug: 18640969
Change-Id: Ie8d271fad3259da48854e9fd5e3f8eeec51ba91e
 2015-02-04 16:07:50 -05:00
Jason Monk
d52356aa5e Move Settings wifi tracking to SettingsLib 
Make SettingsLib capable of tracking which wifi networks are
available/saved and their state.

Also modify Quick Settings to use this code rather than having
its own logic.

Bug: 19180466
Change-Id: Iff9f9aed240d79323dba41496496e8076b9fa6f2
 2015-02-04 15:08:55 -05:00
Geoff Mendal
041349f338 Merge "Import translations. DO NOT MERGE" 2015-02-04 16:33:56 +00:00
Geoff Mendal
b23b7798fe Import translations. DO NOT MERGE 
Change-Id: Ic5a8c3b60bfd6618b43a914c43b79eec1ffb73fe
Auto-generated-cl: translation import
 2015-02-04 07:53:42 -08:00
Adrian Roos
761c156756 Follow-up to I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d 
Bug: 19233606
Change-Id: I394a015371acd124f84f1f6f82bc565fefc669d1
 2015-02-04 15:16:04 +00:00
Adrian Roos
75fa38539d Add API for light status bar 
Adds a systemUiVisibility flag and links it
to the status bar icon controller. Also adds a
theme attribute for setting the flag.

Bug: 19233606
Change-Id: I8a89a10cf2746cefa2feba50dc60c5eccd2ab28d
 2015-02-04 14:28:14 +01:00
Jorim Jaggi
3bef2929fa Merge "Add ability to colorize status bar" 2015-02-04 11:46:56 +00:00
Jorim Jaggi
dd0107a0db Add ability to colorize status bar 
Bug: 19233606
Change-Id: I756599395c202c4d0dd04c44beac706fc19bfe17
 2015-02-04 12:44:22 +01:00
Winson Chung
04de4c9de1 Merge "Ensuring that the list of stack views are mutable. (Bug 19245963)" 2015-02-03 20:06:37 +00:00
Winson Chung
93847da2c2 Ensuring that the list of stack views are mutable. (Bug 19245963) 
Change-Id: I5a298bf389d8756492cce2777f127fc214f6d6be
 2015-02-03 12:04:55 -08:00
Andrew Lee
72b46d429c Reset keyguard/bouncer on "return to call". 
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.

Bug: 18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
 2015-02-02 12:30:59 -08:00
Jorim Jaggi
10c85c76a9 Merge commit '83eaf6cc' into HEAD 
Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e
 2015-02-02 20:45:32 +01:00
Jorim Jaggi
83eaf6cc8c am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
automerge: 2ffb340

* commit '2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
  Send accessibility event when bouncer is shown
 2015-02-02 19:30:34 +00:00
Jorim Jaggi
2ffb3400f7 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
  Send accessibility event when bouncer is shown
 2015-02-02 19:25:34 +00:00
Jorim Jaggi
c1dff8cee8 Send accessibility event when bouncer is shown 
Bug: 18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
 2015-02-02 20:18:26 +01:00
Jason Monk
a2bfc837cc Merge "Create SettingsLib" 2015-02-02 17:39:45 +00:00
Jason Monk
2ba4ce6a06 Create SettingsLib 
This will hold common code that SystemUI and Settings (and others)
will share.

Bug: 19180466
Change-Id: I6614b31d6c3b0a2d426a2aa8ce66725245339d22
 2015-02-02 11:33:17 -05:00
Geoff Mendal
dec7d3893f Merge "Import translations. DO NOT MERGE" 2015-02-02 15:53:44 +00:00
Geoff Mendal
4af00ad2a4 Import translations. DO NOT MERGE 
Change-Id: I11260e50c0c2ca497a300fe79a25810d4a0b6c9a
Auto-generated-cl: translation import
 2015-02-02 07:52:02 -08:00
Jorim Jaggi
6a6b4fa6ee Merge "Split status bar icon management into separate class" 2015-02-02 15:17:47 +00:00
Jorim Jaggi
66ac133971 Split status bar icon management into separate class 
Change-Id: Iaacfcb70ff16d894287603d5fc6351598c7450d6
 2015-02-02 16:14:41 +01:00
Jorim Jaggi
4c99d0da47 Merge "Show status bar header in SHADE_LOCKED" 2015-02-02 15:13:55 +00:00
Jason Monk
c4980829e5 am b5083a7d: Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb automerge: d2f15ec 
* commit 'b5083a7d54f839db779a1fa60adc3ac5dbf70e79':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:32:01 +00:00
Jason Monk
84183103f4 Fix expandSettingsPanel status bar call automerge: 3c68ca2 automerge: f388249 
automerge: 734219d

* commit '734219d9c22cbab2549d1d43d077e9e8e089730c':
  Fix expandSettingsPanel status bar call
 2015-01-30 19:29:31 +00:00
Jason Monk
b5083a7d54 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev automerge: b2dd5cb 
automerge: d2f15ec

* commit 'd2f15ecb08042aa49da04cb2bdbc6f4e7f97c757':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 19:27:06 +00:00
Jason Monk
734219d9c2 Fix expandSettingsPanel status bar call automerge: 3c68ca2 
automerge: f388249

* commit 'f38824928cf586124ffc6dc7a85c7f8603f77c5a':
  Fix expandSettingsPanel status bar call
 2015-01-30 19:25:20 +00:00
Jason Monk
d2f15ecb08 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 
automerge: b2dd5cb

* commit 'b2dd5cb900d031acf255bddcbe2f57efb8f43adb':
  Fix QS bluetooth tile accessibility issue
 2015-01-30 18:48:15 +00:00
Jason Monk
f38824928c Fix expandSettingsPanel status bar call 
automerge: 3c68ca2

* commit '3c68ca2feab6d3cd09c297ddc2e77af67694feec':
  Fix expandSettingsPanel status bar call
 2015-01-30 18:46:31 +00:00
Winson Chung
0e0b7310a8 Merge "Adding some debug controls to test multi-window." 2015-01-30 18:43:19 +00:00
Jason Monk
b2dd5cb900 Merge "Fix QS bluetooth tile accessibility issue" into lmp-mr1-dev 2015-01-30 18:27:53 +00:00
Jason Monk
8ba572a327 Fix QS bluetooth tile accessibility issue 
Bluetooth tile was not announcing its state when the top half was
clicked.  This is because if handleUpdateState was triggered on
the view before it became dual then it would not get all of the dual
accessibility information.  So if the dual state changes on a tile
make sure to call handleUpdateState so it can be handled appropriately.

Bug: 19155633
Change-Id: Ifd053c67d8ddd3230086517c9d479069556e8b56
 2015-01-30 13:02:27 -05:00
Jason Monk
3c68ca2fea Fix expandSettingsPanel status bar call 
Use the same mechanism as the two finger gesture to get it to open
correctly.

Bug: 19196800
Change-Id: I952e14d3ccd796889ed54cb98c017542a25f28c9
 2015-01-30 12:10:15 -05:00
Winson Chung
d16c565a60 Adding some debug controls to test multi-window. 
Adding some preliminary controls to mirror the currently exposed api
to create new activity stacks, resize stacks, and to move tasks
between stacks.

Change-Id: I3fb51c248f53a1d4c4eb23ca9fb3a76888def1de
 2015-01-29 15:56:58 -08:00
Jason Monk
18985e08eb Fix SysUI tests to pass. 
Most were fixed by including the correct subscription id in the
broadcast.

The last was testing based on SIM card state which is not something
the MobileSignalControllers track anymore so I just pulled it out
completely.

Change-Id: Ie52068a3c8f8652f1b0641e6376696aeddda26a2
 2015-01-29 15:58:23 +00:00
John Spurlock
8cbfad3934 am 7fb346ec: am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit '7fb346ec209eac91b9673840e10b3c9040dbef3f':
  Default "pickup peforms proximity check" to false.
 2015-01-28 18:04:56 +00:00
John Spurlock
7fb346ec20 am 4b41400b: am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit '4b41400b60d57f23b16702540b9d50f98aeeffb7':
  Default "pickup peforms proximity check" to false.
 2015-01-28 17:58:35 +00:00
John Spurlock
4b41400b60 am e2f4ab93: Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 
* commit 'e2f4ab930fa4526cf989624356051b99008c23a6':
  Default "pickup peforms proximity check" to false.
 2015-01-28 17:52:48 +00:00
John Spurlock
e2f4ab930f Merge "Default "pickup peforms proximity check" to false." into lmp-mr1-dev 2015-01-28 17:48:13 +00:00
Geoff Mendal
f218141bc9 Import translations. DO NOT MERGE 
Change-Id: I908acd89310fd1f9e7a974043e00d97197fcff12
Auto-generated-cl: translation import
 2015-01-28 07:46:39 -08:00
Jeff Davidson
5c7daaf776 resolved conflicts for merge of b9470f3a to master 
Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad
 2015-01-27 16:24:32 -08:00
Jeff Davidson
b9470f3a23 am 9490c597: am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit '9490c597460a2fcaaf0d510576f4f752b7a725ce':
  Use consistent logic for data icon overlays.
 2015-01-27 22:09:08 +00:00
Jeff Davidson
9490c59746 am bae051f6: Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 
* commit 'bae051f6bd8ae4f103d8067ed96accbced173664':
  Use consistent logic for data icon overlays.
 2015-01-27 22:03:24 +00:00
Jorim Jaggi
cb4f594eca Remove dead code #11: Remove more unused classes 
Change-Id: Ie78d40fd20eef859e3c0ea9269b86ff1e1471a58
 2015-01-27 18:15:50 +01:00
Jorim Jaggi
3cdb3b7d0d Merge "Revert "Remove dead code #11: Remove more unused classes"" 2015-01-27 16:53:02 +00:00
Jorim Jaggi
de47e3554d Revert "Remove dead code #11: Remove more unused classes" 
This reverts commit 397ca8be8de407237cd293873647c182837bc032.

Change-Id: Id7f8dbe93d2a48a7f6261232499f73b7de8dd7b1
Reason: Build breakage.
 2015-01-27 16:52:24 +00:00