Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
266,851 Commits 3 Branches 0 Tags
23c2ec20b7ca01acbcc2c322256fe1afee62c8ea
Commit Graph

266851 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jean-Michel Trivi
3a91a8417a Merge "Remove deprecated AudioManager.AudioRecordingCallback method" into nyc-dev 2016-05-24 21:17:49 +00:00
Pavlin Radoslavov
2b016a1711 Reduced the impact of "synchronized" statements 
* Removed "synchronized" statements that are not needed
* Replaced "synchronized" statements with Read/Write lock as
 appropriate. The lock protects the access to and the setting of
 BluetoothAdapter.mService and BluetoothManagerService.mBluetooth and
 associated state.

Bug: 28734075
Bug: 28799467
Change-Id: I8f8281c505f0a1ae0add1e14a3caba1f5b2a98e4
(cherry picked from commit eb50a39e98)
 2016-05-24 21:17:42 +00:00
Mady Mellor
f916151173 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 
am: 470c001355

* commit '470c001355894b92724901924188c2be7d53e90f':

Change-Id: I3af3c40c4d19c82afad6138b001383bcde778551
 2016-05-24 21:15:34 +00:00
Adrian Roos
0444314f8b Merge "Keep notifications with active remote inputs" into nyc-dev 2016-05-24 21:13:30 +00:00
Mady Mellor
a016449a83 Merge "Children should have backgrounds" into nyc-dev am: 31e49b0964 
am: 12021f5020

* commit '12021f5020a057b3c0be8643bf5a8a999f488732':
  Children should have backgrounds

Change-Id: I5343b9b9aa4fb6c5e1f343cf5f4927c44bd5489d
 2016-05-24 21:13:25 +00:00
Adrian Roos
a9c0d3ff19 Merge "Fix janky swiping with RemoteInputViews" into nyc-dev 2016-05-24 21:13:21 +00:00
Amanda Kassay
e468c2380d Add check for \'.end-content-title\' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. 
am: 85b7df2697

* commit '85b7df26975997826a738a46ae4ab797941175ea':
  Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section.

Change-Id: If25728a85efb5b0ed46e87c45916621d8ad1d9ab
 2016-05-24 21:12:15 +00:00
Baligh Uddin
b6c12bcba0 Import translations. DO NOT MERGE 
Change-Id: I5c47de9ef324e3dbaa11a459f9aa8c0c4e294661
Auto-generated-cl: translation import
 2016-05-24 14:10:56 -07:00
Mady Mellor
470c001355 Merge "Children should have backgrounds" into nyc-dev 
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I4c123a7cf9efd38c46ff155a70f5b9c053e4df02
 2016-05-24 21:09:33 +00:00
Mady Mellor
12021f5020 Merge "Children should have backgrounds" into nyc-dev 
am: 31e49b0964

* commit '31e49b0964cfba0b6b91e8ae67cbc04730098569':
  Children should have backgrounds

Change-Id: I1f68467af9048b93631c33243f4a2dd2e67ccf81
 2016-05-24 21:08:17 +00:00
Garfield Tan
8ed1471727 Merge "Load up-to-date thumbnail if the cached one is out of date." 2016-05-24 21:03:33 +00:00
Mady Mellor
31e49b0964 Merge "Children should have backgrounds" into nyc-dev 2016-05-24 20:59:50 +00:00
Abodunrinwa Toki
5ba060b49a Filter ACTION_PROCESS_TEXT entries by exported status and permission. 
Bug: 26638966
Change-Id: Ib06e914935fa5bde576555a0b7258d0faddaef13
 2016-05-24 21:56:34 +01:00
Sid Soundararajan
c1b2d41ca6 Merge "Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 am: 2954f22bb5" into nyc-mr1-dev-plus-aosp 
am: bf809fa984

* commit 'bf809fa98414016d04d97e0079663e3a09865f32':

