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

159004 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
1f33b2f6f6 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 
automerge: 7d3d5fe

* commit '7d3d5feb31e393c97381f512995d9d799d18304f':
  Fix setting styles in custom views.
 2014-11-10 22:12:19 +00:00
Dirk Dougherty
f253fe3e67 am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs 
* commit '602c63f8405466dab18b6bbd93eb682900cf459f':
  Add Nexus 6 and Nexus 9 to the device framer.
 2014-11-10 22:11:54 +00:00
Deepanshu Gupta
1adeba2c73 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac 
automerge: 828db35

* commit '828db35568459638e09f86be40340d281804858d':
  Add primitive shadows support to LayoutLib
 2014-11-10 22:11:10 +00:00
Deepanshu Gupta
aa53920479 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
automerge: a09dda8

* commit 'a09dda8162ca48bea0fea0e2804af38e216996d8':
  Remove needlessly thrown IOException.
 2014-11-10 22:10:07 +00:00
Deepanshu Gupta
7d3d5feb31 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 
* commit '4c0f0e6c852dd933bcfaf95380cca49a46fa3912':
  Fix setting styles in custom views.
 2014-11-10 22:05:27 +00:00
Deepanshu Gupta
828db35568 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac 
* commit '3cf0640d944a0718b9e29a2134a577e72a9432b4':
  Add primitive shadows support to LayoutLib
 2014-11-10 22:05:23 +00:00
Deepanshu Gupta
a09dda8162 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c 
* commit '0e3925dfb3ea4e9185202dd963f03f5ca1df17d0':
  Remove needlessly thrown IOException.
 2014-11-10 22:05:16 +00:00
Adrian Roos
7dc3d7033b Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev 
automerge: e6ef98c

* commit 'e6ef98cf0528cbc2722b979e5ad86ba859fa78b0':
  Add caching to LockSettingsStorage
 2014-11-10 21:48:50 +00:00
Jorim Jaggi
aea80f40d8 Cancel lockscreen/shade gestures when orientation changes 
Bug: 18293929
Change-Id: Ifbf91c42fa9e68aa688ca4c390fcc24a358212a9
 2014-11-10 22:42:30 +01:00
Bryce Lee
812d7025d2 Wake up device in the case a touch is encountered in theater mode when the screen is off and no dream is running. 
Bug: 18297399
Change-Id: I5a520e8bf861e46d61e54d7d0849e55b2e5d9239
 2014-11-10 13:33:28 -08:00
Adrian Roos
e542499a30 Add LockSettingsStorage tests 
Bug: 18163444
Change-Id: I563276e6d445d43d05bf0d3c633440a8e0109b69
 2014-11-10 21:03:12 +00:00
Deepanshu Gupta
4c0f0e6c85 Merge "Fix setting styles in custom views." into lmp-dev 
automerge: 5c22a79

* commit '5c22a79baf81727b56a85a194d678c18449b5150':
  Fix setting styles in custom views.
 2014-11-10 21:00:43 +00:00
Deepanshu Gupta
3cf0640d94 Merge "Add primitive shadows support to LayoutLib" into lmp-dev 
automerge: 97c04ac

* commit '97c04ac7ed4f34ca0cfb75646cc00687fb0954d4':
  Add primitive shadows support to LayoutLib
 2014-11-10 20:58:58 +00:00
Deepanshu Gupta
0e3925dfb3 Merge "Remove needlessly thrown IOException." into lmp-dev 
automerge: f305d2c

* commit 'f305d2c4a80af9e2011824349adc6f133cd8822c':
  Remove needlessly thrown IOException.
 2014-11-10 20:56:36 +00:00
Roozbeh Pournader
2ff3ba5bfa Use fonts for smaller languages of South and Southeast Asia. 
Fonts for Balinese, Batak, Buginese, Buhid, Hanunnoo, Javanese,
Lepcha, Limbu, Meetei Mayek, Ol Chiki, Rejang, Saurashtra, Sundanese,
Syloti Nagri, Tagbanwa, and Thaana scripts are added.

