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

219492 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeffrey Vander Stoep
b08949151f am 6b6d1a30: am a2e511d6: am 8b626548: Merge "Pass privapp specifier for selinux labeling" 
* commit '6b6d1a3076ad150365c31936b49a8277d476e4d8':
  Pass privapp specifier for selinux labeling
 2015-10-14 21:48:32 +00:00
Jeffrey Vander Stoep
6b6d1a3076 am a2e511d6: am 8b626548: Merge "Pass privapp specifier for selinux labeling" 
* commit 'a2e511d6ca6c3b3d465bbf2fe98f17e210c676d0':
  Pass privapp specifier for selinux labeling
 2015-10-14 21:44:31 +00:00
Jeffrey Vander Stoep
a2e511d6ca am 8b626548: Merge "Pass privapp specifier for selinux labeling" 
* commit '8b62654855b105e5ff7628107691309a63effe0c':
  Pass privapp specifier for selinux labeling
 2015-10-14 21:38:41 +00:00
Jeffrey Vander Stoep
8b62654855 Merge "Pass privapp specifier for selinux labeling" 2015-10-14 21:33:59 +00:00
Roozbeh Pournader
05c0e09260 am 6c04ad8a: am 58de2861: am 6598022d: am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 
* commit '6c04ad8a6afd8856d158ecf243e51c1ea18a6ef5':
  Make Hyphenator#get() return an object.
 2015-10-14 21:28:18 +00:00
Roozbeh Pournader
6c04ad8a6a am 58de2861: am 6598022d: am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 
* commit '58de2861c0825eebcd8e56d2f747e93ebd03d4ae':
  Make Hyphenator#get() return an object.
 2015-10-14 21:24:12 +00:00
Roozbeh Pournader
58de2861c0 am 6598022d: am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 
* commit '6598022de5447691be3551d86ad31f2e3fe0e567':
  Make Hyphenator#get() return an object.
 2015-10-14 21:18:39 +00:00
Roozbeh Pournader
6598022de5 am bdf952aa: Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 
* commit 'bdf952aab732ebcaab0d785cd02ffb83e3738e21':
  Make Hyphenator#get() return an object.
 2015-10-14 21:12:05 +00:00
Roozbeh Pournader
bdf952aab7 Merge "Make Hyphenator#get() return an object." into mnc-dr-dev 2015-10-14 21:07:13 +00:00
Winson Chung
1723305878 am f3eb33f4: am 1c36cfd2: am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'f3eb33f437948118a9b08767f18b76f6f83ca52d':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 21:06:25 +00:00
Julia Reynolds
d772af29d6 Merge "Add 'until next alarm' option to QS zen panel." 2015-10-14 21:00:58 +00:00
Winson Chung
f3eb33f437 am 1c36cfd2: am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit '1c36cfd2102a136f80daef6bf1011503b4e5cca9':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:58:48 +00:00
Winson Chung
1c36cfd210 am d8fed39f: am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'd8fed39f3c53cc7764e69a2a10ad3ece718179a2':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:52:20 +00:00
Winson Chung
d8fed39f3c am c7a873e3: Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 
* commit 'c7a873e356e1caa815c1830ae37a6ffb3ecf480f':
  Ensure we update the active pointer id on pointer up/down.
 2015-10-14 20:45:35 +00:00
Winson Chung
c7a873e356 Merge "Ensure we update the active pointer id on pointer up/down." into mnc-dr-dev 2015-10-14 20:42:21 +00:00
Filip Gruszczynski
b3a54f91fd Merge "Change WindowState.mShownFrame to WindowState.mShownPosition." 2015-10-14 19:18:11 +00:00
Filip Gruszczynski
2a6a2c2de8 Change WindowState.mShownFrame to WindowState.mShownPosition. 
We never use this field as a rectangle, we only depend on its left-top
corner. Using a frame is only confusing about the purpose of this field.

Change-Id: I5d6e6321db4fa3203bb7e0f1975ae6ddd1ec09bb
 2015-10-14 12:17:11 -07:00
