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

18255 Commits

Author SHA1 Message Date
Daniel Sandler
1d49a967ef am c6fa5914: am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit 'c6fa59145e690f8140fda9d79934f1b66ea354d3':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:21:09 +00:00
Daniel Sandler
c6fa59145e am 847bdf00: am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit '847bdf0093f649a169940fb93249e2beb67f6b45':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:13:47 +00:00
Daniel Sandler
847bdf0093 am 5b40e225: Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 
* commit '5b40e2253e82d46838c88e6c52dee276a781d593':
  Make the vertical navbar 48dp like the horizontal one.
 2015-09-10 01:04:39 +00:00
Daniel Sandler
5b40e2253e Merge "Make the vertical navbar 48dp like the horizontal one." into mnc-dr-dev 2015-09-10 00:53:14 +00:00
Jorim Jaggi
35a88c065e am f27035d9: am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit 'f27035d9ee506e4f817ccd49ab60df541c25bbe7':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:21:30 +00:00
Jorim Jaggi
f27035d9ee am 131d541a: am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit '131d541ae1ca41aacf751f6a6562f4f031a4ab35':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:12:21 +00:00
Jorim Jaggi
131d541ae1 am 16093fe3: Revert "Disable fingerprint after force lock" 
* commit '16093fe3f0d824731a53a264a132504deb08421a':
  Revert "Disable fingerprint after force lock"
 2015-09-10 00:05:38 +00:00
Jorim Jaggi
16093fe3f0 Revert "Disable fingerprint after force lock" 
Bug: 23827042
This reverts commit 0cb50efdc2d3ecaa9f1b2163109e8fff1b23f0e7.

Change-Id: I40251500b2dcf95e63ce39a768e11a50b26fb923
 2015-09-10 00:00:29 +00:00
Selim Cinek
26a11c2856 am d428dc4a: am 12fdaf85: am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit 'd428dc4a326f1a928875ecda1c12eef445473dc5':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:30:25 +00:00
Selim Cinek
d428dc4a32 am 12fdaf85: am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit '12fdaf8589813065d2e8b9873196471ed38c7b80':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:23:20 +00:00
Selim Cinek
12fdaf8589 am a4fca2c7: Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 
* commit 'a4fca2c7255367b96fc8012b0fcb62a71343e1ff':
  Fixed a racecondition where the camera would not launch
 2015-09-09 22:15:55 +00:00
Selim Cinek
a4fca2c725 Merge "Fixed a racecondition where the camera would not launch" into mnc-dr-dev 2015-09-09 22:07:02 +00:00
Selim Cinek
1b6f819a64 Fixed a racecondition where the camera would not launch 
If the gesture was detected while turning on, the gesture
would not launch.

Bug: 23636271
Change-Id: I166759a55137163be0c3f38fe8d1dc0c18977e11
 2015-09-08 18:10:53 -07:00
Zhentao Sun
d6a94f495a am aded82ce: am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit 'aded82ce3134b7f8a2db7e4e7462e16e0428ef96':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:59:39 +00:00
Zhentao Sun
aded82ce31 am 6d8bdb50: am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit '6d8bdb50b0cd26629a18ae3124fb29673069493b':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:48:18 +00:00
Zhentao Sun
6d8bdb50b0 am 5536d447: Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 
* commit '5536d4477572e437c95111630d5c2723350d99a5':
  Changed the vibration duration from 1s to 750ms.
 2015-09-09 00:38:48 +00:00
Zhentao Sun
5536d44775 Merge "Changed the vibration duration from 1s to 750ms." into mnc-dr-dev 2015-09-09 00:29:03 +00:00
Jorim Jaggi
6198a70371 am 2a198de7: am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard 
* commit '2a198de79d0d5b93168a3fccd45977f5731b3451':
  Cancel animation when hiding Keyguard
 2015-09-09 00:28:48 +00:00
Jorim Jaggi
2a198de79d am 975ceef6: am 52429b4a: Cancel animation when hiding Keyguard 
* commit '975ceef616aac6de561c4a4e1d82a636f5cf37e3':
  Cancel animation when hiding Keyguard
 2015-09-09 00:19:24 +00:00
Selim Cinek
09fd58fd2c am 89d80472: am ad69e53e: am edf47486: Removed the secure camera launcher 
* commit '89d804727473009fe8e53a0040f0ac70b3bd221a':
  Removed the secure camera launcher
 2015-09-09 00:16:04 +00:00
