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

9285 Commits

Author SHA1 Message Date
Winson Chung
fcb6148367 Merge "Adding dismiss-all button." 2015-01-23 19:23:44 +00:00
Christoph Studer
f8c669d3d2 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev automerge: 9e9885e 
automerge: b97b519

* commit 'b97b519808719857232e1b82a6cfd0827db4ed0c':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 17:07:39 +00:00
Christoph Studer
b97b519808 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev 
automerge: 9e9885e

* commit '9e9885e1c0b34a6284235e61b023013c1ded6468':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 17:00:00 +00:00
Christoph Studer
9e9885e1c0 am 73500edb: Merge "SysUI: Don\'t drop HUN notification when clicked" into lmp-mr1-dev 
* commit '73500edb42d9270437e41ff2ddaa0cd6eacb422b':
  SysUI: Don't drop HUN notification when clicked
 2015-01-23 16:55:31 +00:00
Christoph Studer
73500edb42 Merge "SysUI: Don't drop HUN notification when clicked" into lmp-mr1-dev 2015-01-23 16:51:46 +00:00
Winson Chung
6ac8bd6198 Adding dismiss-all button. 
Change-Id: Iad7d5d1eddeff6af6b88a1afdf23677c8b2f3b49
 2015-01-22 12:24:50 -08:00
Jason Monk
f55291a101 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev automerge: 959ff1d automerge: 485ee97 
automerge: e1e44ed

* commit 'e1e44ed73a340964113f8c8c0702f469aa3f0940':
  QS: Fix second line in dual tiles
 2015-01-22 18:10:21 +00:00
Jason Monk
e1e44ed73a Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev automerge: 959ff1d 
automerge: 485ee97

* commit '485ee978306b4df3f2982a3fc692dcb48a8adb08':
  QS: Fix second line in dual tiles
 2015-01-22 18:04:57 +00:00
Jason Monk
485ee97830 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 
automerge: 959ff1d

* commit '959ff1d3a991b20140843187b2fb08c5a96c202b':
  QS: Fix second line in dual tiles
 2015-01-22 17:59:13 +00:00
Jason Monk
959ff1d3a9 Merge "QS: Fix second line in dual tiles" into lmp-mr1-dev 2015-01-22 17:49:06 +00:00
Christoph Studer
c6a656c9ab SysUI: Don't drop HUN notification when clicked 
A clicked notification is not guaranteed to be removed,
so instead of dropping a clicked HUN notification we have
to release it to the shade.

Bug: 19093631
Change-Id: I73b88af774e49e89c8a601873c48cc5f5eed0224
 2015-01-22 16:26:43 +00:00
Jorim Jaggi
d9d8ab2ee7 Merge "Add option to exclude SystemUI tests" 2015-01-22 15:50:05 +00:00
Jason Monk
6ece24e106 QS: Fix second line in dual tiles 
QSDualTileLabel is no longer a FrameLayout (now a LinearLayout),
so it does not need the top padding based on the caret size
anymore.

Bug: 18725348
Change-Id: Ibd3aaa20e7cdb35ba585cc5c8981c64efb5c66fe
 2015-01-22 10:40:54 -05:00
Jason Monk
086e311618 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev automerge: 1a5ac5b automerge: 3c55689 
automerge: 4185030

* commit '4185030ad49d4e9b42721355953001cd890ed05a':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:26:29 +00:00
Jason Monk
4185030ad4 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev automerge: 1a5ac5b 
automerge: 3c55689

* commit '3c556895edf01af562a16970ea3aecfd7dc51da7':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:22:13 +00:00
Jason Monk
3c556895ed Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 
automerge: 1a5ac5b

* commit '1a5ac5b415fea8098686aa08bffc6da3ada31938':
  Show connect dialog when selecting secure QS wifi
 2015-01-22 14:14:41 +00:00
Jason Monk
1a5ac5b415 Merge "Show connect dialog when selecting secure QS wifi" into lmp-mr1-dev 2015-01-22 14:11:53 +00:00
Robert Greenwalt
bea29888c8 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev automerge: 0343e1a 
automerge: 8379688

* commit '8379688475b9196a298f2fc7c3b554c866b40ec3':
  Rerun entitlementcheck on sim change.
 2015-01-22 00:09:28 +00:00
