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

182093 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Elliott Hughes
7ff53fa0d4 Fix clang build. 
Change-Id: If795820ef6431fee9c9c3862cc91ad4a9cc04507
 2015-02-05 21:36:10 -08:00
Scott Kennedy
e6ca429720 Make setOn[Long]ClickListener() take a @Nullable argument 
Change-Id: I923d1f986fa26cbf2a884c52af70469941daf8ea
 2015-02-05 21:03:42 -08:00
Chong Zhang
fb54267e71 am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev automerge: eceae03 
automerge: 3968f0c

* commit '3968f0c2dfa5cbb1432d49af47ad2fa89f1b2225':
  reset col position to 1 on row PAC
 2015-02-06 03:21:37 +00:00
Chong Zhang
3968f0c2df am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
automerge: eceae03

* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 03:17:36 +00:00
Bryce Lee
40a0ee65f2 Expose userActivityTimeout through @SystemApi getter/setter. 
This change will make it accessible to unbundled wear home.

Bug: 18721755
Change-Id: I0634dbc5d8d8ebe25e45af0a1b1186fda5254dd5
 2015-02-06 02:42:52 +00:00
Bryce Lee
e847b5baef Make THEATER_MODE_ON a System API. 
Bug: 19043538
Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8
(cherry picked from commit cdfebd60fad097fa58d45f13104990cd323be61b)
 2015-02-06 02:41:09 +00:00
Bryce Lee
cc8b467c59 Add voice assist action for global actions. 
Bug: 18919886
Change-Id: Idd74cf6980207deabfb312732a0316a2edf3c176
 2015-02-05 18:39:01 -08:00
Chong Zhang
1836f6b8f3 am eceae03f: am 6cad6513: Merge "reset col position to 1 on row PAC" into lmp-mr1-dev 
* commit 'eceae03f6a21b36baddabe4ca5a2c1d9d238240a':
  reset col position to 1 on row PAC
 2015-02-06 02:26:14 +00:00
Bryce Lee
01b0c5f55b Allow single press of physical button to go home without sleeping. 
Bug: 18921423
Change-Id: Ic7ee7daeaf1b4e08a7c53451615736ee7a08fb61
 2015-02-05 18:24:04 -08:00
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
b989c5561e resolve merge conflicts of da9653a to master. 
Change-Id: I7458452389fb7b048fe5c6daa375fd4dbb9d9766
 2015-02-05 17:10:47 -08: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
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