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

197232 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Wren
bb5ef42654 am 8517a793: am 0886dcc7: Merge "add time-in-mode metrics for zen mode" into mnc-dev 
* commit '8517a793386bfc087dae1e94f78784f5e614b230':
  add time-in-mode metrics for zen mode
 2015-06-01 15:28:25 +00:00
Adrian Roos
a3cd7dda97 am 4adc3b00: am e67f67da: Merge "Hide KeyguardMessageArea if empty" into mnc-dev 
* commit '4adc3b00915febd11e149ae0c4d4edcc02c00767':
  Hide KeyguardMessageArea if empty
 2015-06-01 15:28:20 +00:00
destradaa
36cb20bc54 am aff14c59: am ce48c1c1: Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868 
* commit 'aff14c59a04586981a75392740cea997412c8821':
  Allow INADDR_NONE as a valid configuration in AGpsStatus_v3. b/21516868
 2015-06-01 15:28:11 +00:00
Yohei Yukawa
1d95daf37d am 4ad0161a: am 650a9135: Merge "Revert "Rely on IMM#focusOut() to close input session."" into mnc-dev 
* commit '4ad0161a45a872981199285a0c72d2e79de44ba5':
  Revert "Rely on IMM#focusOut() to close input session."
 2015-06-01 15:28:01 +00:00
Doris Liu
0040c7d2ba am c2713141: am f042cd84: Merge "Update doc to include how clipToPadding affects EdgeEffect" into mnc-dev 
* commit 'c271314154efc468022b9464a8d18eadf07a7183':
  Update doc to include how clipToPadding affects EdgeEffect
 2015-06-01 15:27:54 +00:00
Svetoslav
d5464b9d07 am 80c2cc14: am 815be147: Merge "Use AtomicFile APIs correctly when reading." into mnc-dev 
* commit '80c2cc14e12c3f79bb617e12c0827dc0eb7e7374':
  Use AtomicFile APIs correctly when reading.
 2015-06-01 15:27:48 +00:00
Alex Klyubin
c623d9887b am db57c48e: am d377b067: Merge "Cleanup Binder token resetting." into mnc-dev 
* commit 'db57c48e1c34d26823bc25e2da00e1056324efb4':
  Cleanup Binder token resetting.
 2015-06-01 15:27:42 +00:00
John Spurlock
7eac7b5af1 am 68a00c52: am 2473e1e9: Merge "Zen: Dim status bar alarm icon when zen = total silence." into mnc-dev 
* commit '68a00c524b38809efbc32f8c22597522b637d67c':
  Zen: Dim status bar alarm icon when zen = total silence.
 2015-06-01 15:27:37 +00:00
Jorim Jaggi
791872526f am 36325016: am 2400197f: Enable Keyguard debug logging 
* commit '36325016cafcb60669455be48247327d0197dff3':
  Enable Keyguard debug logging
 2015-06-01 15:27:31 +00:00
Alex Klyubin
c95fba7354 am 1a3ab87e: am 614b39f3: Merge "Refactor Android Keystore CipherSpi base class." into mnc-dev 
* commit '1a3ab87e93d26e659067298e250fe5e8cfc2e1b8':
  Refactor Android Keystore CipherSpi base class.
 2015-06-01 15:26:52 +00:00
Quddus Chong
613330265b am d5796be5: am c1862737: am f253e7d5: am c4d39dfc: docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956 
* commit 'd5796be5e074345d073101cee2a1a2dcf825eea0':
  docs: Fix issue where images are not appearing in mobile browsers. bug: 21517956
 2015-06-01 15:26:46 +00:00
Tyler Gunn
791eac8613 am 19eadcab: am 2b26e8dc: Merge "Un-@hide some missed video APIs." into mnc-dev 
* commit '19eadcaba885872491269399a1b2110c90b43ca8':
  Un-@hide some missed video APIs.
 2015-06-01 15:26:39 +00:00
