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

181655 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Bryce Lee
cdfebd60fa Make THEATER_MODE_ON a System API. 
Bug: 19043538
Change-Id: Ibf0d6b45868ca90eb792a40c5d1b1395774486b8
 2015-02-02 08:19:11 -08: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
Geoff Mendal
dec7d3893f Merge "Import translations. DO NOT MERGE" 2015-02-02 15:53:44 +00:00
Tyler Gunn
235f60bc13 am 4143b796: Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 
* commit '4143b796bc20072a12fe31cbfdf4f1918dff0728':
  Fixing conference merge where only one party is added to conference.
 2015-02-02 15:53:00 +00:00
Geoff Mendal
4af00ad2a4 Import translations. DO NOT MERGE 
Change-Id: I11260e50c0c2ca497a300fe79a25810d4a0b6c9a
Auto-generated-cl: translation import
 2015-02-02 07:52:02 -08:00
Tyler Gunn
4143b796bc Merge "Fixing conference merge where only one party is added to conference." into lmp-mr1-dev 2015-02-02 15:48:53 +00:00
Mathieu Chartier
cbe696d9ec Merge branch 'master' of https://googleplex-android.googlesource.com/_direct/platform/frameworks/base 2015-02-02 15:38:30 +00:00
Geoff Mendal
5af9bb2148 am aea95a6a: (-s ours) am c6fc5287: (-s ours) Import translations. DO NOT MERGE 
* commit 'aea95a6a59468690102f6ffe2a5d92f99b0c91e9':
  Import translations. DO NOT MERGE
 2015-02-02 15:37:07 +00:00
Geoff Mendal
d14c0ceb66 am c6fc5287: (-s ours) Import translations. DO NOT MERGE 
automerge: aea95a6  -s ours

* commit 'aea95a6a59468690102f6ffe2a5d92f99b0c91e9':
  Import translations. DO NOT MERGE
 2015-02-02 15:33:47 +00:00
Geoff Mendal
aea95a6a59 am c6fc5287: (-s ours) Import translations. DO NOT MERGE 
* commit 'c6fc5287138744a4684a837c883dedde14359612':
  Import translations. DO NOT MERGE
 2015-02-02 15:30:25 +00:00
Jorim Jaggi
6a6b4fa6ee Merge "Split status bar icon management into separate class" 2015-02-02 15:17:47 +00:00
Jorim Jaggi
66ac133971 Split status bar icon management into separate class 
Change-Id: Iaacfcb70ff16d894287603d5fc6351598c7450d6
 2015-02-02 16:14:41 +01:00
Jorim Jaggi
4c99d0da47 Merge "Show status bar header in SHADE_LOCKED" 2015-02-02 15:13:55 +00:00
Geoff Mendal
e0c5d64857 Merge "Import translations. DO NOT MERGE" 2015-02-02 14:55:48 +00:00
Geoff Mendal
3edf13138b Import translations. DO NOT MERGE 
Change-Id: I9c23372467960ad066b9089b4a76e3a257d147eb
Auto-generated-cl: translation import
 2015-02-02 06:52:26 -08:00
Geoff Mendal
6ec8c248ee Import translations. DO NOT MERGE 
Change-Id: I5113a08f43c71e78b43dc3c73f8c329adc411e9a
Auto-generated-cl: translation import
 2015-02-02 06:40:30 -08:00
Geoff Mendal
c6fc528713 Import translations. DO NOT MERGE 
Change-Id: I1151a10a47c8545c3db3445a2cdbe6edffa6c177
Auto-generated-cl: translation import
 2015-02-02 08:39:50 -06:00
Marcin Kosiba
d26b16cbdf Merge "Update docs to say onPageStarted is not called for fragment navigations." 2015-02-02 10:22:43 +00:00
Marcin Kosiba
3a1f4bfda6 Merge "Update docs for WebResourceRequest.hasUserGesture." 2015-02-02 10:22:17 +00:00
Robert Greenwalt
3c6e38d3b5 Fixing up the formatting code which is already merged 
I just apply google coding guide like space.

