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

185429 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Chris Craik
f9eb4b90fe Merge "Use glops for text rendering" 2015-03-19 01:02:25 +00:00
Andrew Solovay
b08f20787c am 3f7f78c6: am 27853819: am 78bbfe04: Merge "docs: Removed sentence fragments." into lmp-docs 
* commit '3f7f78c6518f93b694bd868d406c755e2469584c':
  docs: Removed sentence fragments.
 2015-03-19 00:55:12 +00:00
Andrew Solovay
cf34a6d1a1 am 46bda6a4: am 6fd36f11: am ae279bd5: Merge "docs: Fixed typo (spurious quotation mark)." into lmp-docs 
* commit '46bda6a4838e592fd3cc0d9334ae92cdc7434f3e':
  docs: Fixed typo (spurious quotation mark).
 2015-03-19 00:55:08 +00:00
Andrew Solovay
a014174852 am 42f966c9: am dbec5ae6: am 0aef0abf: Merge "docs: Fixed broken image link, and broke long lines in code samples" into lmp-docs 
* commit '42f966c9df6ed4e7903e87ad557d63ed81da2986':
  docs: Fixed broken image link, and broke long lines in code samples
 2015-03-19 00:55:01 +00:00
Shawn Willden
29a5a5b654 am 1bed39a5: am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 
* commit '1bed39a5e4d57e4735e72a1e9765dcec62035b40':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
 2015-03-19 00:48:02 +00:00
Shawn Willden
98be580dbb am 615f39f9: am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 
* commit '615f39f911cdc4201b4e1c63c79ae1819a6645ea':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:47:54 +00:00
Shawn Willden
1bed39a5e4 am e921b8a2: Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 
* commit 'e921b8a28f0d5b69fbb30374241c62fa90e92013':
  Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE.
 2015-03-19 00:42:09 +00:00
Shawn Willden
615f39f911 am 254c58c4: Merge changes Id9a22ad3,I629ab2c4 
* commit '254c58c4e760e0af132d680fbd783a38ef436435':
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:41:58 +00:00
Bryce Lee
d8379b907f am 8b8a0451: am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 
* commit '8b8a045133e0466e964b4094269585708805b90a':
  Add Assist global action for wear to different from VOICE_ASSIST
 2015-03-19 00:32:17 +00:00
Shawn Willden
e921b8a28f Merge "Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE." 2015-03-19 00:30:30 +00:00
Shawn Willden
e90774ddbc Rename KM_TAG_USER_AUTH_ID to KM_TAG_USER_AUTH_TYPE. 
Also change to an ENUM, to match changes in keymaster_defs.h

Change-Id: Ieda3402563b0b9e4e8b100eb69a94651e51c6347
 2015-03-18 18:28:39 -06:00
Alan Viverette
4a4be5d93a Merge "Clean up ripple exit, null out software animators on cancel/end" 2015-03-19 00:27:45 +00:00
Shawn Willden
254c58c4e7 Merge changes Id9a22ad3,I629ab2c4 
* changes:
  Add KM_TAG_AUTH_TOKEN.
  Add support for KM_TAG_USER_SECURE_ID.
 2015-03-19 00:27:38 +00:00
Alan Viverette
fc8882f134 Clean up ripple exit, null out software animators on cancel/end 
Bug: 19682421
Change-Id: I40ff56ed98a6c67cd01c74e455899825013a1f12
 2015-03-18 17:26:54 -07:00
Bryce Lee
8b8a045133 am 8bc23e82: Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 
* commit '8bc23e82af040334af4f2af1dae9898cc8c66df8':
  Add Assist global action for wear to different from VOICE_ASSIST
 2015-03-19 00:21:13 +00:00