John Spurlock
57436577e2 am f1b897e8: am e648c5f1: Merge "Zen: Add warning text if total silence will eat the next alarm." into mnc-dev 
* commit 'f1b897e8b5793430a1c28e66df7e4d346cd9a9a4':
  Zen: Add warning text if total silence will eat the next alarm.
 2015-06-01 15:26:31 +00:00
Alex Klyubin
3e83ea3f11 am 97e7fec6: am 1a23c317: Merge "Add algorithm aliases for Android Keystore HMACs." into mnc-dev 
* commit '97e7fec63ca3c72516e478b158e9673bdfc0118f':
  Add algorithm aliases for Android Keystore HMACs.
 2015-06-01 15:26:25 +00:00
Andy Hung
f3853332a4 am af739a10: am 51c1e3bd: Merge "Clarify AudioFormat sample rate and encoding documentation" into mnc-dev 
* commit 'af739a10cf15c00467b90aaccc4907ce460e64de':
  Clarify AudioFormat sample rate and encoding documentation
 2015-06-01 15:26:19 +00:00
Jason Monk
d232a172ee am 3e1bdc61: am 2280218a: Merge "Don\'t use string that has been removed." into mnc-dev 
* commit '3e1bdc61d85b9cc135cd52c0f05c0665d93621d5':
  Don't use string that has been removed.
 2015-06-01 15:26:12 +00:00
Glenn Kasten
d90bcad521 am 507758f2: am e5c38788: am 92614179: am dedc768f: Fix typo 
* commit '507758f21bd2d6b0a80dc96dd5e36040f7e9b0a5':
  Fix typo
 2015-06-01 15:26:06 +00:00
James Cook
fcce03b608 am 3c668bac: am 63b6320a: Merge "assist: Fix reported colors/styles for TextView/Switch" into mnc-dev 
* commit '3c668bac5a670999719e2a5c9d8a719b5422ea38':
  assist: Fix reported colors/styles for TextView/Switch
 2015-06-01 15:26:00 +00:00
Tony Mantler
8e56a1a67d am 29ef4811: am 85b039f3: Merge "Move ZoneGetter into SettingsLib" into mnc-dev 
* commit '29ef481165b2362c1fc91219b09f8a1f4b24e246':
  Move ZoneGetter into SettingsLib
 2015-06-01 15:25:54 +00:00
Geoff Mendal
c38f200803 am c5508f85: (-s ours) am 55b4b2d5: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit 'c5508f8560b48a195f5b19dab98b0bc1bb85928b':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:25:47 +00:00
Geoff Mendal
777767cb92 am 8474bf48: (-s ours) am 8320436c: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '8474bf48aa37487270e335441005cea19515cf13':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:25:42 +00:00
Geoff Mendal
ed2f33ce76 am 6c15c153: (-s ours) am 99177687: (-s ours) Merge "Revert "Import translations. DO NOT MERGE"" into mnc-dev 
* commit '6c15c153fa831264f1134b703107acf40e206728':
  Revert "Import translations. DO NOT MERGE"
 2015-06-01 15:25:36 +00:00
John Spurlock
a0962acfbe am 8cf1276c: am 4402f4bb: Merge "Tuner: add battery pct preference." into mnc-dev 
* commit '8cf1276c8e08abcfe744309d3ce78f3e7b37ed31':
  Tuner: add battery pct preference.
 2015-06-01 15:25:31 +00:00
Geoff Mendal
e30f773ca5 am 060b2ce9: (-s ours) am e7961129: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '060b2ce9eaf77155024676f419ca37aa6c5ab895':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:25 +00:00
Geoff Mendal
b6dae108b3 am 76625fec: (-s ours) am 0bdf1aab: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '76625fec224a0fffa0664060f72d6cc1a7e9ba49':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:20 +00:00
Geoff Mendal
36fc6a88d2 am 57103ebf: (-s ours) am df55ecbf: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '57103ebfa6188b2c421ba860d7063b62ca935af5':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:15 +00:00
Geoff Mendal
39a58e878c am 408606f3: (-s ours) am 78a247da: (-s ours) Merge "Import translations. DO NOT MERGE" into mnc-dev 
* commit '408606f31eb126bad9a8c1da28026ffe9c4943f4':
  Import translations. DO NOT MERGE
 2015-06-01 15:25:10 +00:00
