Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
176,611 Commits 3 Branches 0 Tags
c56cd34dcafe0d854a3a2b234a32cf859708f1df
Commit Graph

176611 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jorim Jaggi
4ce66f19b5 am fa61bfa4: am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev automerge: 6995604 
* commit 'fa61bfa429edacc2bacf0f9e427e39359d02dfec':
  Tune spacing in navigation bar for small and big devices
 2014-10-30 19:20:03 +00:00
Jason Monk
5d06da8386 am 5d80f19c: Merge "QS: Only hide grid if there is detail to show" into lmp-mr1-dev 
automerge: 736695d

* commit '736695dc3ef2abb5fdb66c0e026e84fdc68a245f':
  QS: Only hide grid if there is detail to show
 2014-10-30 19:19:26 +00:00
Deepanshu Gupta
9fa48b09ad Fix BridgeContext.get*ResourceValue() 
getFrameworkResourceValue() and getProjectResourceValue() never really
returned the defValue passed to them, instead creating a new id for
non-existent resources. We now checks for the existence of the resources
before trying to obtain the id.

Change-Id: Ie3103ba32af6186651a5f77c27d1efc33dc2bcc7
 2014-10-30 12:18:56 -07:00
Kenny Guy
a349784180 am 8cfb3f1e: Merge "Listen for package changes for all users not just owner." into lmp-mr1-dev 
automerge: 5cf65f7

* commit '5cf65f7bf6ca0751749bff3f8c89ff9f0a3dc9cb':
  Listen for package changes for all users not just owner.
 2014-10-30 19:18:27 +00:00
Chris Wren
e52d0d68c4 am 402152d6: Merge "Reveal notification listener settings APIs." into lmp-mr1-dev 
automerge: b3239da

* commit 'b3239da9a0c3c75e5aea5e961cd8ed4fc627d42b':
  Reveal notification listener settings APIs.
 2014-10-30 19:17:17 +00:00
John Reck
97054254d4 am 141823ec: Merge "Be more conservative about current buffer" into lmp-mr1-dev 
automerge: a27e1a3

* commit 'a27e1a366a2d83165e71b68669fbd21ced6a4b08':
  Be more conservative about current buffer
 2014-10-30 19:16:14 +00:00
Jorim Jaggi
f35c187fc7 am 468e6b7e: am b9e290c7: Cancel ripple animations when window is hidden automerge: 987c680 
* commit '468e6b7e8b945385d229660a953b816355211d0c':
  Cancel ripple animations when window is hidden
 2014-10-30 19:15:54 +00:00
Calin Juravle
c482962401 am 298c170a: am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev automerge: 9917ebe 
* commit '298c170ae78d2c80f141e7cef15e42be3481549f':
  Fix the length of a profiler system property
 2014-10-30 19:15:49 +00:00
Erik Kline
c706f68d21 am 0d74973a: am befe778c: Treat optimistic addresses as global preferred. automerge: 9a8351d 
* commit '0d74973a08ebe4b7547100f7d60db07152cbbcd4':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:15:45 +00:00
Jinsuk Kim
ec571682e8 am 2dfb7397: am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev automerge: 44ce605 
* commit '2dfb7397b4c0f76c632ca7f229de4e234a425f99':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:15:40 +00:00
Anthony Lee
077fa6cc1c am 9802c4c2: am 6727926a: Added a function to clear accounts for a specified package. automerge: fe5e5dc 
* commit '9802c4c206d284a58d71a96c9e2ebead0ae69d86':
  Added a function to clear accounts for a specified package.
 2014-10-30 19:15:36 +00:00
Jorim Jaggi
ba541fd0c2 am 81aef807: Merge "Improve doze transitions" into lmp-mr1-dev 
automerge: 358aed4

* commit '358aed4587c3c278bff61b90291d4e69ab6b5b04':
  Improve doze transitions
 2014-10-30 19:14:48 +00:00
Geoff Mendal
c609f4db3f am a8a2844a: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
automerge: ef3d9bc  -s ours

* commit 'ef3d9bc8ac5208d8a8e30ae0a7e60a0dc461d2c4':
  Import translations. DO NOT MERGE
 2014-10-30 19:13:52 +00:00
Jorim Jaggi
fa61bfa429 am 6533c544: Merge "Tune spacing in navigation bar for small and big devices" into lmp-mr1-dev 
automerge: 6995604

* commit '699560479d76e3056e54bf3850ba301b6a0acf90':
  Tune spacing in navigation bar for small and big devices
 2014-10-30 19:12:58 +00:00
Jorim Jaggi
468e6b7e8b am b9e290c7: Cancel ripple animations when window is hidden 
automerge: 987c680

* commit '987c68090c8298f2d6a03ba01b703a5908ef16a2':
  Cancel ripple animations when window is hidden
 2014-10-30 19:11:56 +00:00
