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

138021 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Deepanshu Gupta
72a823b9b0 am f2862a84: (-s ours) am 4da5807c: am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'f2862a849c6ba93c61c8bcc03da2ca9b8b8cc86f':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:36:35 +00:00
Deepanshu Gupta
f2862a849c am 4da5807c: am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '4da5807ce0e6a190c5e1de37297d454368906e76':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:32:43 +00:00
Deepanshu Gupta
4da5807ce0 am 88c9ca28: am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '88c9ca28effb9745d13647bd25d34b6ef53e7cb9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:29:03 +00:00
Deepanshu Gupta
88c9ca28ef am d49f9b25: am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'd49f9b25310ac63310b0e5c7aeedca1d9e6ccda0':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:25:54 +00:00
Deepanshu Gupta
d49f9b2531 am 2983ee55: (-s ours) am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '2983ee55a6d578b15b4862c9c8523bf00f7d83d5':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:27 +00:00
Deepanshu Gupta
2983ee55a6 am 12b657d7: am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit '12b657d74961ba5a6175162b7548cce4e77c9bbc':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:33 +00:00
Deepanshu Gupta
12b657d749 am dade24b4: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 
* commit 'dade24b491c82ff0b96d025c908e7eaf1bab99ba':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:19 +00:00
Deepanshu Gupta
dade24b491 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr2-dev 2014-06-04 20:07:44 +00:00
Jorim Jaggi
15c3fd31ab am 35cfe4c1: Merge "Go back to keyguard when in SHADE_LOCKED with single tap." into lmp-preview-dev 
* commit '35cfe4c1f216f477d2c024d53a6f2c1a0d817f53':
  Go back to keyguard when in SHADE_LOCKED with single tap.
 2014-06-04 20:05:01 +00:00
Adrian Roos
b4df2f586a am b2302d43: Merge "Ensure trust agents are only provided by platform packages" into lmp-preview-dev 
* commit 'b2302d437fd636d9973f466062cfad145cdd042d':
  Ensure trust agents are only provided by platform packages
 2014-06-04 20:04:55 +00:00
Michael Wright
713059d4af Merge "Making KEYCODE_PAIRING a wakeup key." 2014-06-04 19:41:59 +00:00
Michael Wright
8ac485a303 Making KEYCODE_PAIRING a wakeup key. 
Bug: 15430207
Change-Id: I4bb862e22d32af1a89741d39a694b790aa52dfcd
 2014-06-04 12:38:18 -07:00
John Spurlock
69085a6bda am 50246b7f: Merge "QuickSettings: Filter signal assets with color filter." into lmp-preview-dev 
* commit '50246b7f8812e1bc7a9d961e5251d1bac4415d02':
  QuickSettings: Filter signal assets with color filter.
 2014-06-04 18:57:03 +00:00
John Spurlock
a28c27c5ff am 9ffa855f: QuickSettings: Remove outlined version of location icon. 
* commit '9ffa855fd9e9fd1e44b53a5a9dbfb9fd51d2b079':
  QuickSettings: Remove outlined version of location icon.
 2014-06-04 18:56:58 +00:00
Robert Greenwalt
a995aba36f Merge "Report new network scores back to factories." 2014-06-04 18:48:44 +00:00
Lorenzo Colitti
ebdba2e678 am 7a3077a9: Merge "Make requests for restricted networks not require unrestricted access." into lmp-preview-dev 
* commit '7a3077a9a7405048b9cd28452efbc28a857acb25':
  Make requests for restricted networks not require unrestricted access.
 2014-06-04 18:46:31 +00:00
Baligh Uddin
9a17a75920 am 69600869: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '696008695b30e9e6baf13f5e5100ec8fda9bc65f':
  Import translations. DO NOT MERGE
 2014-06-04 18:46:21 +00:00
John Spurlock
c0e4e255a3 am d4ac66cc: QuickSettings: Tile label string updates. 
* commit 'd4ac66cc168f26cf89eafe2e506c631121ac27fd':
  QuickSettings: Tile label string updates.
 2014-06-04 18:46:14 +00:00
Baligh Uddin
a877eb1e5f am c4f11b67: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit 'c4f11b67af23dd4290864efdd1e0cb313273f207':
  Import translations. DO NOT MERGE
 2014-06-04 18:46:09 +00:00
Baligh Uddin
8d439c5277 am 99b270af: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-preview-dev 
* commit '99b270af17fc5dccce90d2aa29e1498ee39de802':
  Import translations. DO NOT MERGE
 2014-06-04 18:46:04 +00:00
