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

138286 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Dan Sandler
d2b0b3b487 Platlogo: The icon now matches the activity. 
Also tweaked ADB a little. It's just a preview!

Change-Id: I95265400c29272b7ff0593710ed41978e3e53df1
 2014-06-04 16:23:11 -04:00
Ruben Brunk
8e783f7a52 DNG: Hide unimplemented methods. 
Bug: 15112503
Change-Id: I31187a92b610af68fb854a27a564abf7d0635478
 2014-06-04 13:21:04 -07:00
Deepanshu Gupta
c8235b8e74 am ffcad247: am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit 'ffcad247d0401fb529441ecc65437226c2845461':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:21:00 +00:00
Deepanshu Gupta
0ed9d498b7 am 328b1f92: (-s ours) am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '328b1f92787bb4d793398ba6d8aa9b2025c62ca1':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:20:52 +00:00
Deepanshu Gupta
a9e8291409 Merge branch 'klp-dev' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base into klp-dev 2014-06-04 20:20:51 +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
ab6c61b2dd Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into klp-dev 2014-06-04 20:20:26 +00:00
Deepanshu Gupta
ffcad247d0 am 904b89c5: am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '904b89c58465b0d0822478be514572ec752df3e8':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:17:40 +00:00
Deepanshu Gupta
bac0d9ae79 Distinguish between menus in ActionBar and popup. 
Mark the menus in the ActionBar and the ones in the Overflow popup
separately. This enables the IDE to differentiate between the two and
enable gestures such as double-click to open the menu xml for menus in
the ActionBar and single click for the menus in the Overflow popup.

Change-Id: I7a23f87d34d618a134ffbe3a665be695915d4bae
(cherry picked from commit f542f28a31b38a4e454535a1fea63968811b418c)
 2014-06-04 20:16:09 +00:00
Deepanshu Gupta
328b1f9278 am 5d3e3851: am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit '5d3e3851bbe1ab0b30e593b371e98f02f5ed2f5d':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:15:37 +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
904b89c584 am 295184bc: am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '295184bc71a32a4e9418d34b2adeb0cef4b39781':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:14:52 +00:00
Deepanshu Gupta
5d3e3851bb am af3f96e4: am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'af3f96e4349f63f862de004853ba8e10e5ee51ae':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:11:23 +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
295184bc71 am 8782a120: resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
* commit '8782a12005e90bbd49be579fb8ede3a42a007380':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:10:55 +00:00
Deepanshu Gupta
af3f96e434 am e87c63e0: (-s ours) am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'e87c63e0e41cf34ef4b1ea1b06bf6a94c1f229c6':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 20:08:29 +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
Deepanshu Gupta
e87c63e0e4 am d2dff39b: am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'd2dff39b587bd073fcf5c97753c8a29e16f4ef57':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:43:09 +00:00
Deepanshu Gupta
8782a12005 resolved conflicts for merge of 61fb5784 to jb-mr1-dev 
Change-Id: I079d5db0d69fd1972e6754cdd1829dfd1645202d
 2014-06-04 12:43:01 -07: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
Deepanshu Gupta
d2dff39b58 am b1ca2a0c: am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'b1ca2a0c7fda713f5f2ebe928706dd813d87cabb':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:38:01 +00:00
Robert Greenwalt
b2be801f07 Merge "DO NOT MERGE Report new network scores back to factories." into lmp-preview-dev 2014-06-04 19:37:19 +00:00
Deepanshu Gupta
b1ca2a0c7f am f52fcc70: Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 
* commit 'f52fcc70541224c2d926f59461bde5a8bd6545a7':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:34:15 +00:00
Deepanshu Gupta
61fb578432 am 3ff08eb6: Distinguish between menus in ActionBar and popup. [DO NOT MERGE] 
* commit '3ff08eb6bf68868d4f4e872fbbf1ecaf521934a9':
  Distinguish between menus in ActionBar and popup. [DO NOT MERGE]
 2014-06-04 19:32:05 +00:00
Deepanshu Gupta
f52fcc7054 Merge "Distinguish between menus in ActionBar and popup. [DO NOT MERGE]" into jb-mr1.1-dev 2014-06-04 19:31:31 +00:00
Eric Laurent
88db5c37ad Merge "AudioSystem JNI: fix audio gain channel count" into lmp-preview-dev 2014-06-04 19:21:57 +00:00
Robert Greenwalt
8ae980dcef DO NOT MERGE 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
(cherry picked from commit 94a5c61cb82401dd777d0a7ac43183d92d955323)
 2014-06-04 19:15:17 +00:00
Raph Levien
dd12532941 Merge "Fix incorrect getStringBounds (Minikin)" into lmp-preview-dev 2014-06-04 19:10:48 +00: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
Fabrice Di Meglio
b223ab1b43 Merge "Update permissions assets for Quantum Theme" into lmp-preview-dev 2014-06-04 18:54:08 +00:00
Fabrice Di Meglio
318875bbcf Update permissions assets for Quantum Theme 
See bug: #14258811 Permissions icons are not visible in App info

Change-Id: I7167b636093cf56e3443fb46c89d693ba50eb59c
 2014-06-04 11:51:07 -07: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