Robert Greenwalt
8379688475 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
automerge: 0343e1a

* commit '0343e1a7042e34589a52b4bf4a0afdcb2d51fc7d':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:59:09 +00:00
Robert Greenwalt
0343e1a704 am 7ca16ff8: Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 
* commit '7ca16ff8c6133b211d6163bd17847ed3eaa1948a':
  Rerun entitlementcheck on sim change.
 2015-01-21 23:56:02 +00:00
Robert Greenwalt
7ca16ff8c6 Merge "Rerun entitlementcheck on sim change." into lmp-mr1-dev 2015-01-21 23:49:12 +00:00
Jason Monk
17f3c3f4fb Show connect dialog when selecting secure QS wifi 
Use startSettingsActivity (QSTileHost) to make sure we use the right flags
and get the keyguard out of the way so the user always sees the
connect dialog for secure networks when they are sent to settings.

Bug: 18987307
Change-Id: I9027393ab8743e6dfe702221cb3bc1bb4e213708
 2015-01-21 20:58:47 +00:00
Jorim Jaggi
b1b085a055 Remove dead code #12: Remove KeyButtonView.quiescentAlpha 
Change-Id: I5e22da13f61fda78d1ea2fec2e89252a82f98e21
 2015-01-21 17:25:27 +01:00
Jorim Jaggi
b93024f1e8 Remove dead code #10: Clean up PhoneStatusBar 
- Remove carrier label
- Remove emergency calls only label
- Remove dead methods and fiels.

Change-Id: If242a8fa926d21d77fc54867f4244e7d82626fff
 2015-01-21 16:56:58 +01:00
Jorim Jaggi
2325f276cf Remove dead code #9: Remove ticker code in PhoneStatusBar 
Change-Id: I2236790435d89962d70c642fa1879d44981bc71b
 2015-01-21 16:56:33 +01:00
Geoff Mendal
ae0b0167bc Import translations. DO NOT MERGE 
Change-Id: I03276ec800985dbd5519945587620f52d6fed25a
Auto-generated-cl: translation import
 2015-01-21 07:30:19 -08:00
Christopher Tate
98635ea392 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 automerge: 78a05de 
automerge: fb4fde7

* commit 'fb4fde7053ba4bbba79175c31f7cdcac464b4c1c':
  Don't try to launch broadcast receivers during boot
 2015-01-21 00:08:18 +00:00
Christopher Tate
fb4fde7053 Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev automerge: 14c33f6 
automerge: 78a05de

* commit '78a05de82daffdf746c252b49f12ef88073b0459':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:52:57 +00:00
Winson Chung
0a5be32d7a Merge "Cherry picking recents fixes to screen pinning and visibility." 2015-01-20 23:50:56 +00:00
Christopher Tate
78a05de82d Merge "Don\'t try to launch broadcast receivers during boot" into lmp-mr1-dev 
automerge: 14c33f6

* commit '14c33f6a716f224d1bc821cd8aa062f5734c29bf':
  Don't try to launch broadcast receivers during boot
 2015-01-20 23:02:23 +00:00
Christopher Tate
0721a94630 Don't try to launch broadcast receivers during boot 
It turns out that sysUI visibility / interactivity is racing with
boot, and it's possible in some circumstances for the user to start
the secure camera swipe gesture before formal boot-completed.  Make
sure we only send the camera-related broadcast to registered
receivers in that case, otherwise we'll implicitly be asking to
launch other apps before boot, which is forbidden.

Bug 19060618

Change-Id: I7fcf13b5af7b2edfbb4aac06ef04a0fde2c6a0f7
 2015-01-20 14:29:22 -08:00
Winson Chung
2cf8b221fc Cherry picking recents fixes to screen pinning and visibility. 
Screen pinning fix - 98e8f7ac5e75a47abaa0061aab343b9f06770258
Visibility fix - 5675f018681faefeb50c9003bc9e02cd9ce5659d

Bug 18986736, 18802531

Change-Id: Ia37dbcd4f82e80f47f9c0686ed2ad4f534f946a7
 2015-01-20 11:44:05 -08:00