Change-Id: I4c1d20ae069b7e64c757b768bad8bde4bef94f1f
 2016-05-24 20:50:30 +00:00
Sid Soundararajan
df0da8cec3 Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 am: 8b1dce7186 
am: 48a6f454a3

* commit '48a6f454a337d99cd569a959d00f97734a667966':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: I06671c6a88f9bbb3b0d5b4a31650e0f9f3e712b5
 2016-05-24 20:50:26 +00:00
Winson
4ad62ba414 Merge "Process user events from service lifecycle callbacks." into nyc-dev am: a4400059a3 am: 8c43f6fe91 
am: 3f69059aec

* commit '3f69059aecf166dad03ba1ada74620276c4b598c':

Change-Id: I0d5d7cad2885200cfb26910a8e8370d8f8c7f9ab
 2016-05-24 20:37:08 +00:00
Winson Chung
eb3ead8388 Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec" into nyc-mr1-dev-plus-aosp 
am: 9c8953b910

* commit '9c8953b910f25d058cdaf37053c07ae0a40e1b14':
  Process user events from service lifecycle callbacks.

Change-Id: I4858fd5659c4b3fb231d50bbb1e93b012c4282c1
 2016-05-24 20:37:04 +00:00
Selim Cinek
bbf9269fb7 Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 am: f03a50c4cb" into nyc-mr1-dev-plus-aosp 
am: f3ad723c42

* commit 'f3ad723c42a5d90b699dfbe88eab8ccc3c3bc317':

Change-Id: I37152c6de945de26ffc1829218aff1d617ea0007
 2016-05-24 20:37:00 +00:00
Chih-Hung Hsieh
6a56d2b120 Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp 
am: ce685d90a5

* commit 'ce685d90a53dd47c9c8d02a8ec5fd4fe59afd77e':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: I08ca821a4d6b9295efc1522c558f3449126ef5f3
 2016-05-24 20:36:53 +00:00
Android Build Merger (Role)
bf809fa984 Merge "Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 am: 2954f22bb5" into nyc-mr1-dev-plus-aosp 2016-05-24 20:36:48 +00:00
Sid Soundararajan
48a6f454a3 Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 
am: 8b1dce7186

* commit '8b1dce71861960de1f9953688d6faa13c0a86774':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: Idc52194b5d63a12c7e6289a3835f2337da685920
 2016-05-24 20:36:15 +00:00
Sid Soundararajan
1b45c9a8d3 Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev am: a95568b846 
am: 2954f22bb5

* commit '2954f22bb5dec35a1f51ce71a458cafd07ce2e46':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: Ibc036dbaa2a0d5139ed243b2f1fd0d3d2cd0f109
 2016-05-24 20:36:14 +00:00
Sid Soundararajan
8b1dce7186 Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev 
am: a95568b846

* commit 'a95568b84617e1c48e1eb6f505d58813f5227657':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: I13991ffb3eec7e12a4e674523fe4259d90faad7e
 2016-05-24 20:30:42 +00:00
Sid Soundararajan
2954f22bb5 Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev 
am: a95568b846

* commit 'a95568b84617e1c48e1eb6f505d58813f5227657':
  Add Content Description for Focusable Elements in TV Recents UI

Change-Id: I1f2236d1d05b7e850d0a16248c8a4447909763ad
 2016-05-24 20:30:28 +00:00
Selim Cinek
1ca8998d18 Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738 am: 40a6b1dbb5 
am: a6954bc53c

* commit 'a6954bc53c7682c89f8f354bb019882e87b62bc0':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Ica13b23532b0d207d05068d8ecbd8c01f66006ee
 2016-05-24 20:26:29 +00:00
Tony Mak
60c5c93a7a Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 18b1826a8c 
am: 74275b16d1

* commit '74275b16d1affa756246664dfc951878c616cfb5':

Change-Id: I1cae997343d5e492c6a1aab565c708d2f4192e18
 2016-05-24 20:26:21 +00:00