Roozbeh Pournader
0453112de6 Make Hyphenator#get() return an object. 
Previously, a native pointer was returned. After this change, callers
should call getNativePtr() if they want to get the native pointer instead.

Bug: 21492297
Bug: 24570591
Change-Id: I745bd88e6e8c86078fffb07f90f8d8f24215410c
(cherry picked from commit e7eac6f540b09892172edd5b584605ea90f5a1ba)
 2015-10-14 19:10:44 +00:00
Doris Liu
96a0cb21ba Merge "Test ValueAnimator when duration scale is set to 0" 2015-10-14 18:13:30 +00:00
Doris Liu
a0942e2121 Test ValueAnimator when duration scale is set to 0 
Change-Id: I33a90bc39d3b451696752eae02edfacb4ddfd80e
 2015-10-14 11:02:25 -07:00
Erik Kline
12ff46df1a am 51eb6e14: am 9c8abd1d: am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 
* commit '51eb6e149581f04802784f972dfc3794a64a1788':
  Don't crash if an invalid always-on VPN profile is configured.
 2015-10-14 18:01:48 +00:00
Erik Kline
51eb6e1495 am 9c8abd1d: am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 
* commit '9c8abd1d7ab205047a7e0f131eca24b2f3019d5d':
  Don't crash if an invalid always-on VPN profile is configured.
 2015-10-14 17:55:13 +00:00
Erik Kline
9c8abd1d7a am f23eece2: am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 
* commit 'f23eece2006f04785fa1b873afc66f01bb238e0b':
  Don't crash if an invalid always-on VPN profile is configured.
 2015-10-14 17:48:48 +00:00
Erik Kline
f23eece200 am b7e722b8: Merge "Don\'t crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 
* commit 'b7e722b88fab8b67f8a2ef54a7acb8c6672b6f46':
  Don't crash if an invalid always-on VPN profile is configured.
 2015-10-14 17:42:14 +00:00
Seigo Nonaka
e95ce0fdb7 Merge "Dump mSupportsSwitchingToNextInputMethod value" 2015-10-14 17:38:43 +00:00
Erik Kline
b7e722b88f Merge "Don't crash if an invalid always-on VPN profile is configured." into mnc-dr-dev 2015-10-14 17:37:57 +00:00
Doris Liu
d1bf9f0054 Merge "New public API for calculating the total duration of an animation" 2015-10-14 17:18:37 +00:00
Julia Reynolds
0842fe87b2 Add 'until next alarm' option to QS zen panel. 
Unlike the implementation in LMR1, this is a countdown condition
(a countdown until the time of what was the next alarm when the
rule was created). The rule will not change if alarms change.
Also, alarms up to 7 days in the future will be considered.

Bug: 21648799
Change-Id: Id7fa9dbdbad1539e4da19b1d0e0c4395bb13e6cb
 2015-10-14 13:12:52 -04:00
Filip Gruszczynski
2c35eb81f3 Merge "Keep freeform window surface translucent during resize." 2015-10-14 16:53:56 +00:00
Filip Gruszczynski
2dfcf5ce2e Keep freeform window surface translucent during resize. 
Freeform window surfaces are translucent because most of the time they
have shadows. During a resize we stop displaying the shadow, which
might change the surface opacity from translucent to opaque. This change
only happens if the activity gets recreated during the resize, as this
triggers recalculation of the necessary opacity. If configuration change
happens the relayout will now contain new, opaque pixel format and cause
the recreation. The second blink will happen after we finish resizing,
as the surface needs to become translucent again.

Bug: 24668341
Change-Id: I450323276c49f176f0f6dfb3b21a5f6d742a8418
 2015-10-14 09:22:42 -07:00
Geoff Mendal
40cc51b7a5 Merge "Import translations. DO NOT MERGE" 2015-10-14 16:09:59 +00:00
Geoff Mendal
582598477a Import translations. DO NOT MERGE 
Change-Id: I471a04797e169a5fc481526e8aa9c3ec915639f0
Auto-generated-cl: translation import
 2015-10-14 11:07:10 -05:00