Jorim Jaggi
975ceef616 am 52429b4a: Cancel animation when hiding Keyguard 
* commit '52429b4a8b9be501f52df62e77c3e4bbb5bf0c3f':
  Cancel animation when hiding Keyguard
 2015-09-09 00:12:31 +00:00
Selim Cinek
89d8047274 am ad69e53e: am edf47486: Removed the secure camera launcher 
* commit 'ad69e53e7ee3fdaaff676ae5d0e99f6b267675f9':
  Removed the secure camera launcher
 2015-09-09 00:08:11 +00:00
Jorim Jaggi
52429b4a8b Cancel animation when hiding Keyguard 
So we don't end up in a wrong state.

Bug: 23692022
Change-Id: If40eb66499c95b82d86873dbbd6ccc64468373b2
 2015-09-09 00:04:23 +00:00
Selim Cinek
ad69e53e7e am edf47486: Removed the secure camera launcher 
* commit 'edf47486507f5edad1d1d8e6091b9a82f9e56930':
  Removed the secure camera launcher
 2015-09-08 23:58:58 +00:00
Selim Cinek
edf4748650 Removed the secure camera launcher 
With Android M, the system correctly handles camera arbitration
and therefore the secure camera launcher was only adding delay.

Bug: 23713450
Change-Id: Icd5e7883f3560bfd0c9b5f7bd93675847949469b
 2015-09-08 23:49:59 +00:00
Zhentao Sun
e9cb08209f Changed the vibration duration from 1s to 750ms. 
Fixed b/23727634.

Change-Id: Ie03b26f7b8faee8d61d772041351729995f7088c
 2015-09-08 15:41:25 -07:00
Jorim Jaggi
ae44c2857d am dee90112: am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit 'dee90112ce6d47a5740fd60449f948c37a8956e4':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 21:08:40 +00:00
Jorim Jaggi
dee90112ce am 10352f7a: am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit '10352f7a48433b5b76cd5d35a5eec6c3df203a1f':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 20:58:56 +00:00
Jorim Jaggi
10352f7a48 am 5e8e1c63: Do not expand notifications with expand gesture when disallowed 
* commit '5e8e1c63774da8c013fad18a63eac691cdc9646f':
  Do not expand notifications with expand gesture when disallowed
 2015-09-08 20:50:53 +00:00
Jorim Jaggi
5e8e1c6377 Do not expand notifications with expand gesture when disallowed 
Bug: 23596083
Change-Id: Iba88abce317e9d3a9c675a846261f35b1daee22a
 2015-09-08 18:51:00 +00:00
Geoff Mendal
9f3e169c3a Import translations. DO NOT MERGE 
Change-Id: Ifcce22af4c5736023ed78b34be3a420ec6c6738d
Auto-generated-cl: translation import
 2015-09-07 08:31:05 -07:00
Andre Eisenbach
b013468bec am f1ed1fdb: am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 
* commit 'f1ed1fdb4578c205ebe2d1af6f49512219506254':
  Bluetooth: Fix profile auto-connect logic
 2015-09-04 02:22:11 +00:00
Andre Eisenbach
f1ed1fdb45 am 1b03cd8e: am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 
* commit '1b03cd8e1b79280e892f81709ced42b990a8905d':
  Bluetooth: Fix profile auto-connect logic
 2015-09-04 00:28:09 +00:00
Andre Eisenbach
1b03cd8e1b am 1d5e2e29: Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 
* commit '1d5e2e291d4c3fbcde1425af74644a24c94e1577':
  Bluetooth: Fix profile auto-connect logic
 2015-09-04 00:12:33 +00:00
Andre Eisenbach
1d5e2e291d Merge "Bluetooth: Fix profile auto-connect logic" into mnc-dr-dev 2015-09-04 00:02:57 +00:00
Andre Eisenbach
7be83c578c Bluetooth: Fix profile auto-connect logic 
The fix in commit 05e08c3a2f27d5027b34e81b7c0a67e4da7341f6 caused a
duplicate connect message to be sent to A2DP devices (and others),
causing the A2DP state machine to disconnect a device shortly after
connecting it.

This patch reverts the relevant part of commit 05e06c that causes the
faulty auto-connect behaviour.

Bug: 22128169
Change-Id: Ie0dadd5c9583bf2b64a8434a2a3603cb749b21d0
 2015-09-03 15:20:09 -07:00
