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

14769 Commits

Author SHA1 Message Date
Geoff Mendal
4e04b1a068 Import translations. DO NOT MERGE 
Change-Id: Ia7c0dac57e019a08a6b7f0a327d03de327dcbac0
Auto-generated-cl: translation import
 2015-01-28 06:55:37 -08:00
Christopher Tate
5e0cd7768e am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
automerge: 134aedd

* commit '134aedd2c9bce194a5c826fe7a9a7389edd8bcad':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:49:56 +00:00
Christopher Tate
134aedd2c9 am 46e657bd: am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
* commit '46e657bdbc4323fcab14882f87ece86bc8838892':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:47:53 +00:00
Christopher Tate
46e657bdbc am 26faa0be: Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 
* commit '26faa0be670484b3f32b9e4b07533c3fbef540f5':
  Enforce backup encryption in the UI, not just in effect
 2015-01-28 01:36:33 +00:00
Christopher Tate
26faa0be67 Merge "Enforce backup encryption in the UI, not just in effect" into lmp-mr1-dev 2015-01-28 01:23:49 +00:00
Jeff Davidson
5c7daaf776 resolved conflicts for merge of b9470f3a to master 
Change-Id: I85a975253b0b18b8c9e6d069c88fc12c93ed82ad
 2015-01-27 16:24:32 -08:00
Christopher Tate
14d0e1a4e1 Enforce backup encryption in the UI, not just in effect 
Encryption is required when using 'adb backup' on encrypted devices,
but the UI has not been enforcing this.  The failure mode is quite
confusing: the user can tap "back up my data" with no encryption
phrase supplied, and the confirmation activity disappears, but
the backup doesn't actually happen.

We now disallow confirming the backup unless a non-empty passphrase
has been entered into the UI.

In addition, tapping "do not back up my data" now finishes
the confirmation activity instead of just leaving it in a
confusing "dead" state.

Bug 19081192

Change-Id: I9ca69a08ff4322fe25129f9ca880b066c31525d0
 2015-01-27 15:58:36 -08:00
Svetoslav
85d6a63d41 am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
automerge: 3fd1ebf

* commit '3fd1ebff6c017ba4495070cb34f1ed7652b33cc9':
  Add a missing file to print spooler resources
 2015-01-27 23:26:24 +00: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
Jeff Davidson
bae051f6bd Merge "Use consistent logic for data icon overlays." into lmp-mr1-dev 2015-01-27 21:57:06 +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
Jorim Jaggi
ca3e3b73b3 Merge "Remove dead code #11: Remove more unused classes" 2015-01-27 16:12:25 +00:00
Jorim Jaggi
1cf6e10126 Show status bar header in SHADE_LOCKED 
Makes SHADE_LOCKED more consistent with SHADE in order to avoid
confusion about this special state. Add animations between these
states for smooth transitions.

Bug: 17446409
Change-Id: I410f0ac255abd0f453b77f42c948e814c5dfd838
 2015-01-27 16:07:22 +01:00
Svetoslav
3fd1ebff6c am fcecdccc: am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit 'fcecdccc0f24b9c9447fe5bd69c31ca29c35d5c8':
  Add a missing file to print spooler resources
 2015-01-27 04:36:37 +00:00
Svetoslav
fcecdccc0f am 369f1ec6: Merge "Add a missing file to print spooler resources" into lmp-mr1-dev 
* commit '369f1ec6ea78637870f35822456628e7ae8caf95':
  Add a missing file to print spooler resources
 2015-01-27 04:26:55 +00:00
Jeff Davidson
ccda996611 Use consistent logic for data icon overlays. 
Ensure that we always show the data icon in both Quick Settings and
the status bar, or in neither, but never one or the other.

The particular inconsistency this is intended to fix is that in some
circumstances, Wi-Fi may be connected, but the cell radio may be still
be used by certain apps, due to new multinetworking APIs in L. In this
case, we should always show the data icon; currently appears in the
status bar, but not Quick Settings, which was unconditionally dropping
the icon if any Wi-Fi connection was up.

Bug: 19112322
Change-Id: I9942f6b24081e061a72804ef47ad4fe719f32ec2
 2015-01-26 18:23:24 -08:00
John Spurlock
b9fe4e1713 Default "pickup peforms proximity check" to false. 
Don't assume the pickup sensor will perform a proximity check before
starting to pulse.  This will add some latency, but necessary if
we can't trust the sensor.

Bug: 19083596
Change-Id: I51b7daf5ed76b2780ec5c949a75cc1fca247ddad
 2015-01-26 18:55:29 -05:00
Geoff Mendal
bd1c42dc31 Import translations. DO NOT MERGE 
Change-Id: I11abe22731fb5eb346f924cba7b21ac6b9a5be13
Auto-generated-cl: translation import
 2015-01-26 07:34:55 -08:00
Svetoslav
c0198ce12e Add a missing file to print spooler resources 
bug:19120603

Change-Id: Id33c77696a47ef48b0095fd8289f92d7bba71f19
 2015-01-23 17:50:31 -08:00
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
397ca8be8d Remove dead code #11: Remove more unused classes 
Change-Id: I3130991cb468a47aa0e198e42f20edca0836f66b
 2015-01-21 16:57:12 +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
318bc929a5 Merge "Import translations. DO NOT MERGE" 2015-01-21 15:37:00 +00:00
Geoff Mendal
5afaeb6183 Import translations. DO NOT MERGE 
Change-Id: I01111253b2616daa695fdc071b875033e3badceb
Auto-generated-cl: translation import
 2015-01-21 07:33:21 -08:00