Calin Juravle
298c170ae7 am d3a8c8aa: Merge "Fix the length of a profiler system property" into lmp-mr1-dev 
automerge: 9917ebe

* commit '9917ebed862ed8b687f5d17779c4e250fb5a30f6':
  Fix the length of a profiler system property
 2014-10-30 19:11:00 +00:00
Lorenzo Colitti
5c313dccad am 2f3dab85: am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev automerge: ba69b3f 
* commit '2f3dab8585a1a11d2576a8b3164defe95191d513':
  Support more than one clatd at a time.
 2014-10-30 19:10:46 +00:00
Alan Viverette
c5b0309bf8 am 25128b0b: am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev automerge: b00c424 
* commit '25128b0b5a0472068ec73ac83082dc2e3429d144':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:10:41 +00:00
Shishir Agrawal
e6d4f45611 am 060afd45: am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev automerge: 47fa171 
* commit '060afd455fa8260c7ea262d0c1d2d555bc6771ea':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:10:37 +00:00
Ihab Awad
07de9295f1 am ac2b7f75: am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev automerge: 0ca329e 
* commit 'ac2b7f75cc701722c7d41c0f2f79b2b3fcb66e9a':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-30 19:10:32 +00:00
Erik Kline
0d74973a08 am befe778c: Treat optimistic addresses as global preferred. 
automerge: 9a8351d

* commit '9a8351d9d7d1e002187fca20fea48d1e9214d829':
  Treat optimistic addresses as global preferred.
 2014-10-30 19:10:04 +00:00
Jinsuk Kim
2dfb7397b4 am 8be95fdd: Merge "CEC: Use language code "chi" for Traditional Chinese" into lmp-mr1-dev 
automerge: 44ce605

* commit '44ce60502439d4ae37a5316efaaafbbeede3cda3':
  CEC: Use language code "chi" for Traditional Chinese
 2014-10-30 19:09:06 +00:00
Anthony Lee
9802c4c206 am 6727926a: Added a function to clear accounts for a specified package. 
automerge: fe5e5dc

* commit 'fe5e5dc13a934581a05c740bfa104e078e94899d':
  Added a function to clear accounts for a specified package.
 2014-10-30 19:07:57 +00:00
Lorenzo Colitti
2f3dab8585 am def4cd4f: Merge "Support more than one clatd at a time." into lmp-mr1-dev 
automerge: ba69b3f

* commit 'ba69b3f290e6fe4a579841a2dd052ca5803ba863':
  Support more than one clatd at a time.
 2014-10-30 19:07:02 +00:00
Alan Viverette
25128b0b5a am 05b2fedc: Merge "Inflate ActionMode items against the ActionBarContextView theme" into lmp-mr1-dev 
automerge: b00c424

* commit 'b00c4242579ac9c42c01656cb7b10f394f55a445':
  Inflate ActionMode items against the ActionBarContextView theme
 2014-10-30 19:05:27 +00:00
Shishir Agrawal
060afd455f am c8787bec: Merge "Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37" into lmp-mr1-dev 
automerge: 47fa171

* commit '47fa1715221b50334ca1df1eab148cd50eeef608':
  Undo erroneous delete done by I94eb65c62231b5831570bb0cbbbd9c916bee0a37
 2014-10-30 19:04:24 +00:00
Ihab Awad
ac2b7f75cc am 6c37f374: Merge "PhoneAccounts include literal icon bitmap (1/4)" into lmp-mr1-dev 
automerge: 0ca329e

* commit '0ca329e5d4ea9057337c30ca07ff5009ffc01a34':
  PhoneAccounts include literal icon bitmap (1/4)
 2014-10-30 19:03:04 +00:00
Deepanshu Gupta
df0ebab0f9 Support framework menus in ActionBar 
Add support for adding menus in the framework namespace to the ActionBar
preview. If a menu id name begins with the android namespace prefix
(android:) we find the framework menu and render it.

Change-Id: If52910b46154591883af2b2f357e72eea6f84235
 2014-10-30 11:58:37 -07:00
Deepanshu Gupta
0bffc736e1 Use the right layout for inflating Action Bar. 
The choice of Action Bar layout depends on the theme. This also affects
the widget used to render the Action Bar.

Bug: http://b.android.com/77853
Change-Id: I6219a02853b4cd207a6125a5ed96fa5d16699460
 2014-10-30 11:58:37 -07:00
David Friedman
e91c37de78 Fixes wrongly nested braces. 
Bug: 17499985

Change-Id: I6dc7abb14c06462a3eb9be3cb15d8baf11115323
 2014-10-30 11:55:53 -07:00
Selim Cinek
db885e22bd am a68da938: Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 
* commit 'a68da9382996132bb41d6f60b87a3bd5f8028b45':
  Fixed a bug with notification clipping
 2014-10-30 18:40:00 +00:00