Uploading the same code about + handling just apply the Google Coding Guide.
The previous code is "https://android-review.googlesource.com/#/c/122770/"

This code is about + plus number converting logic for international NANP.

Change-Id: I23e4709294c603b387b28b3c2a56c932d838c666
 2015-02-02 15:04:56 +09:00
Sailesh Nepal
2d3ced758f Don't set address for failed remote connections 
We created failed connections we no address attached.
When the connection is sent to RemoteConnectionService
the null address is translated to a setAddress() call.

This causes all failed connections to show up as "unknown".
Fix is to only call setAddress if creating the connection
succeeded.

BUG: 18830726
Change-Id: I680e2fa4c69157a9fdbfa348c6af1f2f87aafd48
 2015-01-31 20:17:35 -08:00
Sailesh Nepal
1ed8561ac6 Update setNextPostDialWaitChar API 
This CL does the following:
  - make the API public
  - rename it from setNextPostDialWaitChar to setNextPostDialChar
  - remove reference to "wait" from the API documentation

BUG: 19216940, 19216942
Change-Id: Ic4c7f44a900fd79875318d8c565c3aacaa42b962
 2015-01-31 15:25:51 -08:00
Jon Larimer
bff560b70f am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 automerge: dcce25a automerge: 4f78e0b 
automerge: f96d6bc

* commit 'f96d6bc684481a751c4cb25631ff87a4264d6e0d':
 2015-01-31 05:46:42 +00:00
Jon Larimer
f96d6bc684 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 automerge: dcce25a 
automerge: 4f78e0b

* commit '4f78e0b1e849193f5e70447171b4f30ad0aee700':
 2015-01-31 05:44:27 +00:00
Jon Larimer
4f78e0b1e8 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a automerge: 4a82635 
automerge: dcce25a

* commit 'dcce25a9a7fb3458f2fb65b23912b5f7eb42c596':
 2015-01-31 05:27:30 +00:00
Jon Larimer
dcce25a9a7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af automerge: 27d099a 
automerge: 4a82635

* commit '4a826358e769e697ec329cf14edeb049981a11a9':
 2015-01-31 05:19:19 +00:00
Jon Larimer
4a826358e7 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de automerge: 9e7e8af 
automerge: 27d099a

* commit '27d099a7e128744b7a11ce09b469a3396e872d33':
 2015-01-31 05:03:24 +00:00
Joe Fernandez
7a0e01d41a am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 automerge: f4b2bd4 
automerge: 14437e4

* commit '14437e4781fea9688b7c68ec6c3201e8a926ab04':
  docs: training intent doc error update
 2015-01-31 04:25:18 +00:00
Deepanshu Gupta
b4506586dc am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f automerge: c053438 
automerge: df5a198

* commit 'df5a1987108539c703477adff3749d647ba313c5':
  Limited AppCompat support
 2015-01-31 04:23:50 +00:00
Deepanshu Gupta
a925a06a9d am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6 automerge: 862cdd6 
automerge: 6a43990

* commit '6a439908fcc103696dd90bc42494231b54b7a10b':
  Resource resolution fixes.
 2015-01-31 04:22:45 +00:00
Joe Fernandez
14437e4781 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da automerge: 346a9a2 
automerge: f4b2bd4

* commit 'f4b2bd4c41233327f0fb2e4d45af8dc9c8eba689':
  docs: training intent doc error update
 2015-01-31 04:20:19 +00:00
Deepanshu Gupta
df5a198710 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 automerge: 580937f 
automerge: c053438

* commit 'c05343828611ed0b82fae4edf7fe11e0e9087db1':
  Limited AppCompat support
 2015-01-31 04:18:58 +00:00
Deepanshu Gupta
6a439908fc am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd automerge: 1575ca6 
automerge: 862cdd6

* commit '862cdd6f11490c060842599a58a400e284c937d9':
  Resource resolution fixes.
 2015-01-31 04:17:35 +00:00