Dongwon Kang
28299099db Merge "TIF: Add COLUMN_INTERNAL_PROVIDER_FLAGX to TvContract" 2015-03-19 00:20:14 +00:00
Dongwon Kang
10c6e230bc Merge "TIF: Add TvInputInfo.isHardwareInput()." 2015-03-19 00:18:44 +00:00
Bryce Lee
8bc23e82af Merge "Add Assist global action for wear to different from VOICE_ASSIST" into lmp-mr1-modular-dev 2015-03-19 00:14:07 +00:00
Clara Bayarri
6820434edd Merge "Editor: Avoid the paste popup from coming up when a word is selected." 2015-03-19 00:04:37 +00:00
Nick Vaccaro
9504a9d90b am 23c7cef2: am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 
* commit '23c7cef2ca28bf3116611507457be953f45ca80b':
  Avoid unhandled page fault cases on Android Wear
 2015-03-19 00:01:15 +00:00
Joe Fernandez
cdf130800b am ed657981: am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit 'ed6579811f466db1e5e4058508c71e412472e71e':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:54:30 +00:00
Joe Fernandez
e31c904831 am 462dc7b9: am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit '462dc7b9ca508a6f61bb8dd494b67aa0d80eb57e':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-18 23:54:22 +00:00
Mathieu Chartier
75f1ba5a81 am f792e016: am 437ac8f8: Merge "Add JIT late override property" 
* commit 'f792e01606b988ab84190217529cca53da8db3f5':
  Add JIT late override property
 2015-03-18 23:51:12 +00:00
Bart Sears
8b1c27c5ab am f5353e9d: am 91281bbd: resolved conflicts for merge of cc86bc0c to lmp-mr1-modular-dev 
* commit 'f5353e9dda15fe49023083ec7ca2131feed7787d':
  Prevent activities from being started during setup wizard.
 2015-03-18 23:51:02 +00:00
Andreas Gampe
27f2fe5c1a am b078ff16: am 13dbc3d4: Merge "Frameworks/base: Fix potential NPE in InputMethod" 
* commit 'b078ff16a3ea83f7e4f444eb7b7b699ee8e913a6':
  Frameworks/base: Fix potential NPE in InputMethod
 2015-03-18 23:50:54 +00:00
Andreas Gampe
e09a941585 am 4f0a96d2: am 9cc36ac2: Merge "Frameworks/base: Remove duplicate check in Mesh" 
* commit '4f0a96d2d923bd1f4c7f46ec25c83711565b77db':
  Frameworks/base: Remove duplicate check in Mesh
 2015-03-18 23:50:47 +00:00
Andreas Gampe
870c4ba78a am 1eca7d66: am 2a247b36: Merge "Frameworks/base: Fix visibility flag in Editor" 
* commit '1eca7d66ee3da87c622259544794b8fe998cdb92':
  Frameworks/base: Fix visibility flag in Editor
 2015-03-18 23:50:35 +00:00
Andreas Gampe
3c4ca688ce am 1dae2f93: am 8df1bedc: Merge "Frameworks/base: Fix potential NPE in Script" 
* commit '1dae2f9341c05eee5d77489c579ffd621fbe108b':
  Frameworks/base: Fix potential NPE in Script
 2015-03-18 23:50:25 +00:00
Mark Salyzyn
2d5b2c7dc1 am 6a9cd7b0: am e2c8e504: Merge "logd: optimize statistics" 
* commit '6a9cd7b0d4215d9e20ed59e6ab0c328c81cd842b':
  logd: optimize statistics
 2015-03-18 23:49:08 +00:00
Jason Sams
68af9a9904 am b533f3e1: am 1aadd347: Merge "Avoid duplicate surface creation." 
* commit 'b533f3e1ad098b38070369609e6b1892828bc111':
  Avoid duplicate surface creation.
 2015-03-18 23:48:52 +00:00
Dan Sandler
61bc9d535b am b509a809: am fbd99e9f: am 76620791: am b3a1b663: Merge "Avoid crashing on corrupted notifications." into lmp-mr1-dev 
* commit 'b509a809b20d1eae76613b43a93059c32c4a8435':
  Avoid crashing on corrupted notifications.
 2015-03-18 23:48:31 +00:00
Joe Fernandez
ed6579811f am 59d6c8bd: Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 
* commit '59d6c8bdaf6428f10d0c8bf144de7c39848ed868':
  cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819
 2015-03-18 23:47:26 +00:00
