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

211917 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
24ca6320b8 am 8db8bc63: Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev 
* commit '8db8bc63624bbd1d803e02571fa865f1f7fa584c':
  Skip drawing empty shapes to keep Apple JRE happy.
 2015-10-07 17:17:02 +00:00
Deepanshu Gupta
8db8bc6362 Merge "Skip drawing empty shapes to keep Apple JRE happy." into mnc-ub-dev 2015-10-07 17:08:30 +00:00
Alan Viverette
b46886f41d am f518ad0a: Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" 
* commit 'f518ad0a4941236b72b5d090320d4ab70ebbf26b':
  IndexOutOfBoundsException on addPreference in PreferenceGroup
 2015-10-07 16:54:26 +00:00
Alan Viverette
2235ecd5ec am f8ac5c34: Merge "Reset the setOnKeyListener callback when view is destroyed" 
* commit 'f8ac5c3469e53a7934731cfb854efb2975251ab4':
  Reset the setOnKeyListener callback when view is destroyed
 2015-10-07 16:54:17 +00:00
Alan Viverette
f5b97d9c0e am e229f5dd: Merge "Text size for empty view shall be styled according to theme" 
* commit 'e229f5ddde98f7c78ddc15a64587a684b5cf90a5':
  Text size for empty view shall be styled according to theme
 2015-10-07 16:41:30 +00:00
Alan Viverette
61d9d6be54 am 43f0fdc5: Merge "Remove hard-coded DrawSelectorOnTop on ListFragment\'s default ListView." 
* commit '43f0fdc5cd7ec4c4c03c7dbea8c045d2186f942c':
  Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView.
 2015-10-07 16:41:18 +00:00
Alan Viverette
f518ad0a49 Merge "IndexOutOfBoundsException on addPreference in PreferenceGroup" 2015-10-07 16:38:02 +00:00
Alan Viverette
f8ac5c3469 Merge "Reset the setOnKeyListener callback when view is destroyed" 2015-10-07 16:36:58 +00:00
Alan Viverette
8a0c8e78a7 am 6a06f12c: Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 
* commit '6a06f12c3fa6a84306dc17f60eb16cdc25bc34b5':
  Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams
 2015-10-07 16:34:35 +00:00
Alan Viverette
4524278bcb am 7de6ae15: Merge "To call TypedArray.recycle() when we are done with the array." 
* commit '7de6ae159e0652cabe57ea8814ce8633049644a2':
  To call TypedArray.recycle() when we are done with the array.
 2015-10-07 16:34:26 +00:00
Alan Viverette
e229f5ddde Merge "Text size for empty view shall be styled according to theme" 2015-10-07 16:30:36 +00:00
Deepanshu Gupta
4064e118e2 Skip drawing empty shapes to keep Apple JRE happy. 
Bug: http://b.android.com/178278
Change-Id: I693912678ed79e9c6690560b618a605da5a807c6
 2015-10-07 09:28:31 -07:00
Alan Viverette
43f0fdc5cd Merge "Remove hard-coded DrawSelectorOnTop on ListFragment's default ListView." 2015-10-07 16:27:26 +00:00
Alan Viverette
6a06f12c3f Merge "Frameworks/base: Fix AdapterViewAnimator.createOrReuseLayoutParams" 2015-10-07 16:23:36 +00:00
Alan Viverette
7de6ae159e Merge "To call TypedArray.recycle() when we are done with the array." 2015-10-07 16:22:36 +00:00
Diego Perez
4a36d98259 am 081cebf5: Implement Path.approximate and add PathMeasure support 
* commit '081cebf52b19e848c07fb781b35fa1f96695c311':
  Implement Path.approximate and add PathMeasure support
 2015-10-07 16:09:49 +00:00
Diego Perez
081cebf52b Implement Path.approximate and add PathMeasure support 
PathMeasure is needed to use the trimPath* properties in drawables.
These properties are used in the vector drawable for indeterminate
progress bars in Material so this is needed to be able to render them
correctly in the preview.
PathMeasure makes use of Path.approximate to calculate which segments to
paint.

Change-Id: Ic513f0a30a6aac0317f7c13cd75e9154c37405c8
 2015-10-07 17:04:26 +01:00
Eric Laurent
bbf804ca0d am c6865806: am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev 
* commit 'c6865806a4f76c44bc3cc55cff87cc85f0a48061':
  ZenModeHelper: fix cross deadlock with AudioService
 2015-10-07 13:56:41 +00:00