Xiyuan Xia
bfcdb7b41b am 223826b3: am e103029d: Merge "Avoid keyguard UI layout dimensions underflow" into mnc-dev 
* commit '223826b3cd1c7dc00706efc137b8a4dcaf7595fa':
  Avoid keyguard UI layout dimensions underflow
 2015-06-01 15:25:02 +00:00
Geoff Mendal
7b5e5d5ade am 7ec9264f: (-s ours) am 642c4fc5: (-s ours) Import translations. DO NOT MERGE 
* commit '7ec9264f40087f48dcab821c65a93f8628dd0e93':
  Import translations. DO NOT MERGE
 2015-06-01 15:24:55 +00:00
Narayan Kamath
0bc58c6b5c am 2de63d7c: am d644c563: Merge "Avoid inspecting packages twice to deduce ABIs for moves / installs." into mnc-dev 
* commit '2de63d7cc1398fe699cc2a16b47647674e4efb64':
  Avoid inspecting packages twice to deduce ABIs for moves / installs.
 2015-06-01 15:24:49 +00:00
John Spurlock
f7043e284a am 015a95ff: am 6a299907: Merge "Zen: Use account name instead of calendar id in event conditions." into mnc-dev 
* commit '015a95ff35e5e9de959c10d082fbe2e10c58885c':
  Zen: Use account name instead of calendar id in event conditions.
 2015-06-01 15:24:42 +00:00
Selim Cinek
19eee4a498 am 4dbe7c0d: am ff3bf4b1: Increased the falsing treashold for quick settings 
* commit '4dbe7c0d16944ba4b8df4216f730acfc06818eca':
  Increased the falsing treashold for quick settings
 2015-06-01 15:24:32 +00:00
Dirk Dougherty
9fc33d8d95 am 4b9d724c: am 34cca12b: am 906a91b4: am 08710f1b: Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video. 
* commit '4b9d724cd666bdad3703f383be8c024f4a6016a1':
  Add video for families page. Add Studio version reqts and beta notice for data binding lib. Add new gps video.
 2015-06-01 15:24:23 +00:00
David Friedman
1be7fb908a am bc0e7f28: am 95af201a: am 2ed3a89c: am 90042a5f: Docs: Corrects technical content of one sentence, and deletes another. 
* commit 'bc0e7f287599e90a44ab249ba2fc0673ddfaf609':
  Docs: Corrects technical content of one sentence, and deletes another.
 2015-06-01 15:24:15 +00:00
Guang Zhu
74ecc15db9 am 0ca15144: am 9bb76544: fix NPE in shutdown thread 
* commit '0ca15144e375e7439a64fabcbb53d6813135cfc4':
  fix NPE in shutdown thread
 2015-06-01 15:24:03 +00:00
Andrew Solovay
739b6941f6 am 74f4e4f1: am 832654a8: am 2f85475c: am 7d36a250: docs: Quick spelling fix 
* commit '74f4e4f1b8016a586d6a0b3ca6ebe06840c21573':
  docs: Quick spelling fix
 2015-06-01 15:23:55 +00:00
Sungsoo Lim
26eed04988 am f819ac38: am 6dddc7d1: Merge "Send a message with data in MediaController.MessageHandler.post()" into mnc-dev 
* commit 'f819ac38a9647a8d7d00bca83f176e32a415517e':
  Send a message with data in MediaController.MessageHandler.post()
 2015-06-01 15:23:46 +00:00