Bug: 17686019
Change-Id: I3fb783874920909e8725097481c9e7d8e35f42f8
 2014-11-10 12:49:20 -08:00
Adrian Roos
e6ef98cf05 Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev 2014-11-10 20:33:10 +00:00
Evan Charlton
3caf6fc7df Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev 
automerge: e2e649f

* commit 'e2e649f5371857e0df41356512c6e06663ba8577':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 20:29:27 +00:00
Deepanshu Gupta
5c22a79baf Merge "Fix setting styles in custom views." into lmp-dev 2014-11-10 20:28:43 +00:00
Adrian Roos
3dcae68501 Add caching to LockSettingsStorage 
Bug: 18163444
Change-Id: I4caa80ca55efec761e965807ae793db41864321f
 2014-11-10 21:27:49 +01:00
Deepanshu Gupta
8657baa06d Fix setting styles in custom views. 
Bug: http://b.android.com/78842
Change-Id: I5d4571d94d96b00419acc258c9e2b519367b689d
 2014-11-10 20:10:55 +00:00
Evan Charlton
e2e649f537 Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev 2014-11-10 19:54:36 +00:00
Adam Lesinski
fa31eb2cd1 Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev 
automerge: a674a1e

* commit 'a674a1ee79e34749127524434fd7439e7fd5ba09':
  split-select: Fix rules generated for anydpi density
 2014-11-10 19:54:31 +00:00
John Spurlock
551f0778c3 Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev 
automerge: 7936ca3

* commit '7936ca36d9dfd620df0bfead6c79b5eddc761c20':
  Zen: Pull next-alarm tracking out into separate helper.
 2014-11-10 19:53:14 +00:00
Evan Charlton
0e094d926c Apply @hide / @SystemApi to android.telecom.* 
Move the android.telecom.* namespace back to @hide, and also mark it
with @SystemApi so that system-privileged apps can use them.

Bug: 18302450
Change-Id: I33ae1b9b0dfdb1c5eff51ca3c829196bcfc9411c
 2014-11-10 11:52:31 -08:00
Santos Cordon
2ace3d4803 Make add-call a global property of telecom. (1/4) 
automerge: 6c912b7

* commit '6c912b7d056c67b41fd46f31de168795e97c2336':
  Make add-call a global property of telecom. (1/4)
 2014-11-10 19:51:50 +00:00
Adam Lesinski
a674a1ee79 Merge "split-select: Fix rules generated for anydpi density" into lmp-mr1-dev 2014-11-10 19:45:28 +00:00
Dirk Dougherty
602c63f840 Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs 2014-11-10 19:45:18 +00:00
Eric Laurent
1c2b0d5214 AudioEffect JNI: use new max preprocessing constant 
Bug: 18226810.
Change-Id: Ica5677da247268306b34dfce38f25394586817fd
(cherry picked from commit b27a8a5bcc40054f6d775d070bc2de6eb996d1c2)
 2014-11-10 19:44:15 +00:00
John Spurlock
7936ca36d9 Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev 2014-11-10 19:24:16 +00:00
Santos Cordon
6c912b7d05 Make add-call a global property of telecom. (1/4) 
ADD_CALL didn't make sense as a property of Connection or Call.
This changes it to be a global property instead.

Bug: 18285352
Change-Id: I658e7a6977a848600272cde2914612c8691bb801
 2014-11-10 19:19:35 +00:00
Adrian Roos
4dfc666cd2 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 
automerge: a0ecc71

* commit 'a0ecc714c3aeaaa05649e0ab1f054cc8efbb126f':
  Disable LockPatternUtilsCache
 2014-11-10 19:06:54 +00:00
Jorim Jaggi
105ff07310 Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev 
automerge: f4a15d4