Eric Laurent
c6865806a4 am f5d3f960: am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev 
* commit 'f5d3f96001b42ff902022ebf4d97f9ab5e1f26f8':
  ZenModeHelper: fix cross deadlock with AudioService
 2015-10-07 13:50:02 +00:00
Eric Laurent
f5d3f96001 am 2a6f1d4a: Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev 
* commit '2a6f1d4af39a72abecf16cc0a95feda7431afc07':
  ZenModeHelper: fix cross deadlock with AudioService
 2015-10-07 13:46:48 +00:00
Eric Laurent
2a6f1d4af3 Merge "ZenModeHelper: fix cross deadlock with AudioService" into mnc-dr-dev 2015-10-07 13:39:51 +00:00
Selim Cinek
05f8818746 am ab8616cf: am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev 
* commit 'ab8616cf183cd408039be394fee709f4e0ee1303':
  Ambient display now comes up immediately when a notification comes in
 2015-10-06 02:17:58 +00:00
Selim Cinek
ab8616cf18 am 235a6911: am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev 
* commit '235a6911b0939adc598e4135e1f1c6fcda9ff169':
  Ambient display now comes up immediately when a notification comes in
 2015-10-06 02:11:51 +00:00
Selim Cinek
235a6911b0 am 714a61cd: Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev 
* commit '714a61cd586c789b18acfd0567cfea2b4ea170dd':
  Ambient display now comes up immediately when a notification comes in
 2015-10-06 02:06:20 +00:00
Selim Cinek
714a61cd58 Merge "Ambient display now comes up immediately when a notification comes in" into mnc-dr-dev 2015-10-06 01:59:50 +00:00
Adam Lesinski
ce8fc7b919 am 42efe5b3: am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit '42efe5b333c1f28127da57a44b39bd72cfbe81b2':
  Add anydpi to the providing-resources docs
 2015-10-06 01:11:20 +00:00
Adam Lesinski
42efe5b333 am c87996e5: am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit 'c87996e5382a5e9bc4ae400e1879d7c655d8b46a':
  Add anydpi to the providing-resources docs
 2015-10-06 01:03:49 +00:00
Adam Lesinski
c87996e538 am 8461f2fa: am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit '8461f2fa02c4c2ca2eef5bae391f1d1ff2c28593':
  Add anydpi to the providing-resources docs
 2015-10-06 00:57:43 +00:00
Adam Lesinski
8461f2fa02 am 46684d2c: Merge "Add anydpi to the providing-resources docs" into mnc-dev 
* commit '46684d2caeef93f43be260d996e925ea6e4147ea':
  Add anydpi to the providing-resources docs
 2015-10-06 00:51:13 +00:00
Jean-Michel Trivi
ec09010730 am 7f33f6e9: am 38b987ab: am 0155856a: Fix AudioService rotation helper thread 
* commit '7f33f6e92fa22f47af2f8d61883197013fae4c66':
  Fix AudioService rotation helper thread
 2015-10-06 00:27:18 +00:00
Jean-Michel Trivi
7f33f6e92f am 38b987ab: am 0155856a: Fix AudioService rotation helper thread 
* commit '38b987ab794f7e249a239db26dcf98ca8d2ff72b':
  Fix AudioService rotation helper thread
 2015-10-06 00:20:09 +00:00
Jean-Michel Trivi
38b987ab79 am 0155856a: Fix AudioService rotation helper thread 
* commit '0155856a1d1cb272d83b6175953dd7151fe65daa':
  Fix AudioService rotation helper thread
 2015-10-06 00:14:01 +00:00
Pirama Arumuga Nainar
6314f0bf9b am 456a4516: am a186456f: Safely handle interrupts during Thread.join() 
* commit '456a451668728a18198927fe93f19896929535d3':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:47:42 +00:00
Pirama Arumuga Nainar
456a451668 am a186456f: Safely handle interrupts during Thread.join() 
* commit 'a186456ff58a6091603956b6788565a273a29485':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:42:13 +00:00
Pirama Arumuga Nainar
6ac1aa3d4a am c9390c8b: am 46b51097: Merge "Safely handle interrupts during Thread.join()" 
* commit 'c9390c8baf0a41633c176d6d9a2d7e5d0c61c387':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:39:04 +00:00
Pirama Arumuga Nainar
c9390c8baf am 46b51097: Merge "Safely handle interrupts during Thread.join()" 
* commit '46b51097b92900866ac5b25762f622d3ceb1be5d':
  Safely handle interrupts during Thread.join()
 2015-10-05 23:33:38 +00:00
