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

392511 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
b2eb6bd683 Merge "Add setDarkAmount method to ClockPlugin interface." 2018-11-12 16:25:32 +00:00
TreeHugger Robot
1c5f3cd105 Merge "use SkFontMetrics rather than deprecated SkPaint::FontMetrics" 2018-11-12 16:25:28 +00:00
TreeHugger Robot
81cf7de86c Merge "Turn on feature flag of settings contextual homepage." 2018-11-12 16:11:48 +00:00
Alison Cichowlas
69f39989c2 Merge changes from topic "sharesheet-refactor" 
* changes:
  Add URI shared by screenshot into extras.
  Re-patching in Sharesheet security model changes.
 2018-11-12 15:19:11 +00:00
Adam Vartanian
1eb0ccc905 Merge "Add Conscrypt Public API" am: 5f9193bdad am: 6be4564805 
am: b77c9082a5

Change-Id: Icdc50533d439aa13aefea01939f9950ea826e150
 2018-11-12 06:55:37 -08:00
Chiachang Wang
177fe18ae5 Merge "Not defer network disconnect event in Probing state" am: 8292fe9d83 am: 2f8c8439a5 
am: 1c6f68c356

Change-Id: If3deedd907334881b3446d90277e0766d0ea438c
 2018-11-12 06:47:57 -08:00
