Commit Graph

176611 Commits

Author SHA1 Message Date
Andres Morales
5bc105f0e6 am a4341f9c: Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3 automerge: 3bc103b
* commit 'a4341f9cf33d3844623fbed0f0e998a5f158f67d':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
2014-11-05 18:47:40 +00:00
George Mount
253c6c47df am 7291d7b2: Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674 automerge: dd185b6
* commit '7291d7b2c58de6670e1fc6a3af4b4b6c200d1ed0':
  Fix javadoc.
2014-11-05 18:47:33 +00:00
John Spurlock
a667028207 am 96171f08: Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9 automerge: 513f260
* commit '96171f08c121a7d15a6a8cbdb28e49c917418c1f':
  Zen: Create a new exit condition for "next alarm".
2014-11-05 18:47:27 +00:00
Andrew Solovay
56576838a8 am d9ceae8f: Merge "docs: Removed broken link to non-existent method." into lmp-docs
* commit 'd9ceae8f9753a3a986ae0d24d4732c0167a6b2a9':
  docs: Removed broken link to non-existent method.
2014-11-05 18:47:17 +00:00
Craig Mautner
276a6eb879 When keyguard exits use same anim for all windows
The entering animations were only applied to the incoming windows
one time. If those windows weren't drawn yet then they never had
an animation assigned.

Furthermore if a starting window was drawn in time it would get the
animation but its main window would not get it if it weren't drawn.
Even if an animation were assigned later they wouldn't be synced
with each other.

This change creates a single animation which is shared by all
incoming windows. As windows are drawn they can then animate with
the starting window.

(Also refactorings to eliminate redundant code and unnecessary
variables.)

Fixes bug 15991916.

Change-Id: I844d102439b6eda8c912108431916e04b12f7298
2014-11-05 10:47:14 -08:00
Ricardo Cervera
b4125d1e0b am 58f1200c: Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs
* commit '58f1200c333deea72ed6e095587f0bcb1fb65ce3':
  docs: Add instructions to attach debugger to a running process.
2014-11-05 18:47:13 +00:00
John Spurlock
724415fc2e am b16f9437: Merge "QS: Toggle tile icon animations." into lmp-mr1-dev automerge: 2face5e automerge: 055acca
* commit 'b16f943743716fe36ef1fca71a2d9f52da387e41':
  QS: Toggle tile icon animations.
2014-11-05 18:47:13 +00:00
Rich Slogar
1afa82dce0 docs:remove sdk/ndk note
Change-Id: I3aaebdd14b0b26b041da3ee6872f84f311d4191b
2014-11-05 10:46:50 -08:00
Xia Ying
02329c0a12 Add configuration to control converting sms destination number
Romove hard codes about the SimcardOperatorList and NetworkOperatorList.

Bug: 18081228
Change-Id: I02d9cdee0912f6c18a5394f8e6a7106f78e20a12
2014-11-05 18:35:03 +00:00
RoboErik
9af44ddf03 Merge "Post volume requests to the handler thread in MediaSession" into lmp-mr1-dev 2014-11-05 18:29:32 +00:00
Jeff Davidson
f92fc1ca65 Fix incorrect doc for WifiInfo#getSSID().
This method will never return null. It may return "<unknown ssid>" if
no network is currently connected.

Change-Id: Iae09a6b2376e47c2d010f8d05750a16361510cca
2014-11-05 10:26:00 -08:00
RoboErik
5604a85ac6 Merge changes Ia3bc5b0d,I26e662ff into lmp-mr1-dev
* changes:
  Add extras to the PlaybackState
  Add setRatingType to MediaSession
2014-11-05 18:26:00 +00:00
Andrew Solovay
d9ceae8f97 Merge "docs: Removed broken link to non-existent method." into lmp-docs 2014-11-05 18:14:05 +00:00
Tyler Gunn
d331e4ec26 Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev automerge: 4255ec5
automerge: 0bfb97c

* commit '0bfb97cddfadcc0d580bca78c4368efac4edd23e':
  Support disconnecting conference participants from conference.
2014-11-05 18:08:37 +00:00
Jorim Jaggi
80ae285010 Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev automerge: 09ba32c
automerge: 80a28fe

* commit '80a28fe8d69cbf629a6f8cca23de9fc6e7673326':
  Fix janky in transition doze -> lockscreen
2014-11-05 18:06:27 +00:00
Andres Morales
a4341f9cf3 Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev automerge: 36531b3
automerge: 3bc103b

