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

167564 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
c2aa0e1371 am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev 
automerge: 8334c66

* commit '8334c6666642ef83cf03df82af183dc34486d007':
  Cancel lockscreen/shade gestures when orientation changes
 2014-11-11 00:04:56 +00:00
Adrian Roos
15f7b37b3c am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev 
automerge: 09fc10f

* commit '09fc10f18f6fac8d48e4a46a3a954c336f2bd8be':
  Add LockSettingsStorage tests
 2014-11-11 00:03:08 +00:00
Dirk Dougherty
e991fac66d am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs 
automerge: 42e620e

* commit '42e620e5cfae56ded772d9e95d06e05f08d1b75d':
  Add Nexus 6 and Nexus 9 to the device framer.
 2014-11-11 00:01:13 +00:00
Justin Harrison
40681e2165 am bd0eb36b: Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev 
automerge: 57421b1

* commit '57421b1ccf835cd6de608afc94fecddcfad28a0c':
  Use fonts for smaller languages of South and Southeast Asia.
 2014-11-11 00:00:05 +00:00
Deepanshu Gupta
fb5877a4e7 am 4c0f0e6c: Merge "Fix setting styles in custom views." into lmp-dev automerge: 5c22a79 automerge: 7d3d5fe 
automerge: 1f33b2f

* commit '1f33b2f6f61f66b751d6ecb2660bed8f36c91986':
  Fix setting styles in custom views.
 2014-11-10 23:57:27 +00:00
Deepanshu Gupta
7cc11f8bf3 am 3cf0640d: Merge "Add primitive shadows support to LayoutLib" into lmp-dev automerge: 97c04ac automerge: 828db35 
automerge: 1adeba2

* commit '1adeba2c7399e619760b413d810de9c6371b3159':
  Add primitive shadows support to LayoutLib
 2014-11-10 23:56:18 +00:00
Deepanshu Gupta
9713d74018 am 0e3925df: Merge "Remove needlessly thrown IOException." into lmp-dev automerge: f305d2c automerge: a09dda8 
automerge: aa53920

* commit 'aa53920479b7e1916e0d2afbf6846250a2deeabf':
  Remove needlessly thrown IOException.
 2014-11-10 23:54:59 +00:00
Jorim Jaggi
8334c66666 am 12174a7d: Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev 
* commit '12174a7d2940299ee0f951905bcbcc55ea724eae':
  Cancel lockscreen/shade gestures when orientation changes
 2014-11-10 22:54:11 +00:00
Jorim Jaggi
12174a7d29 Merge "Cancel lockscreen/shade gestures when orientation changes" into lmp-mr1-dev 2014-11-10 22:49:39 +00:00
Adrian Roos
09fc10f18f am f2bd3cc9: Merge "Add LockSettingsStorage tests" into lmp-mr1-dev 
* commit 'f2bd3cc9df7e6da3e5802edd3d028b6b4498bb26':
  Add LockSettingsStorage tests
 2014-11-10 22:41:49 +00:00
Adrian Roos
f2bd3cc9df Merge "Add LockSettingsStorage tests" into lmp-mr1-dev 2014-11-10 22:37:36 +00:00
Adrian Roos
b7f421875e am 7dc3d703: Merge "Add caching to LockSettingsStorage" into lmp-mr1-dev automerge: e6ef98c 
* commit '7dc3d7033b4b7a90514772dbee9702257f1fe367':
  Add caching to LockSettingsStorage
 2014-11-10 22:35:52 +00:00
Evan Charlton
13cf9cf1d3 am 3caf6fc7: Merge "Apply @hide / @SystemApi to android.telecom.*" into lmp-mr1-dev automerge: e2e649f 
* commit '3caf6fc7df2e4240ae26026d4e1e9c3a23432975':
  Apply @hide / @SystemApi to android.telecom.*
 2014-11-10 22:35:46 +00:00
Adam Lesinski
9687153de3 Merge "Merge commit 'fa31eb2c' into manualmerge" into lmp-mr1-dev-plus-aosp 2014-11-10 22:33:51 +00:00
Adam Lesinski
4d29c66930 Merge commit 'fa31eb2c' into manualmerge 
Conflicts:
	tools/split-select/RuleGenerator_test.cpp

Change-Id: I0d1261301d433f32e857cf1b0d75a861205f7625
 2014-11-10 14:32:11 -08:00