Geoff Mendal
9e41639e92 am 8a44f0f0: (-s ours) am 07c45951: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '8a44f0f0be491f90714635a43b47ea7c3553e171':
  Import translations. DO NOT MERGE
 2014-10-30 18:39:30 +00:00
Geoff Mendal
b4d2cba5b2 am 990c7ced: (-s ours) am 6904eac7: (-s ours) Import translations. DO NOT MERGE 
* commit '990c7ced907339e27ea8c2a6aedd75abdd587fd3':
  Import translations. DO NOT MERGE
 2014-10-30 18:39:26 +00:00
Baligh Uddin
ea678bcc43 Import translations. DO NOT MERGE 
Change-Id: Ibb9bd8d9ad878936b39a754d968d1bd84d3e9b74
Auto-generated-cl: translation import
 2014-10-30 11:34:37 -07:00
Selim Cinek
a68da93829 Merge "Fixed a bug with notification clipping" into lmp-mr1-dev 2014-10-30 18:33:14 +00:00
Alan Viverette
f7dee54b62 Only draw AbsListView selector when focused or pressed 
BUG: 18176135
Change-Id: Ibd9d9c0f439e5daa8eba606abc5ff055a3d8ff0c
 2014-10-30 11:26:29 -07:00
Guang Zhu
0620c451da also add backtraces of CPUs before watchdog kills system server 
Bug: 18003452
Change-Id: I052fe0b2948ea036c3f1b842ea6270b6f11eadef
 2014-10-30 18:25:05 +00:00
John Spurlock
a0adb0bd46 am fc2b9039: Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 
* commit 'fc2b9039b87afd3067f563a9bf59504a8bdf8a87':
  Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS.
 2014-10-30 18:19:48 +00:00
Selim Cinek
c5baa3eb08 Fixed a bug with notification clipping 
The clip rect was not correctly set for a view which
was fading out leading to some overdraw.
It also fixes a bug where the alpha was not applied when
made invisible.

Bug: 16077953
Change-Id: I4c26aee88c5c87147df31ec7fb413bc63cd2625c
 2014-10-30 19:19:26 +01:00
David Friedman
7e8d8b8da0 Fixed ADB documentation to work properly on Windows 
Bug: 17192985

Change-Id: Iea9eb4e1eb53718ddfb0ca3e1c5f09504f987457
 2014-10-30 11:19:20 -07:00
John Spurlock
fc2b9039b8 Merge "Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS." into lmp-mr1-dev 2014-10-30 18:12:23 +00:00
Rubin Xu
d7892e71a8 Fix equality test in getProfileOwnerAdmin() 
The equality test should compare a ComponentName, which admin.info is not.

Bug: 18186447
Change-Id: If984ae2e0da958889564ba30716d65245a78d60f
 2014-10-30 17:57:23 +00:00
Hyejin Kim
5baaaac7c7 Fix not to show a log with empty default ime 
It'll make reboot to show a log with empty defualt ime.

Bug: 18165757
Change-Id: I7a0d55bc0da0566a60abb24123c1dbcdd03be9ed
 2014-10-30 17:49:54 +00:00
Alan Viverette
e9e7d012dd am 272e2f73: Merge "Ensure we don\'t pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 
* commit '272e2f73bd825aa6b1db0a5b332effe8b84d7b8c':
  Ensure we don't pass null values in to Theme.resolveAttributes
 2014-10-30 17:43:27 +00:00
John Spurlock
734666657f Unhide Settings.ACTION_BATTERY_SAVER_SETTINGS. 
Bug: 18186862
Change-Id: I685934118a53ba2135eaf0872564e58069de2a30
 2014-10-30 13:42:05 -04:00
Alan Viverette
272e2f73bd Merge "Ensure we don't pass null values in to Theme.resolveAttributes" into lmp-mr1-dev 2014-10-30 17:38:40 +00:00
Alan Viverette
7f4a63d1eb Ensure we don't pass null values in to Theme.resolveAttributes 
BUG: 18182274
Change-Id: I08acf877cb81478cc205254edf92a31fcf05991d
 2014-10-30 10:29:03 -07:00
Geoff Mendal
8a44f0f0be am 07c45951: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '07c45951be4ae801e3d7de016d9e98e12dbcda00':
  Import translations. DO NOT MERGE
 2014-10-30 16:59:25 +00:00
Geoff Mendal
990c7ced90 am 6904eac7: (-s ours) Import translations. DO NOT MERGE 
* commit '6904eac728cd94007c6d7787c56960c8cffcd4f1':
  Import translations. DO NOT MERGE
 2014-10-30 16:59:14 +00:00
Ricardo Cervera
44e79cc59a am e0a3bcfb: am 0db81996: am e0acf536: am e3dd89a4: Merge "docs: Two-page notification fix." into lmp-docs 
* commit 'e0a3bcfbe1637db8584b176a67447f152716036f':
  docs: Two-page notification fix.
 2014-10-30 15:50:31 +00:00