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

174206 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chong Zhang
eceae03f6a am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit '6cad6513e0058467d11f4cf99519cf79eb65d48f':
  reset col position to 1 on row PAC
 2015-02-06 02:12:16 +00:00
Chong Zhang
6cad6513e0 Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 2015-02-06 02:06:24 +00:00
Alan Viverette
cbe32de454 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
automerge: 80b381c

* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
 2015-02-06 00:53:09 +00:00
Chong Zhang
6286f8ec05 reset col position to 1 on row PAC 
bug: 19284568
Change-Id: I7d439027ab6411bcd5c149580babee80dc5f9478
 2015-02-05 16:46:06 -08:00
Alan Viverette
bbde12138c am 80b381c0: am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '80b381c0736c1af43801b8ed26428abdf4d437b3':
  Mutate scroll bar drawables
 2015-02-06 00:31:37 +00:00
Alan Viverette
80b381c073 am 9a166c7d: Merge "Mutate scroll bar drawables" into lmp-mr1-dev 
* commit '9a166c7da3d77c4b9801dbe249f78149649d5b0e':
  Mutate scroll bar drawables
 2015-02-06 00:25:33 +00:00
Alan Viverette
9a166c7da3 Merge "Mutate scroll bar drawables" into lmp-mr1-dev 2015-02-06 00:19:44 +00:00
Filip Gruszczynski
96f3462958 am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 
* commit '7acd679cb3f3c543ad71aaeb1057bcbef3a880e5':
  Add wallpaper controlling system apis.
 2015-02-06 00:09:41 +00:00
Filip Gruszczynski
943c09d720 am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 
* commit '00de5c9f04e42045bd0299c06a9cc05187b1dff0':
  Add hidden shutdown method to PowerManager.
 2015-02-06 00:09:35 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables 
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
 2015-02-05 15:58:56 -08:00
Filip Gruszczynski
7acd679cb3 Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 2015-02-05 23:19:01 +00:00
Filip Gruszczynski
00de5c9f04 Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 2015-02-05 23:18:41 +00:00
Alan Viverette
c3ea7e39e5 am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev 
automerge: eb6f3f8

* commit 'eb6f3f885154914eec6a747265d1f568ae50380c':
  Update preference dialog padding to Material
 2015-02-05 23:12:34 +00:00
Sanket Padawe
0a4c2646f4 am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev 
automerge: 4eed340

* commit '4eed340437d23a9b4fabf2881557325b863af23c':
  Suppress phone number from logcat.
 2015-02-05 23:10:57 +00:00
John Spurlock
c46b68c7a2 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
automerge: 29fabd8

* commit '29fabd8988b95e5ff41167a74dfc67937988b3db':
  Fix a few typos in Parcel.java.
 2015-02-05 23:08:51 +00:00
Ruben Brunk
78ee980738 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
automerge: 2a11473

* commit '2a114737c636e69a65478778c6edb24c2266518e':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:07:13 +00:00
Adam Lesinski
88c5abb33f am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 
automerge: abc88d0

* commit 'abc88d0743924441bf7fcd3085e3305b076f5af5':
  Make ArrayMap.EMPTY immutable
 2015-02-05 23:05:40 +00:00
Dianne Hackborn
4fdac61388 am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
automerge: 29039a2

* commit '29039a2bdbadcc427a966f5e7a6021fd424c4266':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 23:04:21 +00:00
Jason Monk
ba87ba5e4c am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
automerge: 6d72d46

* commit '6d72d46b4b6fe0ec72c24ea5369c6d92fd29ba52':
  Ellipsize QS detail items when needed
 2015-02-05 23:02:57 +00:00
Alan Viverette
00a1fa3e43 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
automerge: f1a4d0e

* commit 'f1a4d0e864f17c59c0e292e8f1161ab4397e5ba4':
  Invalidate SubtitleView during setText()
 2015-02-05 23:00:44 +00:00
Alan Viverette
eb6f3f8851 am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev 
* commit '69a62a8b0df71b0a26d55c29c71dd311dbe174c7':
  Update preference dialog padding to Material
 2015-02-05 22:11:32 +00:00
Alan Viverette
69a62a8b0d Merge "Update preference dialog padding to Material" into lmp-mr1-dev 2015-02-05 22:06:36 +00:00
Sanket Padawe
4eed340437 am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev 
* commit '04db979728ce0c2ea67c5ac5d7a1c2f02f53863d':
  Suppress phone number from logcat.
 2015-02-05 20:56:31 +00:00
Sanket Padawe
04db979728 Merge "Suppress phone number from logcat." into lmp-mr1-dev 2015-02-05 20:51:10 +00:00
John Spurlock
29fabd8988 am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '9adf1c54226940e9f9065d92b4edd2b232122302':
  Fix a few typos in Parcel.java.
 2015-02-05 20:47:23 +00:00
John Spurlock
9adf1c5422 am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit 'ac7b9dd39f64118a2129c17cdc7b6c93e53e1c42':
  Fix a few typos in Parcel.java.
 2015-02-05 20:39:36 +00:00
Alan Viverette
2fb5a6ab9f Update preference dialog padding to Material 
Mostly copy/paste of the Holo with some padding fiddling to make the
EditText, which has baked-in padding, and TextView line up.