* commit '3bc103b8dbcacf908e6512b805c89a399a460be9':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
2014-11-05 18:05:14 +00:00
George Mount
7291d7b2c5 Merge "Fix javadoc." into lmp-mr1-dev automerge: 8b26674
automerge: dd185b6

* commit 'dd185b657dba19e913e0e01a8213756fdd8e4cfc':
  Fix javadoc.
2014-11-05 18:03:51 +00:00
Jeff Davidson
ea651a4fbf Merge "Update network selections on capability change." into lmp-mr1-dev 2014-11-05 17:41:36 +00:00
Dan Albert
f59b8f0d7c Add a missing visibility modifier to fix build.
This class is used by the tests, but is built with -fvisibility=hidden
and not declared as ANDROID_API.

Change-Id: If93af7bfdf0752de1f5bbb10fdd46b2eb9c0ccdd
2014-11-05 09:41:31 -08:00
Filip Gruszczynski
34afdf0276 Merge "Automatic brightness using ALS while dozing." into lmp-mr1-dev 2014-11-05 17:39:34 +00:00
Tyler Gunn
0bfb97cddf Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev
automerge: 4255ec5

* commit '4255ec5c57ace18b0a78ebcbf0d573213123e586':
  Support disconnecting conference participants from conference.
2014-11-05 17:38:45 +00:00
Selim Cinek
e52abb3e91 Adapted HUN behavior when swiping vertically
It's not dismissed anymore but pushed into the shade
when swiping up.
Also, when swiping down, we now dimiss the HUN.

Bug: 15594813
Change-Id: I0b6a761bebbe281e31bf3b1e20704e2e5da07861
2014-11-05 18:12:27 +01:00
Selim Cinek
9bd9d0c96a Fixed a bug where the HUNs were not clickable
Also improved the edgeswipehelper to use 45 degree
touch disambiguation.

Bug: 18102199
Change-Id: I153e094d5d86439ae048137fc5eac47966b12ca5
2014-11-05 18:12:27 +01:00
Selim Cinek
1a521f3ea8 Fixed a bug that the notifications were not animating when reset
Also made sure that the touch event is never filtered when its a
heads up view.

Bug: 18188693
Change-Id: Ic5de3e36c785d2cf890936322820b739a0a1b107
2014-11-05 18:12:15 +01:00
Ricardo Cervera
df37d45f13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev
automerge: 25a4e21

* commit '25a4e21e13217708e9ff99beb21f88151ea2cbd4':
  docs: Add instructions to attach debugger to a running process.
2014-11-05 17:08:37 +00:00
Tyler Gunn
4255ec5c57 Merge "Support disconnecting conference participants from conference." into lmp-mr1-dev 2014-11-05 17:03:13 +00:00
Dan Sandler
d29149d2ee Materialize default app icon.
Bug: 17999428
Change-Id: Ib7430993fc44051c70a802442dce15ca4cd592d4
2014-11-05 12:02:22 -05:00
Ricardo Cervera
58f1200c33 Merge "docs: Add instructions to attach debugger to a running process." into lmp-docs 2014-11-05 17:00:10 +00:00
Ricardo Cervera
25a4e21e13 Merge "docs: Add instructions to attach debugger to a running process." into lmp-dev 2014-11-05 16:58:23 +00:00
Bryce Lee
5a818e55a7 Merge "Add config to control going to sleep when entering theater mode." into lmp-sprout-dev 2014-11-05 16:41:40 +00:00
Jorim Jaggi
80a28fe8d6 Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev
automerge: 09ba32c

* commit '09ba32c0ba9306bafa25e27a2fa7d6e53e9be715':
  Fix janky in transition doze -> lockscreen
2014-11-05 16:37:13 +00:00
Andres Morales
3bc103b8db Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev
automerge: 36531b3

* commit '36531b33b8e5bb249010f2414ed41d244c571464':
  Only allow USER_OWNER to access PDB and change OEM unlock ability
2014-11-05 16:36:06 +00:00
George Mount
dd185b657d Merge "Fix javadoc." into lmp-mr1-dev
automerge: 8b26674

* commit '8b26674aa139965005ff3ba7d284d7d557c2de61':
  Fix javadoc.