John Spurlock
733ae473e7 am b0570a49: Merge "QuickSettings: System accent color for seekbars." into lmp-preview-dev 
* commit 'b0570a49353d696da69d3bb19216190613075981':
  QuickSettings: System accent color for seekbars.
 2014-06-04 18:45:32 +00:00
Alan Viverette
7820b7bf5d am 4dd60289: Merge "Fix RadialTimePicker styling" into lmp-preview-dev 
* commit '4dd60289af766c9a256b57a3d1a8662131d28230':
  Fix RadialTimePicker styling
 2014-06-04 18:45:24 +00:00
Adam Powell
0662025216 am 379b49bb: Fix some brain itch. 
* commit '379b49bbc5088320d6f8f2fce88a70b458e80cf7':
  Fix some brain itch.
 2014-06-04 18:45:19 +00:00
Alan Viverette
90efa8f08c am 1604d630: Merge "Fix action bar menu inflation context" into lmp-preview-dev 
* commit '1604d6302a3db07a57827b1c38f7fda21c28d3c6':
  Fix action bar menu inflation context
 2014-06-04 18:45:10 +00:00
Adam Powell
a649e8def9 am 5519852e: Merge "Implement action bar tab mode for Toolbar-based decor action bars" into lmp-preview-dev 
* commit '5519852e01a646af65efeee30f5b8e80c2cd87e7':
  Implement action bar tab mode for Toolbar-based decor action bars
 2014-06-04 18:45:04 +00:00
Robert Greenwalt
52dea94557 am cffe6d73: Merge "Fix legacy APIs." into lmp-preview-dev 
* commit 'cffe6d7315bc364d913e6a7daf1b62b7d173bfb7':
  Fix legacy APIs.
 2014-06-04 18:44:59 +00:00
Winson Chung
616ec9d368 am 11aef2b8: Merge "Fixing back regression in Recents." into lmp-preview-dev 
* commit '11aef2b8caddc5aaf573ab52128a8bdb2afe37d1':
  Fixing back regression in Recents.
 2014-06-04 18:44:54 +00:00
Igor Murashkin
da525e542b am 1a68eb96: Merge "camera2: Implement most of CameraCaptureSession" into lmp-preview-dev 
* commit '1a68eb968f77af341a60708b85072ae805e6dc10':
  camera2: Implement most of CameraCaptureSession
 2014-06-04 18:44:46 +00:00
Dianne Hackborn
ed021011dd am b96802d0: Merge "Force write battery stats after a --history-since." into lmp-preview-dev 
* commit 'b96802d03cc5eb047a2be711a8d14d82498753e7':
  Force write battery stats after a --history-since.
 2014-06-04 18:44:37 +00:00
Raph Levien
c5dc037008 am aef648f4: Merge "Better Minikin integration" into lmp-preview-dev 
* commit 'aef648f405a6f2ed2e523e69cd6f1da884f4b9dd':
  Better Minikin integration
 2014-06-04 18:44:32 +00:00
Eric Laurent
7d10873c5c am dd76759d: Merge "AudioManager: fix AudioPort gain query" into lmp-preview-dev 
* commit 'dd76759d3e279cd56d6b1ce16a0b9488af35e0ab':
  AudioManager: fix AudioPort gain query
 2014-06-04 18:44:26 +00:00
Craig Mautner
f3f8a73a57 am 05cd6c39: Merge "Force all windows to redraw before unblanking screen" into lmp-preview-dev 
* commit '05cd6c39824653e0f7e8641444a7134e8cac72f4':
  Force all windows to redraw before unblanking screen
 2014-06-04 18:44:16 +00:00
Alan Viverette
3b1e08fc9f am 62ea9554: Merge "Temporary drawable for Quantum progress indicator" into lmp-preview-dev 
* commit '62ea9554753820df25343e52e0dcab090e5755b5':
  Temporary drawable for Quantum progress indicator
 2014-06-04 18:44:09 +00:00
Adam Powell
3decd141a5 am ab9906c0: Merge "Support list navigation mode for toolbar action bars" into lmp-preview-dev 
* commit 'ab9906c0735fb22017f3d673207897347edeba92':
  Support list navigation mode for toolbar action bars
 2014-06-04 18:44:02 +00:00
Ruben Brunk
ccee3b158a am c354b069: Merge "DNG: Write out additional fields." into lmp-preview-dev 
* commit 'c354b06955508816af29daefdac5ef9ea9b89fbb':
  DNG: Write out additional fields.
 2014-06-04 18:43:50 +00:00