Pirama Arumuga Nainar
a186456ff5 Safely handle interrupts during Thread.join() 
Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
(cherry picked from commit 83461d73bc50d41f631e1db5c195d12b4eb9e6cf)
 2015-10-05 16:31:34 -07:00
Pirama Arumuga Nainar
46b51097b9 Merge "Safely handle interrupts during Thread.join()" 2015-10-05 23:27:10 +00:00
Deepanshu Gupta
034d10bf6c am e5d3baf2: LayoutLib: Fix bitmap scaling. 
* commit 'e5d3baf22f046d0a579128fc258f6b92e700ca02':
  LayoutLib: Fix bitmap scaling.
 2015-10-05 23:22:18 +00:00
Deepanshu Gupta
e5d3baf22f LayoutLib: Fix bitmap scaling. 
Bug: http://b.android.com/187939
Change-Id: I20bf61746e8af3bb87ba9cfcc9bf58854ac7c5be
 2015-10-05 16:08:54 -07:00
Pirama Arumuga Nainar
83461d73bc Safely handle interrupts during Thread.join() 
Interrupt current thread if InterruptedException is received during
Thread.join().  Also, log the interruption.

Change-Id: I452124915ea3f19610e6d4a3411d741f2f604af2
 2015-10-05 15:45:47 -07:00
Adam Lesinski
46684d2cae Merge "Add anydpi to the providing-resources docs" into mnc-dev 2015-10-05 22:31:22 +00:00
Jean-Michel Trivi
0155856a1d Fix AudioService rotation helper thread 
Fix a race condition where the wait index can be incremented inbetween
  the while() loop and the lock
Fix when updateOrientation() is called: after the sleep, otherwise
  the last sleep is useless.

Bug 24677424

Change-Id: I03770a0fc8af57f4696ebee7e9c9110e17c55a24
 2015-10-05 15:26:21 -07:00
Adam Lesinski
4cad00b696 Add anydpi to the providing-resources docs 
Change-Id: Ic108d9da2e39b9f8581311fe610a1959a24a732f
 2015-10-05 19:39:40 +00:00
Nick Armstrong-Crews
dd62fb4392 am f107709f: am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 
* commit 'f107709fb3f884f904deb1f3c09a88dd411ea30d':
  Fix the logging of wake time saved by Ungaze.
 2015-10-05 18:34:57 +00:00
Nick Armstrong-Crews
f107709fb3 am 13a71fbc: Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 
* commit '13a71fbcf056d34421a7740a75e2c8dc11d30eb6':
  Fix the logging of wake time saved by Ungaze.
 2015-10-05 18:29:24 +00:00
Nick Armstrong-Crews
13a71fbcf0 Merge "Fix the logging of wake time saved by Ungaze." into cw-e-dev 2015-10-05 18:23:12 +00:00
Nick Armstrong-Crews
024872ea70 Fix the logging of wake time saved by Ungaze. 
The logging of saved time was erroneously being called more than once
per wake period. Moved the logging logic to be called from
finishWakefulnessChange(), which is only called once per wake period.

Change-Id: I268ef44edce5807644fcc8fb0dcaa1a96cae6c9e
 2015-10-05 18:22:54 +00:00
Eric Laurent
e0ced4da19 ZenModeHelper: fix cross deadlock with AudioService 
Processing ZenModeHelper.setConfig() synchronously in
ZenModeConditions.onConditionChanged() can cause a cross deadlock between
ConditionProviders.mMutex and AudioService.mSettingsLock.

Add a method to set Zen mode config asynchronously.

Bug: 24528290.
Change-Id: I9c1701ca6bef084527821175d84002b612241995
 2015-10-05 10:43:52 -07:00
Geoff Mendal
5c6fff5431 am ad111b65: (-s ours) am 3daab8e7: (-s ours) am faebbe82: (-s ours) Import translations. DO NOT MERGE 
* commit 'ad111b653251e0af212da964d56112cda7d628d9':
  Import translations. DO NOT MERGE
 2015-10-05 14:16:19 +00:00