Joe Fernandez
462dc7b9ca am cb92819f: Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 
* commit 'cb92819facfa4170623ba97130044a5700b4968b':
  docs: Add distribution guidelines and update quality checklist for Android Auto.
 2015-03-18 23:47:22 +00:00
Nick Vaccaro
23c7cef2ca am 74a0eb36: Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 
* commit '74a0eb360da012c5a13577a8af33f6b28b0fadf7':
  Avoid unhandled page fault cases on Android Wear
 2015-03-18 23:44:20 +00:00
Joe Fernandez
d2484a8a53 am 26e332bf: am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs 
* commit '26e332bf6e99845541d2056fe6a1a418f9409bdb':
  Doc change: add docs for SafetyNet API.
 2015-03-18 23:43:31 +00:00
Quddus Chong
c63471ade6 am 51aa424a: am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 
* commit '51aa424aa1d69af9b91b5f834d1acb30e99df7b1':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.
 2015-03-18 23:43:27 +00:00
Quddus Chong
5192ac8d06 am f990241a: am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'f990241a74c9f885f249a78e98c8cd6b083ff1d7':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:43:22 +00:00
Joe Fernandez
59d6c8bdaf Merge "cherrypick from lmp-docs docs: Update auto landing and design page image assets Original Change-Id: I0382eaa82ee51ce4fce8287c36e8702c13ea8819" into lmp-docs 2015-03-18 23:41:56 +00:00
Joe Fernandez
cb92819fac Merge "docs: Add distribution guidelines and update quality checklist for Android Auto." into lmp-docs 2015-03-18 23:41:29 +00:00
Nick Vaccaro
74a0eb360d Merge "Avoid unhandled page fault cases on Android Wear" into lmp-mr1-modular-dev 2015-03-18 23:37:52 +00:00
Joe Fernandez
26e332bf6e am 3bbb646b: Merge "Doc change: add docs for SafetyNet API." into lmp-docs 
* commit '3bbb646b8a231731327d10a3a243e2f252e185f1':
  Doc change: add docs for SafetyNet API.
 2015-03-18 23:37:14 +00:00
Quddus Chong
51aa424aa1 am 9b278f56: Merge "docs: Updated \'What\'s New\' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 
* commit '9b278f5615966f1d642f2503759f6618292058bb':
  docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release.
 2015-03-18 23:37:09 +00:00
Quddus Chong
f990241a74 am abde3d83: Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 
* commit 'abde3d83f86af44e2beedc2fc10bfc23a405a5d9':
  docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785.
 2015-03-18 23:37:03 +00:00
Joe Fernandez
3bbb646b8a Merge "Doc change: add docs for SafetyNet API." into lmp-docs 2015-03-18 23:30:09 +00:00
Quddus Chong
9b278f5615 Merge "docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release." into lmp-docs 2015-03-18 23:29:57 +00:00
Quddus Chong
abde3d83f8 Merge "docs: Added 3rd party Javadocs for Google Play services v7.0 (Orla). Generated from ub-gcore-orla-release build #1784785." into lmp-docs 2015-03-18 23:29:44 +00:00
Wale Ogunwale
11b7445f95 Merge "Always position home stack either at the top or bottom of the list." 2015-03-18 23:17:56 +00:00
Dirk Dougherty
11e8057566 Doc change: add docs for SafetyNet API. 
Change-Id: I265320788718672ac117c9ff6033e48d1e9161a5
 2015-03-18 16:16:18 -07:00
Wale Ogunwale
92acaf2074 Always position home stack either at the top or bottom of the list. 
The current implementation was okay since we mostly had
2 stacks (the home stack and 1 application stack), so moving the
application stack to the top meant the home stack was automatically
moved to the bottom. This is no longer the case if you have multiple
application stacks.

Change-Id: I8ec7cfdc3650a73a00c4e8dad869fb2bec2a4eac
 2015-03-18 16:11:51 -07:00
Quddus Chong
b2a6185e25 docs: Updated 'What's New' in Google Play services doc to reflect changes in GMS v7.0 (Orla). This content is scheduled to be published with the Orla SDK release. 
Change-Id: I4154c04a3a64fce1ec314a40237ab4c5472d651c
 2015-03-18 16:11:23 -07:00