Yorke Lee
ac8b0b024a am 923df3da: am d600966c: Merge "Make ACTION_CONNECTION_SERVICE_CONFIGURE public" into mnc-dev 
* commit '923df3da935b006b983ea1837538f6baecf26b86':
  Make ACTION_CONNECTION_SERVICE_CONFIGURE public
 2015-06-01 15:23:37 +00:00
Glenn Kasten
66127840c3 am a84e73a7: am ad432203: Merge "Improve error handling for AudioTrack write with PTS" into mnc-dev 
* commit 'a84e73a7bc99e4ef5c50125400d319a4124b4296':
  Improve error handling for AudioTrack write with PTS
 2015-06-01 15:23:23 +00:00
Raph Levien
1091defa85 am 023973ec: am 71a28764: Merge "Use getRunAdvance to position cursor" into mnc-dev 
* commit '023973ecc66c62f2b83d9154097bb370966ed96d':
  Use getRunAdvance to position cursor
 2015-06-01 15:23:16 +00:00
Alan Viverette
41eeeca272 am 4e419432: am a4d66f39: Merge "Synchronize Theme.Material and Theme.Material light attributes" into mnc-dev 
* commit '4e419432e1717de6154ea5c8177c519fe449b8f0':
  Synchronize Theme.Material and Theme.Material light attributes
 2015-06-01 15:23:09 +00:00
Makoto Onuki
7b8612d0ea am 8c48834b: am 0d889cde: Merge "CountryDetector no longer requires location permissions." into mnc-dev 
* commit '8c48834b112cf10d43bacd668aadf6f3cf4a9ad1':
  CountryDetector no longer requires location permissions.
 2015-06-01 15:23:03 +00:00
Yohei Yukawa
47d691baf7 am 92086e06: am 5176b545: Merge "Rely on IMM#focusOut() to close input session." into mnc-dev 
* commit '92086e06ad3167ebfadbc746d32e86c335878a8f':
  Rely on IMM#focusOut() to close input session.
 2015-06-01 15:22:58 +00:00
Brian Attwell
d54cbba805 am 4ababd27: am 19d9d0ca: Merge "Rename "end" to "endExclusive" in addPhoneTtsSpan" into mnc-dev 
* commit '4ababd27401db430afb2f30d29efce972f8b1ccb':
  Rename "end" to "endExclusive" in addPhoneTtsSpan
 2015-06-01 15:22:52 +00:00
Alan Viverette
e440ac1aa4 am 9ddcef8e: am 3c436cb9: Merge "Postpone AnimatedVectorDrawable animator inflation until applyTheme()" into mnc-dev 
* commit '9ddcef8eec56bd161d8f8e91c854b740232f6a64':
  Postpone AnimatedVectorDrawable animator inflation until applyTheme()
 2015-06-01 15:22:47 +00:00
Andres Morales
0b8ddb4792 am 8d61ab00: am a5705a4a: Merge "[partition checking] re-enable bootimage/bootloader, add recovery" into mnc-dev 
* commit '8d61ab0003e26952349a959a4a38d3ebdea664d0':
  [partition checking] re-enable bootimage/bootloader, add recovery
 2015-06-01 15:22:42 +00:00
Olawale Ogunwale
d147203bc4 am ad2be762: Merge "Fix null pointer dereference when security exception occurs" 
* commit 'ad2be762f2f0ff9f3c01e729e307920cef6e2904':
  Fix null pointer dereference when security exception occurs
 2015-06-01 14:59:15 +00:00
Olawale Ogunwale
f9efac1291 am 5ef53783: Merge "WindowManagerService not propagating X and Y steps" 
* commit '5ef53783743c7a7fb2339274ddb0886b0eb789ec':
  WindowManagerService not propagating X and Y steps
 2015-06-01 14:59:08 +00:00
Olawale Ogunwale
ad2be762f2 Merge "Fix null pointer dereference when security exception occurs" 2015-06-01 14:45:28 +00:00
Olawale Ogunwale
5ef5378374 Merge "WindowManagerService not propagating X and Y steps" 2015-06-01 14:42:37 +00:00