Adarsh Fernando
b696fb0f26 Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp 
am: 0fbfc4b689

* commit '0fbfc4b6895679fa20f810c88302aee10b6da656':

Change-Id: I4ae79004d47bd3e282f358dba14e9b2d0c5279dd
 2016-05-24 20:26:13 +00:00
Tony Mak
f6fbfce696 Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 5e08d12331 
am: 3fbe5c0d34

* commit '3fbe5c0d34769ca0237a8bf7ea4c38ed1e4f8edd':
  Fix first notification of each app is not shown

Change-Id: I645d0ae0b2f55b72510921b9a2abeb71499a5a68
 2016-05-24 20:26:03 +00:00
Amanda Kassay
85b7df2697 Add check for '.end-content-title' to force the end of content section in an accordion. Fixes js error on mobile when the footer is appended inside of a content section. 
b/28917925

Related CL (critique): cl/123138252

Staged:
https://android-dot-devsite.googleplex.com/preview/setup-sdk.html?hl=es

Change-Id: I4eb606c0205af2315896fc0587cc1c4c2502f282
 2016-05-24 20:25:47 +00:00
Winson Chung
3f69059aec Merge "Process user events from service lifecycle callbacks." into nyc-dev am: a4400059a3 
am: 8c43f6fe91

* commit '8c43f6fe915bc2d44adc188fed148cf885a33433':

Change-Id: Icfed40e881c97af3984a4b51dd2740248492dc16
 2016-05-24 20:25:45 +00:00
Android Build Merger (Role)
9c8953b910 Merge "Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 am: 26431282ec" into nyc-mr1-dev-plus-aosp 2016-05-24 20:21:56 +00:00
Android Build Merger (Role)
f3ad723c42 Merge "Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 am: f03a50c4cb" into nyc-mr1-dev-plus-aosp 2016-05-24 20:21:46 +00:00
Android Build Merger (Role)
ce685d90a5 Merge "Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp am: e60c649ada" into nyc-mr1-dev-plus-aosp 2016-05-24 20:21:37 +00:00
Sid Soundararajan
a95568b846 Merge "Add Content Description for Focusable Elements in TV Recents UI" into nyc-dev 2016-05-24 20:21:35 +00:00
Winson Chung
f39bb94a23 Merge changes I7773ed3a,I73d97d9a into nyc-dev am: a4400059a3 
am: 26431282ec

* commit '26431282ec5a25b94114c8acff38ba6178bb2c31':
  Process user events from service lifecycle callbacks.

Change-Id: I51a1c243eb0dc8beebab0a19cd5c3636295c9ea8
 2016-05-24 20:21:05 +00:00
Selim Cinek
e94cad5c51 Merge "Fix first notification of each app is not shown" into nyc-dev am: c178f519b9 
am: f03a50c4cb

* commit 'f03a50c4cb8b5e50a751dd7a8ac7bd80b27364e2':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id73011f950e037af8a7eee7e6490777b150d6adc
 2016-05-24 20:21:02 +00:00
Chih-Hung Hsieh
c4c8ecfb6f Merge "Merge "Fix misc-macro-parentheses warnings in common_time." am: c49d21f9c4 am: ba11b8e441" into nyc-dev-plus-aosp 
am: e60c649ada

* commit 'e60c649adab7bbbbce1118d3598446973adf2f0b':
  Fix misc-macro-parentheses warnings in common_time.

Change-Id: Iaed05df438fd181694c71b842ecaed5b054352b6
 2016-05-24 20:20:59 +00:00
Tony Mak
a6954bc53c Merge "Fix first notification of each app is not shown" into nyc-dev am: ed353f1738 
am: 40a6b1dbb5

* commit '40a6b1dbb53fd4a8d499ee9ad0ba953137cfecec':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I820cdd49b8bd04dd05fd18f2bf8456182ba6a725
 2016-05-24 20:20:58 +00:00
