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

181527 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Craig Mautner
34e90b2214 Do not display ADB confirm dialog during boot 
Wait until after encrypted volume has been mounted.
Also eliminate warning by starting UsbDebuggingActivity as owner.

Fixes bug 19217173.

Change-Id: I6da530259bb02eb1892509ec5085a471f9893714
 2015-02-04 09:41:40 -08:00
Craig Mautner
b2a958fd3c Remove path, query, and fragment from http Uri. 
For http and https schemes leave only scheme and authority in
Uri.toSafeString().

Fixes bug 19217173.

Change-Id: Ic07665f4754bb33ad48f7a55ce5efda185df7577
 2015-02-03 10:01:56 -08:00
Alan Viverette
ea54c0f97c Merge "Make popup transition animation play nicely with dismiss/show pair" 2015-02-03 00:12:32 +00:00
Andrew Lee
ffbace6fae Merge "Null-protect attempt to get EmergencyButton." 2015-02-03 00:11:19 +00:00
Andrew Lee
f98f7b969b Null-protect attempt to get EmergencyButton. 
Not all device layouts, such as for tablets, will have an Emergency
Button, so check for null before attempting to set a callback.

Bug: 18977746
Change-Id: I0e909e71c51f6923edda4707bb25053a5f2de398
 2015-02-02 16:08:41 -08:00
Chris Craik
9dfd7bd520 Merge "Refactoring of Program ownership/lifecycle, and WIP Glop rendering path" 2015-02-03 00:00:58 +00:00
Sanket Padawe
d8f32ea2df Merge "Updated string in Wifi dialog to generate appropriate message." 2015-02-02 23:36:42 +00:00
RoboErik
dc4a950e98 Merge "Fix crash in dumpsys media_session" 2015-02-02 23:26:50 +00:00
RoboErik
7b3da2d415 Fix crash in dumpsys media_session 
Changes the dump to use the correct keys instead of just counting
when doing a dump of users.

Change-Id: Ibb2033f1cc9209fff03e5cf4928acacca29fc11b
 2015-02-02 15:23:59 -08:00
Glenn Kasten
547c9e5212 Merge "Clarify that flush does not necessarily free up buffer space" 2015-02-02 22:32:37 +00:00
Glenn Kasten
7a121563d5 Clarify that flush does not necessarily free up buffer space 
Change-Id: I6f77efb6a8da5e11c0cc68f0bb3ce47a0c1cb3da
 2015-02-02 14:16:23 -08:00
Chris Craik
6c15ffa196 Refactoring of Program ownership/lifecycle, and WIP Glop rendering path 
Change-Id: I2549032790bddbc048b0bccc224ed8f386b4517c
 2015-02-02 14:08:57 -08:00
Brian Attwell
3398442905 Merge "Expose QUERY_PARAMETER_VCARD_NO_PHOTO" 2015-02-02 21:34:34 +00:00
Brian Attwell
f9fb60a592 Expose QUERY_PARAMETER_VCARD_NO_PHOTO 
QUERY_PARAMETER_VCARD_NO_PHOTO is used to avoid
attaching photos on vcards that get sent over NFC.
Large VCards can't be easily sent over NFC.

I'm deferring writing CTS tests till later.

Bug: 18777272
Change-Id: I6e3a7bf836978023225c709446b9113de05f6cef
 2015-02-02 13:33:53 -08:00
Joe Fernandez
394d087185 Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-02 20:38:56 +00:00
Scott Kennedy
144ea46ce1 Merge "Add some @Nullable annotations to SharedPreferences" 2015-02-02 20:38:10 +00:00
Joe Fernandez
6689e73782 am e9557d7d: am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 automerge: d99924d 
* commit 'e9557d7d2728d1c77e4d173e8f6d954eeeb69357':
  docs: February 2015 Dashboard updates
 2015-02-02 20:37:46 +00:00
Andrew Lee
72b46d429c Reset keyguard/bouncer on "return to call". 
+ Add callback, to be invoked when EmergencyButton is clicked when
inside a call.
+ Route callback to the KeyguardViewMediator, to invoke
resetStateLocked() to reset the bouncer.

Bug: 18977746
Change-Id: I4733ccfb6809c4610184a33a28ba38ecf255231f
 2015-02-02 12:30:59 -08:00
Joe Fernandez
e9557d7d27 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
automerge: d99924d

* commit 'd99924d556b95bc05bbff9408519e301983193fb':
  docs: February 2015 Dashboard updates
 2015-02-02 20:29:31 +00:00
Jorim Jaggi
c37fa833ad Merge "Merge commit '83eaf6cc' into HEAD" 2015-02-02 19:53:56 +00:00
Jorim Jaggi
10c85c76a9 Merge commit '83eaf6cc' into HEAD 
Change-Id: I13918ee8116ac17169910a1414de913bcc2d184e
 2015-02-02 20:45:32 +01:00
destradaa
4b1b8e4c44 Revert API breaking change in System API. 
Change introduced in ag/616521

Change-Id: Ia95982b051496e123b4a179746aea15c6a0b8a65
 2015-02-02 11:42:20 -08:00
Joe Fernandez
d99924d556 am 175ddbcf: am d14b6432: am eba583e3: docs: February 2015 Dashboard updates automerge: c6ca860 
* commit '175ddbcf2ed71fdcd44a9b64cdc5d479df496a4d':
  docs: February 2015 Dashboard updates
 2015-02-02 19:35:00 +00:00
Jorim Jaggi
83eaf6cc8c am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
automerge: 2ffb340

* commit '2ffb3400f7922aba597b61cea91b82bcfc3d7e7d':
  Send accessibility event when bouncer is shown
 2015-02-02 19:30:34 +00:00