Dirk Dougherty
42e620e5cf am 4254ac01: am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs 
* commit '4254ac017240c201323964864f88fb3823b32f6c':
  Add Nexus 6 and Nexus 9 to the device framer.
 2014-11-10 22:30:10 +00:00
Justin Harrison
57421b1ccf am bd0eb36b: Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev 
* commit 'bd0eb36b2b7b72f65884adb41c1672ff1fefd948':
  Use fonts for smaller languages of South and Southeast Asia.
 2014-11-10 22:30:06 +00:00
Dirk Dougherty
4254ac0172 am 56d190c4: am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs 
* commit '56d190c4a58cc8e04d8c8a7380a0801117abcb64':
  Add Nexus 6 and Nexus 9 to the device framer.
 2014-11-10 22:25:29 +00:00
Justin Harrison
bd0eb36b2b Merge "Use fonts for smaller languages of South and Southeast Asia." into lmp-mr1-dev 2014-11-10 22:24:38 +00:00
Yabin Cui
19d4e7806a am a9235301: Merge "kill HAVE_SCHED_SETSCHEDULER" 
* commit 'a9235301ad190814c779a13479b204f01980898f':
  kill HAVE_SCHED_SETSCHEDULER
 2014-11-10 22:24:03 +00:00
Dirk Dougherty
56d190c4a5 am f253fe3e: am 602c63f8: Merge "Add Nexus 6 and Nexus 9 to the device framer." into lmp-docs 
* commit 'f253fe3e67345325b84fe0b13e38b8f2ec636b98':
  Add Nexus 6 and Nexus 9 to the device framer.
 2014-11-10 22:18:10 +00:00
Yabin Cui
a9235301ad Merge "kill HAVE_SCHED_SETSCHEDULER" 2014-11-10 22:12:28 +00:00
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
Elliott Hughes
984d81c393 am c34e6359: Merge "bionic\'s struct stat is now POSIX-compliant." 
* commit 'c34e63598e318c9aa0debde09730a26c64bc1203':
  bionic's struct stat is now POSIX-compliant.
 2014-11-10 22:10:21 +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
John Spurlock
7346a1ad0a am 551f0778: Merge "Zen: Pull next-alarm tracking out into separate helper." into lmp-mr1-dev automerge: 7936ca3 
* commit '551f0778c39b030ebf1fd51c882c152b3e7ac320':
  Zen: Pull next-alarm tracking out into separate helper.
 2014-11-10 22:04:39 +00:00
Santos Cordon
fac1b941e9 am 2ace3d48: Make add-call a global property of telecom. (1/4) automerge: 6c912b7 
* commit '2ace3d4803fff437387d36f27dab05f1c159b710':
  Make add-call a global property of telecom. (1/4)
 2014-11-10 22:04:33 +00:00
Adrian Roos
8953c119fd am 4dfc666c: Merge "Disable LockPatternUtilsCache" into lmp-mr1-dev automerge: a0ecc71 
* commit '4dfc666cd2e77602c98b0c5214169f5fb47af846':
  Disable LockPatternUtilsCache
 2014-11-10 22:04:27 +00:00
Jorim Jaggi
050ea8569a am 105ff073: Merge "Fix Keyguard affordances for RTL" into lmp-mr1-dev automerge: f4a15d4 
* commit '105ff0731075f9dab8bc6c7cb47bc5250abab1e2':
  Fix Keyguard affordances for RTL
 2014-11-10 22:04:22 +00:00
Alan Viverette
e4404938c2 am 5ec0f1c9: Merge "Clean up encapsulation in date picker classes" into lmp-mr1-dev automerge: c0bf068 
* commit '5ec0f1c9deb37c2eca4d717e2076e5982bbef99b':
  Clean up encapsulation in date picker classes
 2014-11-10 22:04:15 +00:00
Dan Sandler
34f24aef58 am eba923cc: am 04a1557c: Merge "Fix inset hinting when adding window" into lmp-mr1-dev 
* commit 'eba923ccce573ac9f426d58d79e23a1fcd8ee1a7':
  Fix inset hinting when adding window
 2014-11-10 22:04:09 +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
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
Yabin Cui
65b4a68669 kill HAVE_SCHED_SETSCHEDULER 
Bug: 18300670

Change-Id: I3033c3542e83963e72d49a639db76501d12ad581
 2014-11-10 12:21:57 -08: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