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

164140 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Viverette
e354a9e4da Check MenuItem.isVisible() for keyboard shortcuts 
Parity with support-v7 change.

BUG: 18021345
Change-Id: I583b586d451a21bbd207d2b0584a396e1125ee59
 2014-10-21 12:21:32 -07:00
smain@google.com
a010375c54 some fixes to TV App quality and TV games doc. 
add section to TV Games doc about controller instructions w/ template download.
clarify use of <meta-data> tag and standardize headings per Training conventions.

Change-Id: I6f61a0d4fd976098a6db9ded33c61419a764ad4f
 2014-10-21 12:18:35 -07:00
Adam Powell
0b3c11260a Intent chooser callback 
Let an app specify an IntentSender as an extra for ACTION_CHOOSER that
will be notified of the user's chosen target. Apps can use this to
implement things like one-touch last used affordances without
implementing their own one-off chooser UI.

Bug 17363684

Change-Id: Ic5d1d0e0c7a0bae3eda6b1d6ade993f3ba865cfa
 2014-10-21 12:17:50 -07:00
John Spurlock
1a3f7db001 VolumeDialog: Restore default-selection logic. 
Bug: 18066513
Change-Id: Ie72189edf9b59fd8d192d882aaadf1ac05dcb359
 2014-10-21 15:16:16 -04:00
John Spurlock
184c46a93d am c6639c26: am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 
* commit 'c6639c26ed6fddafd73210e535b0bb359a8192c0':
  Settings: Make SeekBarVolumizer more null-resilient.
 2014-10-21 18:48:18 +00:00
John Spurlock
c6639c26ed am cc8b3e8d: Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 
* commit 'cc8b3e8d4e561026cf673c9a234cc151f17b3362':
  Settings: Make SeekBarVolumizer more null-resilient.
 2014-10-21 18:43:06 +00:00
John Spurlock
cc8b3e8d4e Merge "Settings: Make SeekBarVolumizer more null-resilient." into lmp-mr1-dev 2014-10-21 18:39:20 +00:00
Alan Viverette
ef2fef1719 am ed89e452: am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 
* commit 'ed89e45253ffded993ed88cd33457f45dbd6a32b':
  Fix gradient drawable radius when specified as float, dimension
 2014-10-21 18:39:06 +00:00
Alan Viverette
ed89e45253 am 7c133e19: Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 
* commit '7c133e19ddabe753a9c0d49d814c89f9df4121ad':
  Fix gradient drawable radius when specified as float, dimension
 2014-10-21 18:33:26 +00:00
John Spurlock
31171de1d9 am e9411161: am 624dd5ce: Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev 
* commit 'e9411161699b7a60d2d60b001f6fdb4c9c102b0a':
  Sysui: Include shared prefs in service dump.
 2014-10-21 18:29:13 +00:00
Alan Viverette
c74ca4415e am a74b9432: am 3d52809b: Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 
* commit 'a74b9432e893acf8989fa9e2f553c0bdd3cc48d8':
  Prevent excessive accessibility announcements in TimePicker
 2014-10-21 18:29:08 +00:00
Alan Viverette
2c861c782d am 0a8a3eab: am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev 
* commit '0a8a3eab8bfc3390e1225dfade40599279b4921b':
  Propagate state changes even when we don't change drawable index
 2014-10-21 18:29:02 +00:00
Alan Viverette
7c133e19dd Merge "Fix gradient drawable radius when specified as float, dimension" into lmp-mr1-dev 2014-10-21 18:25:01 +00:00
John Spurlock
e941116169 am 624dd5ce: Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev 
* commit '624dd5ce9d6dbdf6522d51134128cb9baadd558e':
  Sysui: Include shared prefs in service dump.
 2014-10-21 18:23:30 +00:00
John Spurlock
735f9ebc18 Settings: Make SeekBarVolumizer more null-resilient. 
Now that the instances are reusable, ensure all "post" methods
do a handler check, and ensure they are all internal.

Bug: 18063070
Change-Id: Idc478c636686f666f5656f3d07bf2738ba3e9a5a
 2014-10-21 14:23:24 -04:00
Alan Viverette
a74b9432e8 am 3d52809b: Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 
* commit '3d52809bad2d96f7f39aa50e51bd53c69607cb4e':
  Prevent excessive accessibility announcements in TimePicker
 2014-10-21 18:18:55 +00:00