Jorim Jaggi
fb0d644b2b Add option to exclude SystemUI tests 
Setting the environment variable EXCLUDE_SYSTEMUI_TESTS to something
excludes the tests package during building. Saves a few seconds for
incremental changes in SystemUI for fast UI iteration changes.

Change-Id: I596a0273133c8a8bece0cc364e2ec61fdea45116
 2015-01-20 16:41:01 +01:00
Geoff Mendal
9563c9bef4 Import translations. DO NOT MERGE 
Change-Id: I5022d077fb7b8badc66406965b2406d4250e254d
Auto-generated-cl: translation import
 2015-01-19 07:13:09 -08:00
Chris Wren
4b8c47b861 Merge "Standardize notification IDs in the sysui package." 2015-01-16 22:05:52 +00:00
Chris Wren
d8775100b2 Standardize notification IDs in the sysui package. 
Use the resource system to assign IDs for notifications,
so that we know there will be no collisions.

Bug: 10671709
Change-Id: I403e89f6ec953f6e2e63520b86e2cd464ebce6b3
 2015-01-16 16:19:32 -05:00
Winson Chung
57653fc4a4 am 898290af: am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '898290afd55733b09a98eb15f6c71d6aaad75072':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:22:44 +00:00
Winson Chung
898290afd5 am 166cf980: Merge "DO NOT MERGE. Don\'t use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 
* commit '166cf980afafb83add7479cfeb3a8e0283cfee81':
  DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)
 2015-01-16 20:15:30 +00:00
Winson Chung
166cf980af Merge "DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531)" into lmp-mr1-dev 2015-01-16 20:09:40 +00:00
Winson Chung
5675f01868 DO NOT MERGE. Don't use visibility flags to determine whether to dismiss Recents. (Bug 18802531) 
We can use our normal visibility check to dismiss Recents when the screen is off,
since the system broadcast can occur after the activity is stopped.  We should use
the same mechanism we use to test visibility when launching Recents and just see
if it is the top most activity.

Change-Id: Ib9c01e78fd9221c4fb0ffcc80a01a0c58fb96836
 2015-01-15 11:27:43 -08:00
John Spurlock
e873e5f3f9 Merge "Update three remaining png-based status bar icons to vectors." 2015-01-15 16:39:19 +00:00
Michael Wright
70a4cb92f9 am 31572ede: am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '31572ede1c85efccb8b876e4492f7a23a9b8e739':
  Clean up graphics resources.
 2015-01-15 03:44:59 +00:00
Christoph Studer
61e13698a8 am 4d5e761a: am a80da9d0: am b018399a: SysUI: Log lockscreen gestures 
* commit '4d5e761a34c73a700757ade349e9a05b3335f617':
  SysUI: Log lockscreen gestures
 2015-01-15 02:57:09 +00:00
Robert Greenwalt
2ffe412b0e Rerun entitlementcheck on sim change. 
Only run if entitlement is needed and tethering is running.

bug:18356505
Change-Id: Ifc50189bf573e4575f747975edcce093c4870356
 2015-01-14 16:55:38 -08:00
Jorim Jaggi
568e54be71 resolve merge conflicts of 87f5369 to master. 
Change-Id: I5d1a7aaf48c4bf70f7181508aa46fbbcc2cf7086
 2015-01-15 00:12:18 +01:00
Michael Wright
31572ede1c am 5497e99c: am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit '5497e99c4a749a46b8e9f8312d01639987ba81a0':
  Clean up graphics resources.
 2015-01-14 21:32:37 +00:00
Michael Wright
5497e99c4a am eec75faa: Merge "Clean up graphics resources." into lmp-mr1-dev 
* commit 'eec75faaa25b5da3382cf0925a65e9e6bd90fdc9':
  Clean up graphics resources.
 2015-01-14 21:26:52 +00:00
Michael Wright
eec75faaa2 Merge "Clean up graphics resources." into lmp-mr1-dev 2015-01-14 21:21:40 +00:00
Adrian Roos
bb4bc22021 Merge "Directly dispatch USER_REMOVED to LockSettingsService" 2015-01-14 20:45:42 +00:00
Adrian Roos
0791e8fb30 Merge "Purge biometric weak and keyguard widgets" 2015-01-14 20:41:35 +00:00