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

181587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
Joe Fernandez
f4b2bd4c41 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 automerge: cacf7da 
automerge: 346a9a2

* commit '346a9a2f364f7cdabf06944014594b299d384082':
  docs: training intent doc error update
 2015-01-31 04:01:11 +00:00
Deepanshu Gupta
c053438286 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev automerge: 7789447 
automerge: 580937f

* commit '580937fc45bc5ef97e45f1eaf67945a07c5ce41f':
  Limited AppCompat support
 2015-01-31 03:59:37 +00:00
Deepanshu Gupta
862cdd6f11 am 1d59871e: Merge "Resource resolution fixes." into lmp-dev automerge: 7e683bd 
automerge: 1575ca6

* commit '1575ca6e1a713f9d2e4a9f91bc6943ae10fde083':
  Resource resolution fixes.
 2015-01-31 03:58:26 +00:00
Jon Larimer
27d099a7e1 am 545dd853: am 9a425aa7: am 159aa735: am d4031809: am 48c95c43: Fix build breakage in older branches by avoiding <> notation automerge: 5c9d0de 
automerge: 9e7e8af

* commit '9e7e8afbb934742cb7996b22e32f94c1c09704af':
 2015-01-31 03:39:19 +00:00
Joe Fernandez
346a9a2f36 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs automerge: f02a8d9 
automerge: cacf7da

* commit 'cacf7da1c4d078641f099bab717e155609c5dc99':
  docs: training intent doc error update
 2015-01-31 03:04:16 +00:00
Deepanshu Gupta
580937fc45 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
automerge: 7789447

* commit '7789447bd97c851b7a09623a417300590e5439d5':
  Limited AppCompat support
 2015-01-31 03:02:42 +00:00
Deepanshu Gupta
1575ca6e1a am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
automerge: 7e683bd

* commit '7e683bdaddff77a24a36d420c5782b47795c5ccb':
  Resource resolution fixes.
 2015-01-31 03:01:20 +00:00
Joe Fernandez
cacf7da1c4 am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
automerge: f02a8d9

* commit 'f02a8d9ffcd2f14c069b23d588ff2083cc53062d':
  docs: training intent doc error update
 2015-01-31 02:50:57 +00:00
Joe Fernandez
f02a8d9ffc am 1a9bf5c1: Merge "docs: training intent doc error update" into lmp-docs 
* commit '1a9bf5c10049e99398a80b985e22ea1bfd737bcd':
  docs: training intent doc error update
 2015-01-31 01:59:54 +00:00
Joe Fernandez
1a9bf5c100 Merge "docs: training intent doc error update" into lmp-docs 2015-01-31 01:00:16 +00:00
Ruben Brunk
a27eef432a Add ProcessInfoService to activity manager. 
- Adds a new AIDL interface for querying process
  information from activity manager.

Bug: 19186859
Change-Id: Ic08858f346d6b66e7bfc9da6faa2c6e38d9b2e82
 2015-01-30 16:58:14 -08:00
Rich Slogar
367bfb3b50 docs: training intent doc error update 
b/18386294

Change-Id: Id0fb07e567e0f698e786ac57a19c60895f4d6fc1
 2015-01-30 16:55:55 -08:00
Deepanshu Gupta
7789447bd9 am 3d5535cf: Merge "Limited AppCompat support" into lmp-dev 
* commit '3d5535cfb7755c20619529649b025c4682013b85':
  Limited AppCompat support
 2015-01-31 00:54:10 +00:00
Deepanshu Gupta
7e683bdadd am 1d59871e: Merge "Resource resolution fixes." into lmp-dev 
* commit '1d59871e4e8a3a657dab3931d684706c45630a2f':
  Resource resolution fixes.
 2015-01-31 00:54:07 +00:00
Deepanshu Gupta
3d5535cfb7 Merge "Limited AppCompat support" into lmp-dev 2015-01-31 00:50:35 +00:00