OSDN Git Service
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:26 +0000 (01:43 +0000)]
am
8cafc782: am
13670bc6: (-s ours) am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
8cafc782d8763b0bc9044c21595026707828596b':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:22 +0000 (01:43 +0000)]
am
57185503: am
6dc8bab9: (-s ours) am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
57185503a11d8509a432c673a1cb38d5efd6aacf':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:17 +0000 (01:43 +0000)]
am
e779dec0: am
bf7907bf: (-s ours) am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
e779dec0ab98637a4269bcd2a8cdd9c0e2e01bf2':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:13 +0000 (01:43 +0000)]
am
42872f73: am
f2bf5470: (-s ours) am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
42872f7342f49a58ecee62d547e8a074b9321871':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:05 +0000 (01:43 +0000)]
am
35f6976e: am
7ec7805a: (-s ours) am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
35f6976e10d04dd6fc6576895689b3327250cdc4':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:43:00 +0000 (01:43 +0000)]
am
dc78e108: am
594939fc: (-s ours) am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
dc78e1080ed5c37b3ed8b633c025421d584a0aed':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:56 +0000 (01:42 +0000)]
am
0ae85775: am
bd343c1f: (-s ours) am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
0ae857751caf4ecec16e164ca7a0e5a35eab8764':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:52 +0000 (01:42 +0000)]
am
7d7f0f47: am
9b1ac269: (-s ours) am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
7d7f0f4731b9908117cf157ee3fbf992d9e09c6d':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:49 +0000 (01:42 +0000)]
am
fcc62127: am
6b7f9ae6: (-s ours) am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
fcc6212778590a9d22379f21b414c4ee1e1bf7c2':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:45 +0000 (01:42 +0000)]
am
e3040e9a: am
d6363d86: (-s ours) am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
e3040e9a737b442a7860eaaafb691c780f3d0ce6':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:41 +0000 (01:42 +0000)]
am
56c72f4c: am
5b886bb0: (-s ours) am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
56c72f4c50556fc3072460fedf83145d73eb6f96':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:37 +0000 (01:42 +0000)]
am
720d677f: am
aae9c930: (-s ours) am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
720d677fc29fdaaa8aed14f7eb1f0137cec5c3e9':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:32 +0000 (01:42 +0000)]
am
ef319302: am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
ef31930253fe9c0b0cc7d42c0f11181ffe69ea1b':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:26 +0000 (01:42 +0000)]
am
a6d71a2c: am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
a6d71a2c37fbf4357ddb084ed5050c27826514ac':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:22 +0000 (01:42 +0000)]
am
df44516b: am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
df44516b78b6dd3c2ae5849a07a6e07e9302b668':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:18 +0000 (01:42 +0000)]
am
bf019327: am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
bf01932797aa5ae8d94643b7861b45c89364b2ba':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:42:13 +0000 (01:42 +0000)]
am
ef284578: am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
ef284578ee3b77890bcb45bbd1f89a5d244bced1':
Remove kxml dependency [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:30:02 +0000 (01:30 +0000)]
am
13670bc6: (-s ours) am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
13670bc6dea025bfd9b35c604547fe2b0bd2047a':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:50 +0000 (01:29 +0000)]
am
6dc8bab9: (-s ours) am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
6dc8bab993c55d239bc42822eb9a8003f7803dfd':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:43 +0000 (01:29 +0000)]
am
bf7907bf: (-s ours) am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
bf7907bfc855478c16650e77a7a8a72370c6f35f':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:36 +0000 (01:29 +0000)]
am
f2bf5470: (-s ours) am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
f2bf5470a3ec1f5eb8584e0d7c1a8eb3c08d8d20':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:30 +0000 (01:29 +0000)]
am
7ec7805a: (-s ours) am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
7ec7805a50893be6242a41de01299cb1de44b461':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:19 +0000 (01:29 +0000)]
am
594939fc: (-s ours) am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
594939fc07e83445ef4507df6fcd457069352189':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:10 +0000 (01:29 +0000)]
am
bd343c1f: (-s ours) am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
bd343c1fbf05087094e1dbf40048137e3a3e08fa':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:29:05 +0000 (01:29 +0000)]
am
9b1ac269: (-s ours) am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
9b1ac26921b9c7aaf3c43c8094d81cfabc5cc085':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:58 +0000 (01:28 +0000)]
am
6b7f9ae6: (-s ours) am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
6b7f9ae6f56375b1bd84f31206cac179e09b8146':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:48 +0000 (01:28 +0000)]
am
d6363d86: (-s ours) am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
d6363d86060126e20b913dcd6db3c5cc2019804c':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:42 +0000 (01:28 +0000)]
am
5b886bb0: (-s ours) am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
5b886bb08ff59e405c365db51abf71999e8f6c93':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:35 +0000 (01:28 +0000)]
am
aae9c930: (-s ours) am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
aae9c9309ca5155124f740b10a40c68b09ed0ce6':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:21 +0000 (01:28 +0000)]
am
522e67e4: (-s ours) am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
522e67e4ac600fb19c18f55f0e51096af9ae37d3':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:14 +0000 (01:28 +0000)]
am
8df6131a: (-s ours) am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
8df6131ac103ac58ab03f6aae01e136df3c6a7b1':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:28:07 +0000 (01:28 +0000)]
am
59f026e9: (-s ours) am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
59f026e937e749a77f12614010f8be05123f4837':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:52 +0000 (01:27 +0000)]
am
b44f7fda: (-s ours) am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
b44f7fda759394b6447f19c0b3c9a3fdf8f9cd95':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Thu, 27 Aug 2015 01:27:45 +0000 (01:27 +0000)]
am
78d77bc3: (-s ours) am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
78d77bc379f42dfe020cf0719ceae14174cf1c33':
Remove kxml dependency [DO NOT MERGE]
Tim Kilbourn [Thu, 27 Aug 2015 01:15:58 +0000 (01:15 +0000)]
am
8f1ea834: Handle the -a flag for dumpsys appops.
* commit '
8f1ea834f9af5ccf6cea1f529f63e727cd13b6a8':
Handle the -a flag for dumpsys appops.
Tim Kilbourn [Wed, 26 Aug 2015 22:07:37 +0000 (15:07 -0700)]
Handle the -a flag for dumpsys appops.
Bug:
23017449
Change-Id: I6ce9ac368e2739153867c246893eb544d052834f
Roshan Pius [Wed, 26 Aug 2015 21:15:16 +0000 (21:15 +0000)]
Merge "Reformat local Korean numbers in national format." into mnc-dr-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 21:09:50 +0000 (21:09 +0000)]
Merge "Disable AR HW when client binder dies." into mnc-dr-dev
Alan Viverette [Wed, 26 Aug 2015 20:45:26 +0000 (20:45 +0000)]
am
95137857: Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
* commit '
9513785715e2325ee3a3269fbfe7b1f4409eff5c':
Avoid NPE when getPositionForView() is called on detached view
Alan Viverette [Wed, 26 Aug 2015 20:38:53 +0000 (20:38 +0000)]
Merge "Avoid NPE when getPositionForView() is called on detached view" into mnc-dev
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:52 +0000 (20:19 +0000)]
am
669e4969: am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
669e4969a7245cf9d1febc5d4e67a0f2063e87fb':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:39 +0000 (20:19 +0000)]
am
c0fd1316: am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
c0fd131642f21eabec570147cf9f4116c900e8a0':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:32 +0000 (20:19 +0000)]
am
6b836cd0: am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
6b836cd06b1a2ebe5d31336486bb1b54e42439df':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:23 +0000 (20:19 +0000)]
am
91e456d2: am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
91e456d235256c385a7da1e45f098386bc68e86a':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:13 +0000 (20:19 +0000)]
am
8a6295e8: am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
8a6295e82a2aed91eb26fa15479bf295c2bd79d7':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:19:05 +0000 (20:19 +0000)]
am
66d5f24d: am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
66d5f24df0c3627028812ee23da8d4f08cc83e5c':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:54 +0000 (20:18 +0000)]
am
b32e44ff: am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
b32e44ff0c5fd410720bb28c87bc9cea83556edf':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:47 +0000 (20:18 +0000)]
am
1754824c: am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
1754824c2835d6f3a17c4a2c0ab668991797fcf9':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:34 +0000 (20:18 +0000)]
am
678f0ea2: am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
678f0ea2ba47f06387670e9f75b13637a6446899':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:27 +0000 (20:18 +0000)]
am
2e57c1e2: am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
2e57c1e23f43bb0ede6280720559ccc1e866024b':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:15 +0000 (20:18 +0000)]
am
899daf75: am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
899daf759e02bef0de14dc1a14b96b4d71f0b9fc':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:09 +0000 (20:18 +0000)]
am
2f50403f: am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
2f50403fe0a8a035757b047af00c7520fadb9015':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:18:04 +0000 (20:18 +0000)]
am
de3ac8f9: am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
de3ac8f9fc5987ac1f1223da02b4275fdbae3d56':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:51 +0000 (20:17 +0000)]
am
50e1406a: am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
50e1406a4ad668179a9a3d28c58d68c0eee44237':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:46 +0000 (20:17 +0000)]
am
81990c3f: am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
81990c3f988369c755590288b93508e30024c56c':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:40 +0000 (20:17 +0000)]
am
0a07bb95: am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
0a07bb95a1dd94c3457860a934d3ee546919cff2':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 20:17:34 +0000 (20:17 +0000)]
am
bbbdc2ad: am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
bbbdc2ad8939c28828a8441c0b24812c53a9eb66':
Remove kxml dependency [DO NOT MERGE]
Alan Viverette [Wed, 26 Aug 2015 19:21:39 +0000 (15:21 -0400)]
Avoid NPE when getPositionForView() is called on detached view
Bug:
23557674
Change-Id: I76cb5f06081b2ac4c8f535df8d1a0aee17d2bb20
Chien-Yu Chen [Wed, 26 Aug 2015 19:07:52 +0000 (19:07 +0000)]
am
e4c3ff2f: Merge "Camera: Update for reprocess session" into mnc-dev
* commit '
e4c3ff2f50dd8126bee379dd3b078ecf36d6a294':
Camera: Update for reprocess session
Chien-Yu Chen [Wed, 26 Aug 2015 18:56:15 +0000 (18:56 +0000)]
Merge "Camera: Update for reprocess session" into mnc-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:25:26 +0000 (18:25 +0000)]
am
7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
* commit '
7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
Add GET_APP_OPS_STATS to Shell
Selim Cinek [Wed, 26 Aug 2015 18:25:07 +0000 (18:25 +0000)]
Merge "Migrate camera vibration to the systemUI" into mnc-dr-dev
Nicholas Sauer [Wed, 26 Aug 2015 18:17:03 +0000 (18:17 +0000)]
Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev
Daniel Estrada Alva [Wed, 26 Aug 2015 17:30:09 +0000 (17:30 +0000)]
Merge "Cherry-pick: Add callback-based support for HW Activity Recognition." into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 17:20:50 +0000 (17:20 +0000)]
Merge "Launching the camera now from systemUI including animations" into mnc-dr-dev
Selim Cinek [Wed, 26 Aug 2015 02:03:48 +0000 (19:03 -0700)]
Migrate camera vibration to the systemUI
Also make sure the device is awake before vibrating.
Bug:
23200352
Change-Id: I63d04a82a4b8d9fa3e8f9deff5dd71295c82c930
Selim Cinek [Fri, 14 Aug 2015 20:19:37 +0000 (13:19 -0700)]
Launching the camera now from systemUI including animations
The GestureLaunchService now informs systemUI that a launch
has been requested and the systemUI, depending on its state
will launch the Camera in the correct mode, including
animations.
Bug:
22957192
Bug:
22958025
Change-Id: I815437c8bd33638245ac61a750f64af74fe3e1e3
Roshan Pius [Tue, 25 Aug 2015 18:23:49 +0000 (11:23 -0700)]
Reformat local Korean numbers in national format.
Korean carriers don't want the country codes displayed for local calls.
However the network returns the entire phone number including the
country code for Volte calls. According to the Koean phone numbering
scheme (https://en.wikipedia.org/wiki/Telephone_numbers_in_South_Korea),
we need to replace the country code +82 with a 0 prepended to the
carrier code to format it as a national number.
BUG:
22862845
Change-Id: Ifbb9eb8d5379608b4ea9d95ae7744779340b188e
Geoff Mendal [Wed, 26 Aug 2015 16:18:32 +0000 (16:18 +0000)]
Merge "Import translations. DO NOT MERGE" into mnc-dr-dev
Geoff Mendal [Wed, 26 Aug 2015 16:10:31 +0000 (11:10 -0500)]
Import translations. DO NOT MERGE
Change-Id: Ia70a231f9cb167baec336984d4531137c833b48f
Auto-generated-cl: translation import
Michael Wright [Wed, 26 Aug 2015 13:08:25 +0000 (13:08 +0000)]
Merge "Update rotation without holding the WOL lock." into mnc-dr-dev
Deepanshu Gupta [Wed, 26 Aug 2015 05:56:00 +0000 (05:56 +0000)]
am
3e875dbb: Fix import order. [DO NOT MERGE]
* commit '
3e875dbb38c812e3684193fdefa04433c84541db':
Fix import order. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:47 +0000 (05:55 +0000)]
am
e5fa12ad: Fix ParserFactory not initialized error. [DO NOT MERGE]
* commit '
e5fa12ad781c1759e0ff94dbc649be0e14844306':
Fix ParserFactory not initialized error. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:42 +0000 (05:55 +0000)]
am
a287b842: Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
* commit '
a287b8428ac6d9073f84f9b2f47ba5fc73939f10':
Fix NPE in BridgeContext.obtainStyledAttributes() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:37 +0000 (05:55 +0000)]
am
e698bb27: Fix BridgeTypedArray.getType() [DO NOT MERGE]
* commit '
e698bb27f3a0090e01132fd7b5a6d95abcbbfc18':
Fix BridgeTypedArray.getType() [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:33 +0000 (05:55 +0000)]
am
e481e713: Include Shapes in LayoutLib. [DO NOT MERGE]
* commit '
e481e713f24c83a3347fd83580d07252d589ec3b':
Include Shapes in LayoutLib. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:26 +0000 (05:55 +0000)]
am
ba5a02c5: LayoutLib: Support getting resource arrays. [DO NOT MERGE]
* commit '
ba5a02c5aa3c9850cdd72e592e9fa8a8d92db7ef':
LayoutLib: Support getting resource arrays. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:19 +0000 (05:55 +0000)]
am
a5ffed0b: LayoutLib: Change nullity annotations. [DO NOT MERGE]
* commit '
a5ffed0b69ac41d65aacc6ee586688a22226f64b':
LayoutLib: Change nullity annotations. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:14 +0000 (05:55 +0000)]
am
c96ef952: Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
* commit '
c96ef95285e935034377dee30f3b8a0329f6c3a2':
Add documentation about hack in commit:
f8ea750455 [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:07 +0000 (05:55 +0000)]
am
b318ff54: Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
* commit '
b318ff54fcd17e7aadd1b0251c34cba348898704':
Make DatePicker rendering not fail (style search fix). [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:55:02 +0000 (05:55 +0000)]
am
cc5e69e4: Inject anonymous inner classes of injected classes [DO NOT MERGE]
* commit '
cc5e69e4fed8bb797dc3f83c1de32eaf4a52f324':
Inject anonymous inner classes of injected classes [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:58 +0000 (05:54 +0000)]
am
d7e89906: Update platformDir search in tests. [DO NOT MERGE]
* commit '
d7e89906a453a562a8fef303fc6c4068dfa5c0d0':
Update platformDir search in tests. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:52 +0000 (05:54 +0000)]
am
afedbc47: Make Context.getClassLoader() work. [DO NOT MERGE]
* commit '
afedbc47b3c8f3fa9955496e6ceb7f5702dd90a3':
Make Context.getClassLoader() work. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:44 +0000 (05:54 +0000)]
am
92480a9a: Fix include tag rendering. [DO NOT MERGE]
* commit '
92480a9ad89a813bdf36185fa8c4d227d8415b4c':
Fix include tag rendering. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:39 +0000 (05:54 +0000)]
am
f6b08547: Show better error message for color attr not found. [DO NOT MERGE]
* commit '
f6b08547458b9219da1717a79363f778bfc57dd0':
Show better error message for color attr not found. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:33 +0000 (05:54 +0000)]
am
b1370c26: Fix build: udpate parser factory method [DO NOT MERGE]
* commit '
b1370c2687f4b03f7b9b36f89bb636b5b65f9531':
Fix build: udpate parser factory method [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:28 +0000 (05:54 +0000)]
am
aa729889: Don\'t keep LayoutlibCallback reference. [DO NOT MERGE]
* commit '
aa72988955789be6e790c344daba3ef17abfcd98':
Don't keep LayoutlibCallback reference. [DO NOT MERGE]
Deepanshu Gupta [Wed, 26 Aug 2015 05:54:23 +0000 (05:54 +0000)]
am
5c90c4f4: Remove kxml dependency [DO NOT MERGE]
* commit '
5c90c4f459c2a7213a197f7ee98ad71e85af31bc':
Remove kxml dependency [DO NOT MERGE]
Adrian Roos [Wed, 26 Aug 2015 00:43:31 +0000 (00:43 +0000)]
Merge "Disable fingerprint after user lockout" into mnc-dr-dev
Todd Kennedy [Wed, 26 Aug 2015 00:35:42 +0000 (00:35 +0000)]
am
5983ae7b: Merge "Allow extra slop in battery stats" into mnc-dev
* commit '
5983ae7b98bbe16b8a0a5ffe9203baa1ed58a8fb':
Allow extra slop in battery stats
Todd Kennedy [Wed, 26 Aug 2015 00:27:46 +0000 (00:27 +0000)]
Merge "Allow extra slop in battery stats" into mnc-dev
Todd Kennedy [Wed, 26 Aug 2015 00:26:57 +0000 (17:26 -0700)]
Allow extra slop in battery stats
Current slop of 30ms was causing too many WTFs to be thrown. Increase the slop
to 750ms.
Bug:
23391894
Change-Id: Ica5be9b00745bfe58872d43be8c32f8c147075ed
Chris Tate [Wed, 26 Aug 2015 00:20:50 +0000 (00:20 +0000)]
am
e62421f1: Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
* commit '
e62421f1fbc1ea44e7737989e134fdf9fc1ec4cc':
Teach Pm about the "always ask" link-handling state
Chris Tate [Wed, 26 Aug 2015 00:10:23 +0000 (00:10 +0000)]
Merge "Teach Pm about the "always ask" link-handling state" into mnc-dev
Raph Levien [Tue, 25 Aug 2015 23:35:37 +0000 (23:35 +0000)]
am
8304c6c0: Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
* commit '
8304c6c0f9d4b8624ab9cf5cfe5dce15db64c4de':
Truncate and ellipsize app name if too long for dialog.
Raph Levien [Tue, 25 Aug 2015 23:25:10 +0000 (23:25 +0000)]
Merge "Truncate and ellipsize app name if too long for dialog." into mnc-dev
Jim Miller [Tue, 25 Aug 2015 23:22:29 +0000 (23:22 +0000)]
Merge "Handle driver errors from remove, enroll and auth." into mnc-dr-dev
Adrian Roos [Tue, 25 Aug 2015 22:59:00 +0000 (15:59 -0700)]
Disable fingerprint after user lockout
Bug:
22677859
Change-Id: I38b918d2e40b5bb423f2e5c171fe65bed8d440a6
Jorim Jaggi [Tue, 25 Aug 2015 22:54:34 +0000 (22:54 +0000)]
Merge "Disable RT animations for header ripple" into mnc-dr-dev
Michael Wright [Mon, 24 Aug 2015 23:00:05 +0000 (00:00 +0100)]
Truncate and ellipsize app name if too long for dialog.
If the given app name is too long for the permissions dialog, then
it can push the warning that the application will be able to record
the screen below the fold, letting the app basically set its own
dialog message in a way that a user would be difficult to detect as
fraudulant.
Bug:
23345192
Change-Id: If5881ca75d5c155ef5174351d245dbc3abdaa584