Alan Viverette
e025ed2f26 Make popup transition animation play nicely with dismiss/show pair 
Previously it was okay to call dismiss/show in quick succession since
the window was removed synchronously. Adding transitions introduced a
delay between dismiss() and actually removing the window, which broke
this behavior.

Change-Id: I0de8ae0a551dcb2eb8b8a50356c308b654ebdc6f
 2015-02-02 11:27:21 -08:00
Jorim Jaggi
2ffb3400f7 am 515148dc: Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 
* commit '515148dcaaf5b63e69998d67958829d4347071ec':
  Send accessibility event when bouncer is shown
 2015-02-02 19:25:34 +00:00
Joe Fernandez
175ddbcf2e am d14b6432: am eba583e3: docs: February 2015 Dashboard updates 
automerge: c6ca860

* commit 'c6ca8600a4257b25d2ffd1ab6abe02089d06b3d7':
  docs: February 2015 Dashboard updates
 2015-02-02 19:24:38 +00:00
Jorim Jaggi
515148dcaa Merge "Send accessibility event when bouncer is shown" into lmp-mr1-dev 2015-02-02 19:19:24 +00:00
Jorim Jaggi
c1dff8cee8 Send accessibility event when bouncer is shown 
Bug: 18996476
Change-Id: I0e402aa198263807e3013c7fb151f28d049ea51a
 2015-02-02 20:18:26 +01:00
Brian Attwell
462c9f50c3 Remove NAME_VERIFIED. Part 4 
Bug: 18777272
Change-Id: I1579a3122b2d45b80de7106a2b9616e323855045
 2015-02-02 18:41:27 +00:00
destradaa
22287fe7c2 Merge "Fix race condition generating READY and NOT_SUPPORTED statuses." 2015-02-02 18:07:41 +00:00
Alan Viverette
e300553a01 Merge "Ensure InsetDrawable propagates state and callback on set drawable" 2015-02-02 18:01:04 +00:00
Alan Viverette
bc43ac2094 Ensure InsetDrawable propagates state and callback on set drawable 
Bug: 19230432
Change-Id: I161e377c5a50fd68718a36cef0038ab06e74c90d
 2015-02-02 09:56:49 -08:00
Julia Reynolds
07c40dbe9d Merge "Add skip encryption constants for device owner provisioning." 2015-02-02 17:52:05 +00:00
RoboErik
00b1b712d2 Merge "Route volume keys directly to the audio system on TVs" 2015-02-02 17:47:52 +00:00
Joe Fernandez
c6ca8600a4 am d14b6432: am eba583e3: docs: February 2015 Dashboard updates 
* commit 'd14b64323ff92be9db804d66a1146693c27150a6':
  docs: February 2015 Dashboard updates
 2015-02-02 17:44:26 +00:00
Julia Reynolds
a9ec70ba17 Add skip encryption constants for device owner provisioning. 
Bug: 19228730
Change-Id: Id5022f2f669cf0dfc1b1523190da52c77238a02c
 2015-02-02 12:42:18 -05:00
Jason Monk
a2bfc837cc Merge "Create SettingsLib" 2015-02-02 17:39:45 +00:00
Robert Greenwalt
af7454bafb am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
automerge: 21475c6

* commit '21475c6a92b893f5d078ba23f06f0be6edaaacbd':
 2015-02-02 17:33:09 +00:00
Robert Greenwalt
21475c6a92 am 0cdd4560: am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
* commit '0cdd4560dac5784dda169863eb844d489bdc79d5':
 2015-02-02 17:29:21 +00:00
Sailesh Nepal
2c56fde04d Merge "Update setNextPostDialWaitChar API" 2015-02-02 17:24:02 +00:00
Joe Fernandez
d14b64323f am eba583e3: docs: February 2015 Dashboard updates 
* commit 'eba583e3930891f7a8a0e48a961a4a2471fc757c':
  docs: February 2015 Dashboard updates
 2015-02-02 17:20:35 +00:00
Robert Greenwalt
0cdd4560da am fabf0e0b: Merge "Fixing up the formatting code which is already merged" 
* commit 'fabf0e0ba84e0cd28f459360b20386e68179cc31':
 2015-02-02 17:16:32 +00:00
Robert Greenwalt
fabf0e0ba8 Merge "Fixing up the formatting code which is already merged" 2015-02-02 17:00:43 +00:00
Joe Fernandez
eba583e393 docs: February 2015 Dashboard updates 
Change-Id: I1936395193ec4c382b2492f992149fa7a29c9282
 2015-02-02 08:48:42 -08:00
Jason Monk
2ba4ce6a06 Create SettingsLib 
This will hold common code that SystemUI and Settings (and others)
will share.

Bug: 19180466
Change-Id: I6614b31d6c3b0a2d426a2aa8ce66725245339d22
 2015-02-02 11:33:17 -05:00
Geoff Mendal
b1cdd07630 Merge "Import translations. DO NOT MERGE" 2015-02-02 16:13:20 +00:00
Geoff Mendal
aa198fd632 Import translations. DO NOT MERGE 
Change-Id: I3cdaa15e3d76d202fc23185b5319b92bc23fc744
Auto-generated-cl: translation import
 2015-02-02 08:08:46 -08:00
Tyler Gunn
7c0756b6fe am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
automerge: 736cb49

* commit '736cb492aea736e9c3b33fe20285f531497462d0':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 16:02:08 +00:00
Tyler Gunn
736cb492ae am 235f60bc: am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
* commit '235f60bc134646d1ce18ab872b982ff63b14845e':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 16:00:12 +00:00