2014-11-05 16:34:41 +00:00
Diego Perez
c13aa0c035 Add new parameter to the render method to allow forcing a measure pass.
Change-Id: I60c09f3375fc85c257a449f4372220741e01db54
2014-11-05 16:33:04 +00:00
Jorim Jaggi
09ba32c0ba Merge "Fix janky in transition doze -> lockscreen" into lmp-mr1-dev 2014-11-05 16:17:33 +00:00
Andres Morales
36531b33b8 Merge "Only allow USER_OWNER to access PDB and change OEM unlock ability" into lmp-mr1-dev 2014-11-05 16:01:24 +00:00
John Spurlock
96171f08c1 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev automerge: 0bdefb9
automerge: 513f260

* commit '513f26020095c409aa3e828c98485ed20aa9eaa9':
  Zen: Create a new exit condition for "next alarm".
2014-11-05 15:42:30 +00:00
John Spurlock
b16f943743 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev automerge: 2face5e
automerge: 055acca

* commit '055acca7c8691921572f8e9845bd4d46b96c7251':
  QS: Toggle tile icon animations.
2014-11-05 15:41:12 +00:00
George Mount
8b26674aa1 Merge "Fix javadoc." into lmp-mr1-dev 2014-11-05 15:22:43 +00:00
John Spurlock
513f260200 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev
automerge: 0bdefb9

* commit '0bdefb9953fd51c86f81a6033a00926a63916065':
  Zen: Create a new exit condition for "next alarm".
2014-11-05 15:20:12 +00:00
John Spurlock
055acca7c8 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev
automerge: 2face5e

* commit '2face5e2e86cb7850c2ce67306f5aad04af6f597':
  QS: Toggle tile icon animations.
2014-11-05 15:19:02 +00:00
Adrian Roos
874b35b836 Round charging indication to nearest minute
Bug: 18177374
Change-Id: I4eb7fcac83398a4d8432bf092d8d91506646b5a1
2014-11-05 16:11:10 +01:00
John Spurlock
0bdefb9953 Merge "Zen: Create a new exit condition for "next alarm"." into lmp-mr1-dev 2014-11-05 14:47:20 +00:00
John Spurlock
2face5e2e8 Merge "QS: Toggle tile icon animations." into lmp-mr1-dev 2014-11-05 14:47:03 +00:00
Paul Jensen
c53113b37f Fix DhcpResults.setDomain() and StaticIpConfiguration.toLinkProperties()
setDomain() and toLinkProperties() were not setting the domains.
The setDomain() bug affected Wifi and I believe the toLinkProperties()
bug affected Ethernet and Bluetooth reverse-tethering.

bug:18252947
Change-Id: I8764cb944c293e01d99822bb52b55af7e9d77853
2014-11-05 09:35:26 -05:00
John Spurlock
c6df3cf273 QS: Toggle tile icon animations.
- New location tile icon animation.
 - New flashlight tile icon animation.
 - New airplane-mode tile icon animation.
 - New color inversion tile icon animation.
 - Remove obsolete static icons.

Bug: 17426910
Change-Id: I51c98979afd46f4cdfc2fd383e80d7bf13c5eeab
2014-11-05 09:20:16 -05:00
Jorim Jaggi
3e9d9b5953 Fix janky in transition doze -> lockscreen
Also fix some unnecessary layer creation for dismiss button.

Bug: 18238168
Change-Id: I71989f2a24162e4453781c07e50d6c25fb380089
2014-11-05 15:08:15 +01:00
Tom Taylor
739117f1a1 am 7c570346: am 47419a44: am 192a3904: am 23fb2972: am d7044fe1: am b2e54c1b: am 75e7fbaa: am 37906e6e: am 44f6d0d5: am 4c5b16d7: am 66aa87ae: am 90743d64: am bfb7ffeb: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
automerge: 6209d4e

* commit '6209d4e4d8a8662628c53cd5e1944abf30293d87':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 13:59:39 +00:00
Tom Taylor
89f7eca148 am 52449372: am bc57a1f8: Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
automerge: db864e4

* commit 'db864e4ddc788a21db6793bbcb5f559131f20736':
  Externally Reported Moderate Security Issue: SQL Injection in WAPPushManager
2014-11-05 13:58:33 +00:00
John Spurlock
37bc92cc23 Zen: Create a new exit condition for "next alarm".
- If the user's next alarm is in the next 12 hrs, provide
this as an exit condition trigger for leaving none/priority.
- Don't display the next alarm condition when downtime is active.
- When the next-alarm exit condition is active, follow changes
to the next alarm, assuming it remains within the 12-hr window.
- Tweak the downtime condition strings to be consistent.

Bug: 16373455
Change-Id: I4020b91d323dead998e62d655132eca07438b148
2014-11-05 08:46:01 -05:00