Adarsh Fernando
74275b16d1 Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e 
am: 18b1826a8c

* commit '18b1826a8c6e6a1026239478072bf7c725219dcf':

Change-Id: Idcd9c2cb66e11f88faab34363fc3a7e1cc5cbf7d
 2016-05-24 20:20:53 +00:00
Xiaohui Chen
067d8fad16 Merge "Initialize device locked state during boot" 2016-05-24 20:20:47 +00:00
Winson
8c43f6fe91 Merge "Process user events from service lifecycle callbacks." into nyc-dev 
am: a4400059a3

* commit 'a4400059a307adfea00a2ae3726949c802d4e2ad':
  Process user events from service lifecycle callbacks.

Change-Id: I11a1e228ea22d0f35ab09bd4b0259c07c9b9bde1
 2016-05-24 20:20:23 +00:00
Adarsh Fernando
30d023a349 Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: 8a7d7a26e2 
am: 4cdc70b070

* commit '4cdc70b07062812498a28d07c9267e7f6f18cd25':
  Doc: delete old test_framework.png

Change-Id: I8577ceb2bde65f304accf05241002af286634a40
 2016-05-24 20:20:17 +00:00
Android Build Merger (Role)
0fbfc4b689 Merge "Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e am: fa6e151d5d" into nyc-mr1-dev-plus-aosp 2016-05-24 20:17:36 +00:00
Adarsh Fernando
e1245ae7e2 Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e 
am: fa6e151d5d

* commit 'fa6e151d5de39d1be03f57854ed7596d28856d75':

Change-Id: Idb465177f33205908f510421a3166de7fc35a580
 2016-05-24 20:17:04 +00:00
Adarsh Fernando
3fbe5c0d34 Doc: delete old test_framework.png am: 05c98d5458 am: 734e7725ac am: 130317181e 
am: 5e08d12331

* commit '5e08d12331c53c6db708877b012187c245097bfc':
  Fix first notification of each app is not shown

Change-Id: I428894e3442eb90fed192cfd58b44353ab2b03fe
 2016-05-24 20:16:34 +00:00
Selim Cinek
26431282ec Merge changes I7773ed3a,I73d97d9a into nyc-dev 
am: a4400059a3

* commit 'a4400059a307adfea00a2ae3726949c802d4e2ad':
  Process user events from service lifecycle callbacks.

Change-Id: Ia7436eba1886c9bd739cc3cda5029fd8caf0b109
 2016-05-24 20:16:16 +00:00
Selim Cinek
40a6b1dbb5 Merge changes I7773ed3a,I73d97d9a into nyc-dev 
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: Id9b18a7cdd1ed97a06916e6a29b7294551c33acf
 2016-05-24 20:16:16 +00:00
Tony Mak
18b1826a8c Merge "Fix first notification of each app is not shown" into nyc-dev 
am: ed353f1738

* commit 'ed353f173852551f0dc0b360512a9abc5c77c28e':
  Fix first notification of each app is not shown

Change-Id: Ib3702c334b7d41b75684720d36caaa62cc52f074
 2016-05-24 20:16:08 +00:00
Tony Mak
f03a50c4cb Merge "Fix first notification of each app is not shown" into nyc-dev 
am: c178f519b9

* commit 'c178f519b94b239aa02633dae7127e619f5b0aa6':
  Added accessibility action for scrolling the notifications
  Fixed a bug where the text directionality was inconsistent

Change-Id: I42fa93677ccd0d58d7b71f274f77af867f065ac4
 2016-05-24 20:16:05 +00:00
Michael Kwan
dcb28fff58 Fixed issue where ListView checked state did not account 
for ListView header.

Bug: 17733928
Change-Id: If8e9daa9c9538ac86493045bc597461b44a2f823
 2016-05-24 13:07:55 -07:00