Bug: 19280124
Change-Id: I4a8ad7dcc1f1bd519f4d1c506984871a25a1db31
 2015-02-05 12:35:07 -08:00
Filip Gruszczynski
9fedc72a0b Add wallpaper controlling system apis. 
Change-Id: Ibaa8009e9b9d2e58254a4d9107a316c7f1de2211
 2015-02-05 12:29:42 -08:00
John Spurlock
ac7b9dd39f am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. 
* commit '42d3b66f48906e35244ffc9a45daae87021fc1a5':
  Fix a few typos in Parcel.java.
 2015-02-05 20:27:59 +00:00
Ruben Brunk
2a114737c6 am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 
* commit 'cd0d7cdefef0dbf395e5b159dccb6e884a2077b7':
  camera2: Make legacy error handling more robust.
 2015-02-05 20:19:55 +00:00
John Spurlock
42d3b66f48 am e0852368: Fix a few typos in Parcel.java. 
* commit 'e08523684d5414117f81debd4eb14bc8eb494c29':
  Fix a few typos in Parcel.java.
 2015-02-05 20:18:03 +00:00
Filip Gruszczynski
d05af86e6e Add hidden shutdown method to PowerManager. 
Bug: 17420540

We need to be able to shutdown some of wearable devices programatically.
We should be able to do it by connecting to PowerManagerService directly,
but it would be nice to go through the official interface.

Change-Id: Id0cf3b36c03447356fc60fb90cbb2f4b47d8265e
 2015-02-05 12:12:43 -08:00
Ruben Brunk
cd0d7cdefe Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev 2015-02-05 19:54:37 +00:00
Kenny Guy
74a7024af0 Fix mangled javadoc for setPermittedInputMethods. 
Fix java doc for setPermittedInputMethods.

Bug: 19276777
Change-Id: Iecd670b35cd675ff9dd4654c9876697801eb20ac
 2015-02-05 19:48:38 +00:00
Sanket Padawe
1acdd4b1f4 Suppress phone number from logcat. 
Bug: 19251204
Change-Id: I042bc3c0a89967eeae547b059f06cf05de005b25
 2015-02-05 11:45:27 -08:00
Adam Lesinski
abc88d0743 am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 
* commit '967439b4d1151a613058b1439e1e4240cdef28d9':
  Make ArrayMap.EMPTY immutable
 2015-02-05 19:39:27 +00:00
Dianne Hackborn
29039a2bdb am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 
* commit '5c2fdc331f81b671d426f3f5a7e59cd9cbed80bf':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 19:39:23 +00:00
Jason Monk
6d72d46b4b am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 
* commit '3bbc5a113403886b16d276f2438677c5381bfab6':
  Ellipsize QS detail items when needed
 2015-02-05 19:39:18 +00:00
Alan Viverette
f1a4d0e864 am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 
* commit 'f15f6a5087f22a0d083be9edc08e860e51c9a0d0':
  Invalidate SubtitleView during setText()
 2015-02-05 19:39:14 +00:00
Adam Lesinski
967439b4d1 Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev 2015-02-05 19:27:00 +00:00
Dianne Hackborn
5c2fdc331f Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev 2015-02-05 19:26:32 +00:00
Jason Monk
3bbc5a1134 Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev 2015-02-05 19:19:43 +00:00
Alan Viverette
f15f6a5087 Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev 2015-02-05 19:16:58 +00:00
Adam Lesinski
b6bdb0f02d Make ArrayMap.EMPTY immutable 
This is a regression from KitKat.

Bug:19271657
Change-Id: I11b8e4dd50f6a8d2b15fef66b44aa2d72b1f0349
 2015-02-05 11:11:03 -08:00
Kenny Guy
a2ced3e879 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
automerge: eeb43fb

* commit 'eeb43fbd61adfc6511528e2e13fd5372a14e2831':
  Only switch user if current user is being wiped
 2015-02-05 18:51:53 +00:00
Alan Viverette
3f7360df82 Invalidate SubtitleView during setText() 
Ensures that even if layout does not change, the view is redrawn.

Bug: 19277437
Change-Id: I078ee3176c2bac6c754a0e2f378f97370ecef76a
 2015-02-05 09:58:49 -08:00
Jason Monk
867874b06a Ellipsize QS detail items when needed 
Bug: 19262637
Change-Id: I395125a7c00e558e914aff9cf9c48a363435a9b2
 2015-02-05 11:54:58 -05:00
Kenny Guy
eeb43fbd61 am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 
* commit '8d12d3da15a92fde05256c51f8a3085ab9399c0f':
  Only switch user if current user is being wiped
 2015-02-05 15:26:09 +00:00
Kenny Guy
8d12d3da15 Merge "Only switch user if current user is being wiped" into lmp-mr1-dev 2015-02-05 12:34:45 +00:00
Alan Viverette
eeb69d171b Move layer-list to be top-level element in seek bar progress automerge: bac8e12 
automerge: 6708ac4

* commit '6708ac40f29c2437d3cb67ffa7604aecbdad1fe7':
  Move layer-list to be top-level element in seek bar progress
 2015-02-05 03:45:31 +00:00