Alan Viverette
0a8a3eab8b am 46b4920a: Merge "Propagate state changes even when we don\'t change drawable index" into lmp-mr1-dev 
* commit '46b4920ac85c5294174df9421eb9a69b0c9b5d55':
  Propagate state changes even when we don't change drawable index
 2014-10-21 18:18:50 +00:00
John Spurlock
624dd5ce9d Merge "Sysui: Include shared prefs in service dump." into lmp-mr1-dev 2014-10-21 18:16:47 +00:00
Alan Viverette
3d52809bad Merge "Prevent excessive accessibility announcements in TimePicker" into lmp-mr1-dev 2014-10-21 18:16:25 +00:00
Alan Viverette
46b4920ac8 Merge "Propagate state changes even when we don't change drawable index" into lmp-mr1-dev 2014-10-21 18:14:50 +00:00
Alan Viverette
2efbe9816e Fix gradient drawable radius when specified as float, dimension 
BUG: 18070756
Change-Id: I991ff792c376c9695a007f8f1187390ab5ff6e3c
 2014-10-21 11:04:04 -07:00
Elliott Hughes
1bb42f06e2 am 09a7d324: am 388dbd28: Merge "Include <time.h> for clock_nanosleep." 
* commit '09a7d324ef15dab7f7bea72aa16b1585285cadf1':
  Include <time.h> for clock_nanosleep.
 2014-10-21 17:59:04 +00:00
Ye Wen
2cb65604bc Send HTTP status code back in case of MMS HTTP failure (1/3) 
We need this in SMS app so that we can treat 404 specially

b/17520290

Change-Id: Ifae1c1b323411143c740fb589c2b978b5ff9bc4e
 2014-10-21 10:58:06 -07:00
Elliott Hughes
09a7d324ef am 388dbd28: Merge "Include <time.h> for clock_nanosleep." 
* commit '388dbd28ac977782c2ff7a0ba97e2fbfaebfed4b':
  Include <time.h> for clock_nanosleep.
 2014-10-21 17:53:50 +00:00
Elliott Hughes
388dbd28ac Merge "Include <time.h> for clock_nanosleep." 2014-10-21 17:49:03 +00:00
Elliott Hughes
bb94f3107e Include <time.h> for clock_nanosleep. 
Change-Id: If3098fa03003bce5d06d60e9129c10cce3c850bb
 2014-10-21 10:41:33 -07:00
Andrew Lee
8f8e473cac Fire onConferenceChanged after reseting conference. 
Bug: 17423848
Change-Id: Ic53f40e806f2bfd5b49bff2caad64bb93b290bad
 2014-10-21 10:32:49 -07:00
Ricardo Cervera
f08c488b19 docs: Fixed 404 link in SDK Tools page. 
Bug: 17950558

Change-Id: Ibd110b6aa693b4f5f4c8ca46efdb2c32a88f3dd2
 2014-10-21 10:18:19 -07:00
Ricardo Cervera
2102ac1eed docs: Fix hprof-conv location in docs. 
https://code.google.com/p/android/issues/detail?id=76691

Change-Id: I8550731c1defe867d26d5ab4568c4935c89e37d6
 2014-10-21 10:12:08 -07:00
John Spurlock
7bbb9f6410 Sysui: Include shared prefs in service dump. 
Also:
 - Remove obsolete Prefs helper.
 - Use common file for zen-mode prefs.

Bug: 18062541
Change-Id: I9a6a4733eac0ec1c55da5d359c996cb5fe3bb8af
 2014-10-21 12:26:45 -04:00
Dan Albert
827d00f2f4 am 3d23d557: am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 
* commit '3d23d557ff00010c041ec3fc655472db3d12509e':
  More LOCAL_ADDITIONAL_DEPENDENCIES.
 2014-10-21 16:11:52 +00:00
tingna_sung
9dde78f7da Avoid to skip app window due to un-assigned sending to bottom state while app window sort 
should assign value of WindowToken.sendingToBottom according to the state of this token is moved to top or bottom
to avoid app window is skiped incorrectly due to sending to bottom state is un-assigned while app window sort
and finding focus window.

Change-Id: I190838d1d01ca229155d5176930178ab41335556
Signed-off-by: tingna_sung <tingna_sung@htc.com>
 2014-10-22 00:07:08 +08:00