Bill Yi
416c15174a [automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 6018662e18 -s ours 
am: 04fa32edbf  -s ours

Change-Id: I5fb5a8842b69eb0f435515d7c7ff895ecc25c84f
 2018-11-12 06:41:55 -08:00
Bill Yi
c3e967b57d Merge changes from topic "am-9fd37bbd-f227-4135-a674-78c7ef1f0468" into oc-dev am: bc7da75f87 am: 8c06bfb6a4 am: 77a8b4d7d7 am: 61ae1cfe63 
am: 93016dd78b

Change-Id: I17322aeb42372304af4d840c15a3f08a7c389bd2
 2018-11-12 06:41:20 -08:00
Bill Yi
c95e2459cc [automerger skipped] Import translations. DO NOT MERGE skipped: f77737395b skipped: 640fb0a793 am: c9590c8fc1 -s ours am: 0881f3bb25 -s ours am: 638e56b43a -s ours am: e9b45b687a -s ours 
am: 403cc23931  -s ours

Change-Id: I6ba6dcca7591c2f4900f5522e0172d7bebbd9204
 2018-11-12 06:30:15 -08:00
Robert Snoeberger
e32efd76af Add setDarkAmount method to ClockPlugin interface. 
setDarmAmount implementations provided by clock plugins
should use the dark amount to transition into and out
of the doze state on AOD. For example, the size of the
clock could shrink in the Y direction when leaving doze
to make room for the notification stack scroller.

Bug: 119035943
Test: KeyguardClockSwitchTest passes locally.
Change-Id: I9968dc2cc5ab8000ff525f3d1d06ffbf73359086
 2018-11-12 09:29:59 -05:00
Bill Yi
dd3766356c Merge changes from topic "am-6c55709f-f895-4072-8c00-5133d079d8d8" into oc-dev am: cff099466e am: 21060a9e0d am: 72100b44e8 am: af6e397fe8 
am: 1f1e4502f1

Change-Id: Ic6b05171604c494a083a8ecc43caddf57ee94da5
 2018-11-12 06:29:32 -08:00
Bill Yi
cf2eebf7b8 [automerger skipped] Import translations. DO NOT MERGE skipped: 0697e9e6d7 skipped: b702eb1807 am: 5e3def3f70 -s ours am: 599b561ff1 -s ours am: 4aa205acf7 -s ours am: 850ef7e641 -s ours 
am: faad21c435  -s ours

Change-Id: I86232815556fe0388e442a413ec10808dd28bb23
 2018-11-12 06:18:35 -08:00
Bill Yi
7f7014f6e3 Merge changes from topic "am-8da5d3f1-21c0-4b80-9cbb-748987f515da" into oc-dev am: cfbf7a21c3 am: d2eb52dd7b am: 8a312ab779 am: 3c16709448 
am: 967c96480c

Change-Id: Ic413dfaf626d5a86a9c30ca865590ec31c4d8e62
 2018-11-12 06:17:56 -08:00
Bill Yi
a78f7eccce [automerger skipped] Import translations. DO NOT MERGE skipped: faba866b30 skipped: 38e04d8b0a am: 39a2390fb9 -s ours am: 497cb6d257 -s ours am: adf9725b51 -s ours am: 47c4e5706a -s ours 
am: 0fe5477f7d  -s ours

Change-Id: Id4e7c97badd75ba288ec5ad37cc4760e6fd0feb5
 2018-11-12 06:07:03 -08:00
Bill Yi
ca9d103fa4 Merge changes from topic "am-a4f2313d-91d9-4723-8d15-dc7e5aa52970" into oc-dev am: 8c5514b186 am: fefdff353f am: bae17b1a99 am: cb69b2f8f9 
am: c0c8b5f672

Change-Id: I8992da328b334b9bc9702061cbe2c9a2a830e113
 2018-11-12 06:06:27 -08:00
Bill Yi
06d00740a8 [automerger skipped] Import translations. DO NOT MERGE skipped: cfd1e141b9 skipped: d9cf1de3e4 am: cbaf1505a0 -s ours am: 82f5bd65de -s ours am: 0a47e3fafe -s ours am: 899eceb2e8 -s ours 
am: f904edeaf1  -s ours

Change-Id: Icb8ba3c00c0878247963ee405e0679cf02adce2d
 2018-11-12 05:55:22 -08:00
Bill Yi
095eb1ab13 Merge changes from topic "am-707d9054-0085-4add-8cb5-07f6cb10d135" into oc-dev am: 3fa917c8bc am: 51ec5967af am: ab66d6295a am: b6f1a84250 
am: 463d8f89ea

Change-Id: Idfaaf51f517e888de161811a5d13f474ff989779
 2018-11-12 05:54:31 -08:00
Bill Yi
270fa6835c [automerger skipped] Import translations. DO NOT MERGE skipped: 65cfd97b69 skipped: 79dc3a3343 am: 204f727404 -s ours am: 519fa54629 -s ours am: 5123593cce -s ours am: b3ad5ca918 -s ours 
am: c42028e0bd  -s ours

Change-Id: Ie480a5b69f3d67b136554dc8038cf523abd29c4c
 2018-11-12 05:43:16 -08:00
Bill Yi
56b5a1fbe4 Merge changes from topic "am-e8cf3957-7e41-48c5-b339-2114401da749" into oc-dev am: 568344a776 am: 8b1df08930 am: 87a3e6a26a am: db91bb0b8c 
am: 595e87049f

Change-Id: I0ed8d754b4413cefbc0fbdd028c0c61bf6b8a756
 2018-11-12 05:42:36 -08:00
Bill Yi
fd621328d3 [automerger skipped] Import translations. DO NOT MERGE skipped: c82e0b36ed skipped: 985e4a2c7f am: 176758a8cb -s ours am: 1da1b80a9f -s ours am: 7b409ed9ce -s ours am: 8d23362ff6 -s ours 
am: 2a4f7b262e  -s ours

Change-Id: I72e99ad7165c1e58199718bf8786ee3d64b33c89
 2018-11-12 05:31:33 -08:00
Bill Yi
a84ec8fd18 Merge changes from topic "am-6f74b9fb-4f7a-4949-a2b2-4de2e4256447" into oc-dev am: ef0d8b4472 am: d72f7d1d9e am: c9bdb75378 am: ec7395877c 
am: 18445f0c2d

Change-Id: Id829978562b77cb612386750cffde51d13a87618
 2018-11-12 05:30:52 -08:00
Bill Yi
03f7900029 [automerger skipped] Import translations. DO NOT MERGE skipped: eadf247a57 skipped: 84b233fab0 am: 236da59677 -s ours am: 94c6fa964f -s ours am: d8749970e3 -s ours am: 07a4d16c1f -s ours 
am: dfcee4113b  -s ours

Change-Id: I3442bae7555bbc1e28ce14c20a90616bff426fad
 2018-11-12 05:20:22 -08:00
Bill Yi
a88fdaad7a [automerger skipped] Import translations. DO NOT MERGE skipped: 5739e3bfb2 skipped: 7176023903 am: 09f4f73afa -s ours am: 5c7f0c40fb -s ours am: e138bd2c05 -s ours am: 7eeb8b0b3f -s ours 
am: bf64f41035  -s ours

Change-Id: I5e819fc2ab9c056b675a643e32a94bf914afa5f8
 2018-11-12 05:19:55 -08:00
Wang, ArvinX
6e9012aebe Merge "Unable to input PIN with hardware keyboard" am: b8740842e0 am: 7e4d381a48 
am: 0740d13e03

Change-Id: Ic4864c9c7f0dca262dc7bdeb225228017797f1e7
 2018-11-12 05:19:23 -08:00
Mike Reed
7f63c89287 use SkFontMetrics rather than deprecated SkPaint::FontMetrics 
Test: make

Change-Id: I02e5e36020f1511e1728037e5eeb353fb5e9f465
 2018-11-12 08:17:29 -05:00
Brad Ebinger
8a9766e621 Merge "Expose SRVCC state changes as @SystemAPI" am: c10b96899e am: 657343b811 
am: 30858dc7ac

Change-Id: Iddb02abd34c1971b906acf734a878aad22387c57
 2018-11-12 04:50:17 -08:00
Shuo Qian
86d66b4d3e Merge "Merge "Introduce getRssi() in CellSignalStrengthLte" am: 5bdf255e0d am: e819bd7a1e" into pi-dev-plus-aosp 
am: c8e008b0b4

Change-Id: Icb0e4c780f842b4153287c376fe7be583f1d2540
 2018-11-12 04:23:52 -08:00
Misha Wagner
78b0211117 Merge "Reduce amount of logging on failed proc file reading" 2018-11-12 11:20:33 +00:00
Weng Su
9c8c89f7d4 Merge "Fix incorrect summary text for hearing aid during call." 2018-11-12 11:06:19 +00:00
wengsu
e4361810f2 Fix incorrect summary text for hearing aid during call. 
Bug: 118206879
Test: make -j56 RunSettingsLibRoboTests
Change-Id: I333fe7d978f7dbb34d7b7c5bdd49c1eb6b0ee850
 2018-11-12 11:03:10 +00:00
Adam Vartanian
b77c9082a5 Merge "Add Conscrypt Public API" am: 5f9193bdad 
am: 6be4564805

Change-Id: Ia1d66c69d75840a007a69980cf6e0abe4d5b5a7e
 2018-11-12 02:59:13 -08:00
Adam Vartanian
6be4564805 Merge "Add Conscrypt Public API" 
am: 5f9193bdad

Change-Id: I240d6c613dc8aab01ae387a7a3cde85fba08c51a
 2018-11-12 02:44:45 -08:00
Adam Vartanian
5f9193bdad Merge "Add Conscrypt Public API" 2018-11-12 10:31:28 +00:00
Emily Chuang
7e15b7cc40 Turn on feature flag of settings contextual homepage. 
Fixes: 118691898
Test: manual
Change-Id: I434d3c7827c03857974211a354264c542e1323f7
 2018-11-12 18:16:35 +08:00
Issei Suzuki
1a5e9f0d4b Merge "Suppress app transition when the process is not ready" 2018-11-12 09:41:13 +00:00
TreeHugger Robot
d8bfc60262 Merge "Remove count logging. Caller can use action directly." 2018-11-12 07:45:13 +00:00
TreeHugger Robot
04995744e2 Merge "Delete actionWithSource. Caller can use action directly." 2018-11-12 07:03:34 +00:00
TreeHugger Robot
7c9f5bd418 Merge "Correct synchronized object of pinned stack" 2018-11-12 06:46:00 +00:00
Chiachang Wang
1c6f68c356 Merge "Not defer network disconnect event in Probing state" am: 8292fe9d83 
am: 2f8c8439a5

Change-Id: I4c607b4abd71ecdc906845fefebcc1dc33755684
 2018-11-11 21:56:07 -08:00
Chiachang Wang
2f8c8439a5 Merge "Not defer network disconnect event in Probing state" 
am: 8292fe9d83

Change-Id: I261c20f48a4e00f6ef2cd32bff18f39f926e6b66
 2018-11-11 21:46:53 -08:00
Chiachang Wang
8292fe9d83 Merge "Not defer network disconnect event in Probing state" 2018-11-12 05:30:46 +00:00
Fan Zhang
8ed02e1b5c EXTRA_SOURCE_METRICS_CATEGORY -> MetricsFeatureProvider 
And add a getAttribution() method - this will be used by StatsLogWriter
to figure out attribution in the future.

Bug: 117860032
Test: robotests
Change-Id: I7ec09409a573a624a1d3120f50d2b5f3800c7bf3
 2018-11-11 19:52:47 -08:00
Fan Zhang
ab54e58734 Remove count logging. Caller can use action directly. 
Bug: 117860032
Test: rebuild
Change-Id: Icd1fb637557d5acc8186da1bb746defe48686916
 2018-11-11 18:55:58 -08:00
Fan Zhang
6a607e7cc8 Delete actionWithSource. Caller can use action directly. 
Bug: 117860032
Test: robotest
Change-Id: Ie9d8a8605e4c02568394e50d59a263cd72a6fbf6
 2018-11-11 18:55:58 -08:00
Chiachang Wang
30cc367e0b Not defer network disconnect event in Probing state 
If network reevaluation is triggered just before network
disconnect, statemachine will stuck in Probing state and unable
to exit.

Test: 1. runtest frameworks-net
      2. connect and disconnect wifi to see if NetworkMonitor is
         destroyed as expected
Bug: 119158436

Change-Id: Ibbb20caee94d0a5ab5403c6b01636936025562fe
 2018-11-12 10:52:25 +08:00
Charles Chen
ed50a5ac4b Merge "Introduce DisplayNavigationBarController" 2018-11-12 02:21:48 +00:00
TreeHugger Robot
c79ca1476b Merge "Q Upstream: Use ParcelFileDescriptor for storing large clip data." 2018-11-12 02:19:55 +00:00
TreeHugger Robot
2112895bb4 Merge "SystemServer: Support deviceSpecificAudioService for ARC" 2018-11-12 02:11:41 +00:00
Chilun Huang
e01fd19426 Merge "Implement new API of external display settings (1/2)" 2018-11-12 01:50:25 +00:00
TreeHugger Robot
662547a8bb Merge "Fix ZOrderingTest got NPE during display creation." 2018-11-12 00:20:54 +00:00