John Spurlock
7b92af62b8 am 7e127344: Zen: Stateful condition panel. 
* commit '7e12734486152ee4f6467e13e6b4cdd3a9c7bf8d':
  Zen: Stateful condition panel.
 2014-06-04 18:43:37 +00:00
Alan Viverette
8a3e0a5c0b am 15fabac3: Merge "Fix build, fix Drawable loop" into lmp-preview-dev 
* commit '15fabac37d6c1ce575c66338b4a51b2f8d8afb96':
  Fix build, fix Drawable loop
 2014-06-04 18:43:23 +00:00
Alan Viverette
22b893fde1 Merge commit '096d52fb' into manualmerge 
Conflicts:
	api/current.txt

Change-Id: Iaf1f9172a73e74885475c30ffefcb7d0e32a5883
 2014-06-04 11:42:06 -07:00
Robert Greenwalt
ac96c52350 Report new network scores back to factories. 
This is a first order approx of what we want - should probably be good enough in most cases.

bug:15277751

Change-Id: I10e3b25f6ad5c7e022ba966ed514d4e6a999180d
 2014-06-04 18:38:01 +00:00
Alan Viverette
5398aec700 am a929b2d4: Merge "Set starting value on ripple exit animation" into lmp-preview-dev 
* commit 'a929b2d49386cfb3cdf4e0eaecca61184fa0c857':
  Set starting value on ripple exit animation
 2014-06-04 18:09:52 +00:00
Craig Mautner
b3f9156f87 am 43631db9: Merge "Layout keyguard according to flags." into lmp-preview-dev 
* commit '43631db9093a87529a5c1b2732b7102398bbfd2f':
  Layout keyguard according to flags.
 2014-06-04 18:09:26 +00:00
Alan Viverette
62c5c1bd55 am 4d75314b: Merge "Quantum tab indicators, clean up text appearances" into lmp-preview-dev 
* commit '4d75314b5b03cacffddcd15aea7b5172f89b0512':
  Quantum tab indicators, clean up text appearances
 2014-06-04 18:09:21 +00:00
Alan Viverette
1fa8b11d93 am cd5b044e: Merge "Fix drawable cache, add quantum assets to preload list" into lmp-preview-dev 
* commit 'cd5b044eaf38cc1fad926dff5d5d1b35c3c8b6a3':
  Fix drawable cache, add quantum assets to preload list
 2014-06-04 18:09:14 +00:00
Jorim Jaggi
0a9c02df1e am b733f632: Merge "Move owner info to main lockscreen." into lmp-preview-dev 
* commit 'b733f6322870f06d75a020f0f9f0bbba634875e7':
  Move owner info to main lockscreen.
 2014-06-04 18:09:08 +00:00
Jorim Jaggi
34f521e2af am 7a49d92b: Merge "Fix invalid Keyguard state with encrypted devices." into lmp-preview-dev 
* commit '7a49d92bf6fd23af7dff29fd3cb97fcd5c05cfc9':
  Fix invalid Keyguard state with encrypted devices.
 2014-06-04 18:09:01 +00:00
Chris Wren
e4a369d1f8 am 02dc5023: Handle Zen Mode computations correctly for updated notifications. 
* commit '02dc50231e5a3d5754281f819df418793260f526':
  Handle Zen Mode computations correctly for updated notifications.
 2014-06-04 18:08:52 +00:00
Chris Wren
30591cc1ab am 1e58ac1d: Merge "Apply Zen Mode later, after we\'ve found the old record." into lmp-preview-dev 
* commit '1e58ac1d71b630435c3e69180d9e92662c6f65dd':
  Apply Zen Mode later, after we've found the old record.
 2014-06-04 18:08:48 +00:00
Jorim Jaggi
d5375b9548 am d98ab64e: Merge "Animate unlock icon while unlocking." into lmp-preview-dev 
* commit 'd98ab64eeb3f12db6a0664dbd3871abe1d18452a':
  Animate unlock icon while unlocking.
 2014-06-04 18:08:43 +00:00
Jorim Jaggi
8f68ed6959 am 4aeb033a: Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev 
* commit '4aeb033aff7259cbffe01931902a9b520ab4648f':
  Fix fake status bar not visible in SHADE_LOCKED state.
 2014-06-04 18:08:28 +00:00
Alan Viverette
d9ec3dafa0 am b1c7f7f5: Merge "Fix NPE when ripples are canceled due to visibility change" into lmp-preview-dev 
* commit 'b1c7f7f538e8c4947f75406cc6089f6680f59a31':
  Fix NPE when ripples are canceled due to visibility change
 2014-06-04 18:08:22 +00:00