Dan Albert
3d23d557ff am 7f2bc6c7: Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 
* commit '7f2bc6c73b9f21515235fb638a0f510af3c45b44':
  More LOCAL_ADDITIONAL_DEPENDENCIES.
 2014-10-21 16:06:36 +00:00
Dan Albert
7f2bc6c73b Merge "More LOCAL_ADDITIONAL_DEPENDENCIES." 2014-10-21 16:03:10 +00:00
Dan Albert
00b4e773ab More LOCAL_ADDITIONAL_DEPENDENCIES. 
Change-Id: I9bf20507442b0722e93446fdb32d8236be974e28
 2014-10-21 08:58:39 -07:00
Ricardo Cervera
449319b535 docs: Fixing misc minor bugs. 
Bug: 13872976

Change-Id: I4ea9893b81d8157bf8699820f25c086fd0c4911c
 2014-10-21 08:32:02 -07:00
Adrian Roos
7b4a38b197 Delay discovery of system trust agents 
Waits for BOOT_COMPLETED when enabling system trust agents.
This fixes an issue where no agents were discovered because the
packages were not ready after an OTA.

Bug: 18065140
Change-Id: Ibff9948e1536e07f868d6b29f432923a137091e6
 2014-10-21 17:07:41 +02:00
Leon Scroggins III
e463bc388e am 3c8bde55: Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 
* commit '3c8bde5534d81518f5baf3795989f367373f7dfd':
  Report that a JavaInputStreamAdaptor is at end.
 2014-10-21 13:56:42 +00:00
Leon Scroggins III
3c8bde5534 Merge "Report that a JavaInputStreamAdaptor is at end." into lmp-dev 2014-10-21 13:52:30 +00:00
Robin Lee
fc56790085 am e1c9489c: Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 
* commit 'e1c9489cc40542bfa2adbb84b6fb77cff4ab8570':
  DevicePolicy: Restore CA warning to K behaviour
 2014-10-21 11:58:38 +00:00
Robin Lee
e1c9489cc4 Merge "DevicePolicy: Restore CA warning to K behaviour" into lmp-dev 2014-10-21 11:54:52 +00:00
Dmitriy Ivanov
13078e15f3 am 9be7db6e: am 952dd924: Merge "Switch to libsigchain.a" 
* commit '9be7db6e3bc374efd9dcff744deab92148e20dbd':
  Switch to libsigchain.a
 2014-10-21 03:30:10 +00:00
Dmitriy Ivanov
9be7db6e3b am 952dd924: Merge "Switch to libsigchain.a" 
* commit '952dd9241675fe73d4246dc16232682b32952bd3':
  Switch to libsigchain.a
 2014-10-21 03:22:34 +00:00
Dmitriy Ivanov
952dd92416 Merge "Switch to libsigchain.a" 2014-10-21 03:14:28 +00:00
Geoff Mendal
60ea57cc1b am 03592593: (-s ours) am a9a550dd: (-s ours) am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit '0359259318d8981b52d4ef674cd56f68c10f3507':
  Import translations. DO NOT MERGE
 2014-10-20 23:57:33 +00:00
Geoff Mendal
0359259318 am a9a550dd: (-s ours) am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'a9a550dd8e87b33979670cf856838ba227500547':
  Import translations. DO NOT MERGE
 2014-10-20 23:51:31 +00:00
Geoff Mendal
a9a550dd8e am deddb384: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 
* commit 'deddb38462389823c194559052c4d64ee6c3b467':
  Import translations. DO NOT MERGE
 2014-10-20 23:43:33 +00:00
Geoff Mendal
deddb38462 Merge "Import translations. DO NOT MERGE" into lmp-sprout-dev 2014-10-20 23:39:58 +00:00
Jinsuk Kim
30ef14e8a5 am 6ec9b4f0: am 17e9d246: Merge "CEC: Add missing protections for some HdmiControlService API" into lmp-mr1-dev 
* commit '6ec9b4f09b0baf909a009cf897114bc5a50fbf0c':
  CEC: Add missing protections for some HdmiControlService API
 2014-10-20 23:29:50 +00:00
Geoff Mendal
e8d005429c Import translations. DO NOT MERGE 
Change-Id: Idcc94d2f5b04a7eea17b530c4a8ff7f8b76fff38
Auto-generated-cl: translation import
 2014-10-20 16:21:14 -07:00