Geoff Mendal
9f1181e968 am 82c0f1c4: (-s ours) am 62679a1f: (-s ours) am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit '82c0f1c413273ddf6e04412f4502682dc81a6a20':
  Import translations. DO NOT MERGE
 2015-10-14 14:22:31 +00:00
Geoff Mendal
82c0f1c413 am 62679a1f: (-s ours) am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit '62679a1f6d04a554e452b5126ccb784c3870a035':
  Import translations. DO NOT MERGE
 2015-10-14 14:17:05 +00:00
Geoff Mendal
62679a1f6d am c095272a: (-s ours) am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit 'c095272a807880bca2848b102438ec9a13dec749':
  Import translations. DO NOT MERGE
 2015-10-14 14:13:42 +00:00
Geoff Mendal
c095272a80 am 7013f0c8: (-s ours) Import translations. DO NOT MERGE 
* commit '7013f0c8f2adcc14acd052f4066827ad31f17195':
  Import translations. DO NOT MERGE
 2015-10-14 14:07:29 +00:00
Geoff Mendal
7013f0c8f2 Import translations. DO NOT MERGE 
Change-Id: Iefcade8293a0fa228423e3eef730910af4a76853
Auto-generated-cl: translation import
 2015-10-14 06:59:48 -07:00
Geoff Mendal
a4f261cf23 Import translations. DO NOT MERGE 
Change-Id: I9a9548a9eaf6b7a0dd4909853c257ef97aedba5a
Auto-generated-cl: translation import
 2015-10-14 05:50:48 -07:00
Seigo Nonaka
d742bfda06 Dump mSupportsSwitchingToNextInputMethod value 
Bug: 24280547
Change-Id: Ibfdf09a0a2b3e907ae3e900ee541437725650463
 2015-10-14 19:52:32 +09:00
Jun Mukai
c90a97c67b Merge "Fix the condition of hovering at the edge." 2015-10-14 08:20:45 +00:00
Jun Mukai
9086ca9d1b Merge "Fix the logic for mouse event handling." 2015-10-14 07:07:52 +00:00
Matthew Williams
5e6bbdf52f am 70facd58: am f23e617b: am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '70facd5836cee17ce4b344bd60a84b1490564c4d':
  Correctly reschedule failed periodic
 2015-10-14 03:20:39 +00:00
Matthew Williams
70facd5836 am f23e617b: am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit 'f23e617bcd8090ef96a5449907c4db39f7efb6a5':
  Correctly reschedule failed periodic
 2015-10-14 03:16:32 +00:00
Matthew Williams
f23e617bcd am 6c8ddfcc: am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '6c8ddfcc5a34af2dd3c28c7b1c46ab51967b3213':
  Correctly reschedule failed periodic
 2015-10-14 03:10:08 +00:00
Matthew Williams
6c8ddfcc5a am 40ec3a92: Merge "Correctly reschedule failed periodic" into mnc-dr-dev 
* commit '40ec3a924663c831e47f5e851b2978b96ff428fb':
  Correctly reschedule failed periodic
 2015-10-14 03:03:42 +00:00
Matthew Williams
40ec3a9246 Merge "Correctly reschedule failed periodic" into mnc-dr-dev 2015-10-14 03:00:16 +00:00
Jean-Michel Trivi
3126bcbbf3 am 6135f320: am acb867f1: am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit '6135f32004c3e1e20bb4d2003c7380b5192f95da':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:37:59 +00:00
Jean-Michel Trivi
6135f32004 am acb867f1: am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'acb867f17c34828d14b3c71186253a269d85707c':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:32:38 +00:00
Jean-Michel Trivi
acb867f17c am bf76eb7c: am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'bf76eb7cdaf1e2199217354bd6cbeaf37657486f':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:27:30 +00:00
Jean-Michel Trivi
bf76eb7cda am a2ed535c: NotificationPlayer supports MediaPlayer errors 
* commit 'a2ed535c67a6c6fbe2ae4a086193ad68711e2129':
  NotificationPlayer supports MediaPlayer errors
 2015-10-14 01:22:32 +00:00