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

181975 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Filip Gruszczynski
fe7712e758 am 7acd679c: Merge "Add wallpaper controlling system apis." into lmp-mr1-modular-dev 
automerge: 96f3462

* commit '96f3462958977a29aeb8acf102dd5e86c4a5417a':
  Add wallpaper controlling system apis.
 2015-02-06 00:16:41 +00:00
Filip Gruszczynski
3f579c7167 am 00de5c9f: Merge "Add hidden shutdown method to PowerManager." into lmp-mr1-modular-dev 
automerge: 943c09d

* commit '943c09d7204b15aadce041508972517763701cd3':
  Add hidden shutdown method to PowerManager.
 2015-02-06 00:15:12 +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
Craig Mautner
83f367475b Merge "Revert "Revert "Do not display ADB confirm dialog during boot""" 2015-02-06 00:01:45 +00:00
Craig Mautner
b43d3cff67 Revert "Revert "Do not display ADB confirm dialog during boot"" 
This reverts commit e37099ffdfc966d52b4323a3705359ea42fa283e.

Fixes bug 18652251

Change-Id: Ib00e8269558aae294ff6453d1f6ceef1771c4572
 2015-02-06 00:01:28 +00:00
Craig Mautner
968aca1d7e Merge "Revert "Do not display ADB confirm dialog during boot"" 2015-02-06 00:00:30 +00:00
Craig Mautner
e37099ffdf Revert "Do not display ADB confirm dialog during boot" 
This reverts commit 34e90b2214b39db31bccaf24644d0db55bcde965.

Change-Id: Ib385793aa2b7472933bdb0c707b10e2bac1a4cb3
 2015-02-06 00:00:17 +00:00
Alan Viverette
f8512ce081 Mutate scroll bar drawables 
Bug: 19285726
Change-Id: I4bb596433c1fa1cc4e2fa53d0cdae992f9add858
 2015-02-05 15:58:56 -08:00
Craig Mautner
b8415ecfe9 Merge "Do not display ADB confirm dialog during boot" 2015-02-05 23:58:16 +00:00
RoboErik
5387988fc9 Merge "Make isStreamMute correctly handle master volume devices" 2015-02-05 23:23:16 +00:00
Alan Viverette
f5a7df1576 am c3ea7e39: am 69a62a8b: Merge "Update preference dialog padding to Material" into lmp-mr1-dev automerge: eb6f3f8 
* commit 'c3ea7e39e51beeac824e3a204e0b5486dca38e91':
  Update preference dialog padding to Material
 2015-02-05 23:21:26 +00: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
Sanket Padawe
b15c00a551 am 0a4c2646: am 04db9797: Merge "Suppress phone number from logcat." into lmp-mr1-dev automerge: 4eed340 
* commit '0a4c2646f4b72fdc78299dbb3dd86a7aecefff08':
  Suppress phone number from logcat.
 2015-02-05 23:16:46 +00:00
John Spurlock
14a9f9cac7 am c46b68c7: am 9adf1c54: am ac7b9dd3: am 42d3b66f: am e0852368: Fix a few typos in Parcel.java. automerge: 29fabd8 
* commit 'c46b68c7a230847cd5a459d7fec5a5649f5c6d67':
  Fix a few typos in Parcel.java.
 2015-02-05 23:16:41 +00:00
Ruben Brunk
7bf20e4791 am 78ee9807: am cd0d7cde: Merge "camera2: Make legacy error handling more robust." into lmp-mr1-dev automerge: 2a11473 
* commit '78ee9807387e87714c74e6944d538409e0677b74':
  camera2: Make legacy error handling more robust.
 2015-02-05 23:16:36 +00:00
Adam Lesinski
9a647096ac am 88c5abb3: am 967439b4: Merge "Make ArrayMap.EMPTY immutable" into lmp-mr1-dev automerge: abc88d0 
* commit '88c5abb33f0e306a8add10fcef90733aa205799e':
  Make ArrayMap.EMPTY immutable
 2015-02-05 23:16:31 +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
Dianne Hackborn
02cc7e2204 am 4fdac613: am 5c2fdc33: Merge "Always re-establish kernel alarms when considering new alarm set" into lmp-mr1-dev automerge: 29039a2 
* commit '4fdac61388bd25a4a5bf6caef5bee0360e48ab51':
  Always re-establish kernel alarms when considering new alarm set
 2015-02-05 23:07:46 +00:00
Jason Monk
41908a2faa am ba87ba5e: am 3bbc5a11: Merge "Ellipsize QS detail items when needed" into lmp-mr1-dev automerge: 6d72d46 
* commit 'ba87ba5e4cc929f34921ff9fa875c38eca2bc1d0':
  Ellipsize QS detail items when needed
 2015-02-05 23:07:41 +00:00
Alan Viverette
688ecaa7b9 am 00a1fa3e: am f15f6a50: Merge "Invalidate SubtitleView during setText()" into lmp-mr1-dev automerge: f1a4d0e 
* commit '00a1fa3e433d333c58156ff4f1ede086b6ab0a09':
  Invalidate SubtitleView during setText()
 2015-02-05 23:07:34 +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
Brian Attwell
204a51f8be Merge "Unhide and rename PhoneNumberUtils tts methods" 2015-02-05 22:40:24 +00:00
Brian Attwell
c6dbe3be2c Unhide and rename PhoneNumberUtils tts methods 
Renamed ttsSpanAsPhoneNumber #1 -> getPhoneTtsSpannable
Renamed ttsSpanAsPhoneNumber #2 -> addPhoneTtsSpan
Added  				   getPhoneTtsSpan

Instead of removing the original hidden methods, I deprecated them.
Since Telephony changes initially get checked into wireless-dev
branch and dialer/contacts changes get checked into master branch,
immediately deleting the ttsSpanAsPhoneNumber methods would break
builds.

In ContactsCommon, I plan on removing
ContactDisplayUtils#getTelephoneTtsSpannable and instead using
these Telephony APIs. Numbers I tested worked in ToT master talkback:
911, (650) 215 3111, 22222222222, 333-3333, 013334612234, +1 905 471 8484,
001 39 02 444 4444. The changes in this diff cause the numbers
to be talked-back at least as well as before.

Some context: go/question-about-telephonys-ttsspan

Bug: 18777272
Change-Id: I3a6ead3ee9c030761bde903cf88f4aa4fc7a3460
 2015-02-05 14:32:03 -08:00
Craig Mautner
81451d3bf2 Merge "Code cleanup." 2015-02-05 22:26:29 +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
Kenny Guy
3775a3f886 am a2ced3e8: am 8d12d3da: Merge "Only switch user if current user is being wiped" into lmp-mr1-dev automerge: eeb43fb 
* commit 'a2ced3e879458786edf715a0016293791db7fd65':
  Only switch user if current user is being wiped
 2015-02-05 19:39:36 +00: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