* commit 'f4a15d438acad20cc46fa2fbec0aa1e5cf85b4ff':
  Fix Keyguard affordances for RTL
 2014-11-10 19:05:37 +00:00
John Spurlock
6b0623a112 Zen: Pull next-alarm tracking out into separate helper. 
In preparation for sharing with DowntimeConditionProvider.

Bug: 16373455
Change-Id: If8d90187fa399935137c7ba6152925a9106a4596
 2014-11-10 14:05:13 -05:00
Alan Viverette
5ec0f1c9de Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 
automerge: c0bf068

* commit 'c0bf068bbff3080b930c9bb50bd6cc935b135536':
  Clean up encapsulation in date picker classes
 2014-11-10 19:04:39 +00:00
Deepanshu Gupta
97c04ac7ed Merge "Add primitive shadows support to LayoutLib" into lmp-dev 2014-11-10 18:58:30 +00:00
Deepanshu Gupta
f305d2c4a8 Merge "Remove needlessly thrown IOException." into lmp-dev 2014-11-10 18:54:21 +00:00
Tim Kilbourn
8299d02927 Add tv product variants to strings. 
Bug: 18053999
Change-Id: I7d1a21600d7b0e4dea16b8cf7a2fc1ba552de930
 2014-11-10 10:45:13 -08:00
Adrian Roos
a0ecc714c3 Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev 2014-11-10 18:35:59 +00:00
Jorim Jaggi
f4a15d438a Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev 2014-11-10 18:31:55 +00:00
Jorim Jaggi
0a81822272 Fix Keyguard affordances for RTL 
Bug: 17328362
Change-Id: Ic7d7a5a0d721390064493cf753348b89b7bac7e1
 2014-11-10 19:31:22 +01:00
Alan Viverette
c0bf068bbf Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev 2014-11-10 18:29:29 +00:00
Adrian Roos
450ce9fc8a Disable LockPatternUtilsCache 
Also fix a bug where hasPattern and hasPassword were
not invalidated properly.

Bug: 18163444
Change-Id: I5bd8cc4e7c0d00497ee7a42f3c34449aa3f95a6c
 2014-11-10 19:16:41 +01:00
Dan Sandler
eba923ccce am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit '04a1557c497d2ef0ab4011136b0945b20f291bb1':
  Fix inset hinting when adding window
 2014-11-10 18:13:35 +00:00
Dan Sandler
04a1557c49 Merge "Fix inset hinting when adding window" into lmp-mr1-dev 2014-11-10 18:10:36 +00:00
Rich Slogar
2d8cd7cbb2 docs:builds tools 21.1.1 update 
Change-Id: I96fd6ad0926414664b192ca41d13f49f25365e4a
 2014-11-10 09:59:15 -08:00
Andres Morales
3a8684117d am 2885c6ba: Merge "Fix build" into lmp-mr1-dev 
* commit '2885c6ba63850d5fd061460683de768617ed6b31':
  Fix build
 2014-11-10 17:35:55 +00:00
Andres Morales
2885c6ba63 Merge "Fix build" into lmp-mr1-dev 2014-11-10 17:31:27 +00:00
Geoff Mendal
20083734d9 am 8f02ec4f: (-s ours) am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '8f02ec4fce4a77c78eff04b709831e0f4ec7cb43':
  Import translations. DO NOT MERGE
 2014-11-10 17:31:24 +00:00
Paul Jensen
78a853d17a am cb32559a: Merge "Fix NetworkMonitor logging to include NetID." into lmp-mr1-dev 
* commit 'cb32559a1ecc476a4502928b0c4e37cd0f7b836c':
  Fix NetworkMonitor logging to include NetID.
 2014-11-10 17:31:19 +00:00
Geoff Mendal
8f02ec4fce am d53436a9: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'd53436a9d96100883e55e09ca3e0d5b6eae4fc35':
  Import translations. DO NOT MERGE
 2014-11-10 17:27:42 +00:00