Adrian Roos
123fb19dd1 am 95179ad4: am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '95179ad4be0377dd9fd35818145f705bcded0d28':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 20:07:25 +00:00
Adrian Roos
95179ad4be am 54ceea19: am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '54ceea195bdecfcc9e4e11088aa1bb0b9bb5a481':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 19:57:58 +00:00
Adrian Roos
54ceea195b am 95200e6f: Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 
* commit '95200e6f4eb34818ac0b652167cffacfcfb4fdff':
  Poke fingerprint timeout when vold password is correct
 2015-09-03 19:46:41 +00:00
Adrian Roos
95200e6f4e Merge "Poke fingerprint timeout when vold password is correct" into mnc-dr-dev 2015-09-03 19:41:22 +00:00
Adrian Roos
f6d51acec6 Poke fingerprint timeout when vold password is correct 
Bug: 23718313
Change-Id: I6c88fbba9ae460594b8e2f1a77c6545b305e5813
 2015-09-03 12:34:11 -07:00
Adrian Roos
4008702700 am 4eb81345: am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit '4eb81345da21efc2b9731cb1969704081064690c':
  Show face unlock even when fingerprint is running
 2015-09-03 19:29:42 +00:00
Adrian Roos
4eb81345da am b90f1de2: am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit 'b90f1de216ec8be27eebd17b5f3c6a87ee084e75':
  Show face unlock even when fingerprint is running
 2015-09-03 19:17:36 +00:00
Adrian Roos
b90f1de216 am 1b5cc3a4: Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 
* commit '1b5cc3a4ba46029b798adb9e362d87df5673bc52':
  Show face unlock even when fingerprint is running
 2015-09-03 19:08:53 +00:00
Adrian Roos
1b5cc3a4ba Merge "Show face unlock even when fingerprint is running" into mnc-dr-dev 2015-09-03 18:59:37 +00:00
Dan Sandler
c263a08663 Make the vertical navbar 48dp like the horizontal one. 
When the navigation bar was originally introduced to phones
(in change Ic613a335) we wanted it to stick to the same spot
on the display so that it felt as much as possible like a
physical button array; pressing the same fingertip-sized
spot on the glass should always invoke BACK, etc. This meant
flipping the nav bar to a vertical orientation when the
phone was in landscape, and then juggling around the window
insets and other system windows to make room for it.

For reasons that are now lost to time, in that original
implementation we made the vertical navigation bar narrower:
42dp (versus 48dp for the horizontal navigation bar, which
incidentally is always horizontal on tablet-type devices).
Nobody really noticed (except app developers looking to
hardcode this value instead of just using fitSystemWindows
or the new WindowInsets).

Here we finally make the navigation bars match perfectly in
portrait and landscape.

Bug: 23724209
Change-Id: I861be84b41c6a227d269469686c8c66a32029f1d
 2015-09-03 10:51:57 -04:00
Jorim Jaggi
d05c6dd38c am b991034d: am ac2b543b: am 304e3772: Merge "Fix wrong mode for fingerprint unlock when bouncer not showing" into mnc-dr-dev 
* commit 'b991034d3e45276f03f719ba24c98daf65870407':
  Fix wrong mode for fingerprint unlock when bouncer not showing
 2015-09-03 06:22:48 +00:00
Tim Kilbourn
fca744cef6 am 573cdc42: am 38ae1196: am 7cd6aaaf: am ee72f99d: Merge "Allow shell to disable keyguard when not secure" into mnc-dev 
* commit '573cdc420b2d7f8d4636a949458a59f1937d62d1':
  Allow shell to disable keyguard when not secure
 2015-09-03 06:22:06 +00:00
Selim Cinek
9679cb35f6 am 4997cd36: am 9e30e202: am 2af5010a: am 36a75d6a: Merge "Fixed a crash in the notification group manager" into mnc-dev 
* commit '4997cd364deeeb03edfe19e9c3959bd694970ec7':
  Fixed a crash in the notification group manager
 2015-09-03 04:24:09 +00:00
Selim Cinek
63210491b8 am 260ae8e5: am 3e64c75f: am 146dc265: am 9a2d5742: Merge "Fixed when the notification effects are being cleared" into mnc-dev 
* commit '260ae8e56c6c3f6acd9290a843f6cfe27cdad6a7':
  Fixed when the notification effects are being cleared
 2015-09-03 04:23:28 +00:00